Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2013-01-04 17:42:47 -0500
committerChristopher Frost2013-01-04 17:42:47 -0500
commit582ed8494869200b1930ee6a3e3677e3bc501c4b (patch)
tree9d395723c4bb96d0105692a32d07d7bda8ff6e29
parent4db909c37bc4f15c50cd0fd21426252f6963771d (diff)
downloadorg.eclipse.virgo.samples-582ed8494869200b1930ee6a3e3677e3bc501c4b.tar.gz
org.eclipse.virgo.samples-582ed8494869200b1930ee6a3e3677e3bc501c4b.tar.xz
org.eclipse.virgo.samples-582ed8494869200b1930ee6a3e3677e3bc501c4b.zip
329368 Massive refactoring to update projects and reduce the Eclipse errors
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.classpath10
-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.web/.classpath14
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/eclipse/virgo/samples/formtags/par/domain/Colour.java (renamed from formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/springframework/showcase/formtags/domain/Colour.java)2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/eclipse/virgo/samples/formtags/par/domain/Country.java (renamed from formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/domain/Country.java)2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/eclipse/virgo/samples/formtags/par/domain/Preferences.java (renamed from formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/springframework/showcase/formtags/domain/Preferences.java)2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/eclipse/virgo/samples/formtags/par/domain/User.java (renamed from formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/springframework/showcase/formtags/domain/User.java)2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/resources/META-INF/MANIFEST.MF4
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.service/.classpath1
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/java/org/eclipse/virgo/samples/formtags/par/service/UserManager.java (renamed from formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/service/UserManager.java)6
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/java/org/eclipse/virgo/samples/formtags/par/service/internal/StubUserManager.java (renamed from formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/springframework/showcase/formtags/service/internal/StubUserManager.java)8
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/resources/META-INF/MANIFEST.MF6
-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/java/org/eclipse/virgo/samples/formtags/formtags/validation/CountryValidator.java (renamed from formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/springframework/showcase/formtags/validation/CountryValidator.java)2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/validation/UserValidator.java (renamed from formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/springframework/showcase/formtags/validation/UserValidator.java)2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/CountryEditor.java (renamed from formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/web/CountryEditor.java)4
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/FormController.java (renamed from formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/springframework/showcase/formtags/web/FormController.java)8
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/ListController.java (renamed from formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/web/ListController.java)2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/META-INF/MANIFEST.MF6
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags/.settings/org.eclipse.wst.common.project.facet.core.xml1
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.project1
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/com.springsource.server.ide.jdt.core.prefs5
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/domain/Colour.java (renamed from formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/domain/Colour.java)2
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/domain/Country.java (renamed from formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/springframework/showcase/formtags/domain/Country.java)2
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/domain/Preferences.java (renamed from formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/springframework/showcase/formtags/domain/Preferences.java)2
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/domain/User.java (renamed from formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/domain/User.java)2
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/service/StubUserManager.java (renamed from formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/service/StubUserManager.java)6
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/service/UserManager.java (renamed from formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/service/UserManager.java)6
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/validation/CountryValidator.java (renamed from formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/validation/CountryValidator.java)4
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/validation/UserValidator.java (renamed from formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/validation/UserValidator.java)4
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/web/CountryEditor.java (renamed from formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/web/CountryEditor.java)10
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/web/FormController.java (renamed from formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/web/FormController.java)10
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/web/ListController.java (renamed from formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/web/ListController.java)4
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.project1
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.settings/org.eclipse.wst.common.project.facet.core.xml1
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/eclipse/virgo/samples/formtags/sharedservice/domain/Colour.java (renamed from formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/domain/Colour.java)2
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/eclipse/virgo/samples/formtags/sharedservice/domain/Country.java (renamed from formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/domain/Country.java)2
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/eclipse/virgo/samples/formtags/sharedservice/domain/Preferences.java (renamed from formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/domain/Preferences.java)2
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/eclipse/virgo/samples/formtags/sharedservice/domain/User.java (renamed from formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/springframework/showcase/formtags/domain/User.java)2
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/eclipse/virgo/samples/formtags/sharedservice/service/UserManager.java (renamed from formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/java/org/springframework/showcase/formtags/service/UserManager.java)6
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/eclipse/virgo/samples/formtags/sharedservice/service/internal/StubUserManager.java (renamed from formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/java/org/springframework/showcase/formtags/service/internal/StubUserManager.java)8
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.classpath1
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.project1
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.wst.common.project.facet.core.xml1
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/validation/CountryValidator.java (renamed from formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/validation/CountryValidator.java)2
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/validation/UserValidator.java (renamed from formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/validation/UserValidator.java)2
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/CountryEditor.java (renamed from formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/springframework/showcase/formtags/web/CountryEditor.java)4
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/FormController.java (renamed from formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/web/FormController.java)8
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/ListController.java (renamed from formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/springframework/showcase/formtags/web/ListController.java)2
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/domain/Colour.java (renamed from formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/springframework/showcase/formtags/domain/Colour.java)2
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/domain/Country.java (renamed from formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/springframework/showcase/formtags/domain/Country.java)2
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/domain/Preferences.java (renamed from formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/domain/Preferences.java)2
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/domain/User.java (renamed from formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/domain/User.java)2
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/service/StubUserManager.java (renamed from formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/service/StubUserManager.java)6
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/service/UserManager.java (renamed from formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/springframework/showcase/formtags/service/UserManager.java)6
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/validation/CountryValidator.java (renamed from formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/validation/CountryValidator.java)4
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/validation/UserValidator.java (renamed from formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/validation/UserValidator.java)4
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/web/CountryEditor.java (renamed from formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/web/CountryEditor.java)10
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/web/FormController.java (renamed from formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/web/FormController.java)10
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/web/ListController.java (renamed from formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/web/ListController.java)6
-rw-r--r--greenpages/greenpages.core/src/main/resources/META-INF/MANIFEST.MF6
-rw-r--r--greenpages/greenpages.db/src/main/resources/META-INF/MANIFEST.MF4
-rw-r--r--greenpages/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF17
-rw-r--r--greenpages/greenpages.web/src/test/resources/META-INF/MANIFEST.MF16
65 files changed, 153 insertions, 134 deletions
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 fedcff1..2a0cddf 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.classpath
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.classpath
@@ -22,12 +22,12 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<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.context/3.0.0.RELEASE/org.springframework.context-3.0.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RC1/org.springframework.context-sources-3.0.0.RC1.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-3.0.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.0.0.RELEASE/org.springframework.beans-3.0.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.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.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/org.springframework.context/3.1.0.RELEASE/org.springframework.context-3.1.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RC1/org.springframework.context-sources-3.0.0.RC1.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.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.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-1.2.4.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="var" path="IVY_CACHE/org.eclipse.osgi/org.eclipse.equinox.cm/1.0.300.v20101204/org.eclipse.equinox.cm-1.0.300.v20101204.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"/>
</classpath>
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 53f0252..801f856 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,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <runtime name="Virgo Runtime"/>
<installed facet="com.springsource.server.bundle" version="1.0"/>
</faceted-project>
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 c317c9b..2f8fab9 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.classpath
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.classpath
@@ -20,19 +20,19 @@
<attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="false"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web/3.0.0.RELEASE/org.springframework.web-3.0.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.0.0.RELEASE/org.springframework.beans-3.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web.servlet/3.0.0.RELEASE/org.springframework.web.servlet-3.0.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"/>
+ <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"/>
<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar" sourcepath="/IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-sources-2.5.0.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-3.0.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-sources-3.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.1.0.RELEASE/org.springframework.context-3.1.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-sources-3.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet.jsp/2.1.0/com.springsource.javax.servlet.jsp-2.1.0.jar"/>
<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet.jsp.jstl/1.1.2/com.springsource.javax.servlet.jsp.jstl-1.1.2.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.0.0.RELEASE/org.springframework.core-3.0.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/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.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.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.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-1.2.4.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="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.osgi/org.eclipse.equinox.cm/1.0.300.v20101204/org.eclipse.equinox.cm-1.0.300.v20101204.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="output" path="target/classes"/>
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/springframework/showcase/formtags/domain/Colour.java b/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/eclipse/virgo/samples/formtags/par/domain/Colour.java
index ae3ecef..dbc5ad2 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/springframework/showcase/formtags/domain/Colour.java
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/eclipse/virgo/samples/formtags/par/domain/Colour.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.domain;
+package org.eclipse.virgo.samples.formtags.par.domain;
diff --git a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/domain/Country.java b/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/eclipse/virgo/samples/formtags/par/domain/Country.java
index 3ac8011..fe1ac22 100644
--- a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/domain/Country.java
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/eclipse/virgo/samples/formtags/par/domain/Country.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.domain;
+package org.eclipse.virgo.samples.formtags.par.domain;
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/springframework/showcase/formtags/domain/Preferences.java b/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/eclipse/virgo/samples/formtags/par/domain/Preferences.java
index 0149aae..86ad580 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/springframework/showcase/formtags/domain/Preferences.java
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/eclipse/virgo/samples/formtags/par/domain/Preferences.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.domain;
+package org.eclipse.virgo.samples.formtags.par.domain;
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/springframework/showcase/formtags/domain/User.java b/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/eclipse/virgo/samples/formtags/par/domain/User.java
index eef8b10..d2a216d 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/springframework/showcase/formtags/domain/User.java
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/eclipse/virgo/samples/formtags/par/domain/User.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.domain;
+package org.eclipse.virgo.samples.formtags.par.domain;
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/resources/META-INF/MANIFEST.MF b/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/resources/META-INF/MANIFEST.MF
index d7121c5..3d905d2 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/resources/META-INF/MANIFEST.MF
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/resources/META-INF/MANIFEST.MF
@@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Version: 3.0.0
Bundle-Name: FormTags Domain Model
Bundle-SymbolicName: org.eclipse.virgo.samples.formtags.formtags.domain_par
-Export-Package: org.eclipse.virgo.samples.formtags.formtags.domain
-Import-Bundle: javax.servlet;version="2.5.0"
+Export-Package: org.eclipse.virgo.samples.formtags.par.domain
+Import-Bundle: javax.servlet;version="[2.5.0,3.1)"
Import-Library: org.springframework.spring;version="[2.5.6.A,4.0.0)"
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.service/.classpath b/formtags/par/org.eclipse.virgo.samples.formtags.service/.classpath
index 9abd83e..842c514 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.service/.classpath
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.service/.classpath
@@ -3,6 +3,7 @@
<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 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/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/service/UserManager.java b/formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/java/org/eclipse/virgo/samples/formtags/par/service/UserManager.java
index 42b6090..ebcc3df 100644
--- a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/service/UserManager.java
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/java/org/eclipse/virgo/samples/formtags/par/service/UserManager.java
@@ -9,13 +9,13 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.service;
+package org.eclipse.virgo.samples.formtags.par.service;
-import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.par.domain.Country;
-import org.eclipse.virgo.samples.formtags.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.par.domain.User;
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/springframework/showcase/formtags/service/internal/StubUserManager.java b/formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/java/org/eclipse/virgo/samples/formtags/par/service/internal/StubUserManager.java
index b9b803e..349c647 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/springframework/showcase/formtags/service/internal/StubUserManager.java
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/java/org/eclipse/virgo/samples/formtags/par/service/internal/StubUserManager.java
@@ -9,15 +9,15 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.service.internal;
+package org.eclipse.virgo.samples.formtags.par.service.internal;
-import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.par.domain.Country;
-import org.eclipse.virgo.samples.formtags.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.par.domain.User;
-import org.eclipse.virgo.samples.formtags.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.par.service.UserManager;
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/resources/META-INF/MANIFEST.MF b/formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/resources/META-INF/MANIFEST.MF
index a875242..7cd9289 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/resources/META-INF/MANIFEST.MF
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-Version: 3.0.0
Bundle-ManifestVersion: 2
Bundle-Name: FormTags Service (and implementation)
-Bundle-SymbolicName: org.eclipse.virgo.samples.formtags.formtags.service_par
-Import-Package: org.eclipse.virgo.samples.formtags.formtags.domain
-Export-Package: org.eclipse.virgo.samples.formtags.formtags.service
+Bundle-SymbolicName: org.eclipse.virgo.samples.formtags.par.service_par
+Import-Package: org.eclipse.virgo.samples.formtags.par.domain
+Export-Package: org.eclipse.virgo.samples.formtags.par.service
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.web/.classpath b/formtags/par/org.eclipse.virgo.samples.formtags.web/.classpath
index 9abd83e..86b0500 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.web/.classpath
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/.classpath
@@ -3,10 +3,12 @@
<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 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/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/springframework/showcase/formtags/validation/CountryValidator.java b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/validation/CountryValidator.java
index 328326c..0e8b72a 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/springframework/showcase/formtags/validation/CountryValidator.java
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/validation/CountryValidator.java
@@ -13,7 +13,7 @@ package org.eclipse.virgo.samples.formtags.formtags.validation;
-import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.par.domain.Country;
import org.springframework.util.StringUtils;
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/springframework/showcase/formtags/validation/UserValidator.java b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/validation/UserValidator.java
index 0c71f27..3048cb4 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/springframework/showcase/formtags/validation/UserValidator.java
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/validation/UserValidator.java
@@ -13,7 +13,7 @@ package org.eclipse.virgo.samples.formtags.formtags.validation;
-import org.eclipse.virgo.samples.formtags.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.par.domain.User;
import org.springframework.validation.Errors;
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/web/CountryEditor.java b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/CountryEditor.java
index 6b75b06..d63f057 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/web/CountryEditor.java
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/CountryEditor.java
@@ -13,9 +13,9 @@ package org.eclipse.virgo.samples.formtags.formtags.web;
-import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.par.domain.Country;
-import org.eclipse.virgo.samples.formtags.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.par.service.UserManager;
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/springframework/showcase/formtags/web/FormController.java b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/FormController.java
index f9960f3..d2d4550 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/springframework/showcase/formtags/web/FormController.java
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/FormController.java
@@ -15,13 +15,13 @@ package org.eclipse.virgo.samples.formtags.formtags.web;
import org.springframework.core.enums.StaticLabeledEnumResolver;
-import org.eclipse.virgo.samples.formtags.formtags.domain.Colour;
+import org.eclipse.virgo.samples.formtags.par.domain.Colour;
-import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.par.domain.Country;
-import org.eclipse.virgo.samples.formtags.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.par.domain.User;
-import org.eclipse.virgo.samples.formtags.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.par.service.UserManager;
import org.springframework.ui.ModelMap;
diff --git a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/web/ListController.java b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/ListController.java
index b9a0f03..e964e97 100644
--- a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/web/ListController.java
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/ListController.java
@@ -13,7 +13,7 @@ package org.eclipse.virgo.samples.formtags.formtags.web;
-import org.eclipse.virgo.samples.formtags.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.par.service.UserManager;
import org.springframework.web.servlet.ModelAndView;
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 0042aae..1845e52 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
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Version: 3.0.0
Bundle-Name: FormTags Web Bundle
-Bundle-SymbolicName: org.eclipse.virgo.samples.formtags.formtags.web_par
-Import-Package: org.eclipse.virgo.samples.formtags.formtags.domain,
- org.eclipse.virgo.samples.formtags.formtags.service,
+Bundle-SymbolicName: org.eclipse.virgo.samples.formtags.par.web_par
+Import-Package: org.eclipse.virgo.samples.formtags.par.domain,
+ org.eclipse.virgo.samples.formtags.par.service,
org.eclipse.virgo.web.dm;version="[3.0,5.0)",
javax.servlet.jsp.jstl.core;version="[1.1.2,1.2.1)",
javax.servlet.http
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags/.settings/org.eclipse.wst.common.project.facet.core.xml b/formtags/par/org.eclipse.virgo.samples.formtags/.settings/org.eclipse.wst.common.project.facet.core.xml
index 4dfacf4..3342fa9 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/formtags/par/org.eclipse.virgo.samples.formtags/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <runtime name="Virgo Runtime"/>
<installed facet="org.eclipse.virgo.server.par" version="1.0"/>
</faceted-project>
diff --git a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.project b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.project
index 6b18519..06607d4 100644
--- a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.project
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.project
@@ -39,5 +39,6 @@
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ <nature>org.eclipse.virgo.ide.facet.core.bundlenature</nature>
</natures>
</projectDescription>
diff --git a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/com.springsource.server.ide.jdt.core.prefs b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/com.springsource.server.ide.jdt.core.prefs
deleted file mode 100644
index fd17e07..0000000
--- a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/com.springsource.server.ide.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Tue Jun 16 09:52:56 BST 2009
-com.springsource.server.ide.jdt.core.source.attachment-com.springsource.javax.servlet-2.5.0.jar=/opt/springsource-dm-server-2.0.0.BUILD-20090615152747/repository/bundles/usr/com.springsource.javax.servlet-sources-2.5.0.jar
-com.springsource.server.ide.jdt.core.source.attachment-com.springsource.javax.servlet.jsp.jstl-1.2.0.jar=/opt/springsource-dm-server-2.0.0.BUILD-20090615152747/repository/bundles/usr/com.springsource.javax.servlet.jsp.jstl-sources-1.2.0.jar
-com.springsource.server.ide.jdt.core.source.attachment-org.springframework.web-3.0.0.CI-282.jar=/Users/chrisfrost/SVN_Repos/dm-server-servlet/main-branches/jersey/ivy-cache/repository/org.springframework/org.springframework.web/3.0.0.CI-282/org.springframework.web-sources-3.0.0.CI-282.jar
-eclipse.preferences.version=1
diff --git a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.wst.common.project.facet.core.xml b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.wst.common.project.facet.core.xml
index 2bc8e97..e7220e8 100644
--- a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -4,6 +4,6 @@
<fixed facet="jst.java"/>
<fixed facet="jst.web"/>
<installed facet="jst.web" version="2.4"/>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
<installed facet="jst.java" version="6.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/domain/Colour.java b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/domain/Colour.java
index ae3ecef..5f8b28e 100644
--- a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/domain/Colour.java
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/domain/Colour.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.domain;
+package org.eclipse.virgo.samples.formtags.sharedlibs.domain;
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/springframework/showcase/formtags/domain/Country.java b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/domain/Country.java
index 3ac8011..43de881 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/springframework/showcase/formtags/domain/Country.java
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/domain/Country.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.domain;
+package org.eclipse.virgo.samples.formtags.sharedlibs.domain;
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/springframework/showcase/formtags/domain/Preferences.java b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/domain/Preferences.java
index 0149aae..3e8344a 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/springframework/showcase/formtags/domain/Preferences.java
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/domain/Preferences.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.domain;
+package org.eclipse.virgo.samples.formtags.sharedlibs.domain;
diff --git a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/domain/User.java b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/domain/User.java
index eef8b10..986f736 100644
--- a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/domain/User.java
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/domain/User.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.domain;
+package org.eclipse.virgo.samples.formtags.sharedlibs.domain;
diff --git a/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/service/StubUserManager.java b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/service/StubUserManager.java
index e297111..9f8f78d 100644
--- a/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/service/StubUserManager.java
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/service/StubUserManager.java
@@ -9,13 +9,13 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.service;
+package org.eclipse.virgo.samples.formtags.sharedlibs.service;
-import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
-import org.eclipse.virgo.samples.formtags.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.sharedlibs.domain.Country;
+import org.eclipse.virgo.samples.formtags.sharedlibs.domain.User;
diff --git a/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/service/UserManager.java b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/service/UserManager.java
index 42b6090..666d229 100644
--- a/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/service/UserManager.java
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/service/UserManager.java
@@ -9,13 +9,13 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.service;
+package org.eclipse.virgo.samples.formtags.sharedlibs.service;
-import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
-import org.eclipse.virgo.samples.formtags.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.sharedlibs.domain.Country;
+import org.eclipse.virgo.samples.formtags.sharedlibs.domain.User;
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/validation/CountryValidator.java b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/validation/CountryValidator.java
index 328326c..180fde1 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/validation/CountryValidator.java
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/validation/CountryValidator.java
@@ -9,11 +9,11 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.validation;
+package org.eclipse.virgo.samples.formtags.sharedlibs.validation;
-import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.sharedlibs.domain.Country;
import org.springframework.util.StringUtils;
diff --git a/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/validation/UserValidator.java b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/validation/UserValidator.java
index 0c71f27..3bc4792 100644
--- a/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/validation/UserValidator.java
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/validation/UserValidator.java
@@ -9,11 +9,11 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.validation;
+package org.eclipse.virgo.samples.formtags.sharedlibs.validation;
-import org.eclipse.virgo.samples.formtags.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.sharedlibs.domain.User;
import org.springframework.validation.Errors;
diff --git a/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/web/CountryEditor.java b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/web/CountryEditor.java
index 6b75b06..14e12d0 100644
--- a/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/web/CountryEditor.java
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/web/CountryEditor.java
@@ -9,13 +9,13 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.web;
+package org.eclipse.virgo.samples.formtags.sharedlibs.web;
-import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
-import org.eclipse.virgo.samples.formtags.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.sharedlibs.domain.Country;
+import org.eclipse.virgo.samples.formtags.sharedlibs.service.UserManager;
@@ -25,7 +25,7 @@ import java.beans.PropertyEditorSupport;
/**
- * Simple {@link java.beans.PropertyEditor} for the {@link org.eclipse.virgo.samples.formtags.formtags.domain.Country} class.
+ * Simple {@link java.beans.PropertyEditor} for the {@link org.eclipse.org.eclipse.virgo.samples.formtags.formtags.Country} class.
*
@@ -44,7 +44,7 @@ public class CountryEditor extends PropertyEditorSupport {
/**
- * Creates a new instance of the {@link org.eclipse.virgo.samples.formtags.formtags.web.CountryEditor} class.
+ * Creates a new instance of the {@link org.eclipse.virgo.samples.formtags.sharedlibs.web.CountryEditor} class.
*
diff --git a/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/web/FormController.java b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/web/FormController.java
index f9960f3..0acb4fe 100644
--- a/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/web/FormController.java
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/web/FormController.java
@@ -9,19 +9,19 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.web;
+package org.eclipse.virgo.samples.formtags.sharedlibs.web;
import org.springframework.core.enums.StaticLabeledEnumResolver;
-import org.eclipse.virgo.samples.formtags.formtags.domain.Colour;
-import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
-import org.eclipse.virgo.samples.formtags.formtags.domain.User;
-import org.eclipse.virgo.samples.formtags.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.sharedlibs.domain.Colour;
+import org.eclipse.virgo.samples.formtags.sharedlibs.domain.Country;
+import org.eclipse.virgo.samples.formtags.sharedlibs.domain.User;
+import org.eclipse.virgo.samples.formtags.sharedlibs.service.UserManager;
import org.springframework.ui.ModelMap;
diff --git a/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/web/ListController.java b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/web/ListController.java
index b9a0f03..20ccb62 100644
--- a/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/web/ListController.java
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/eclipse/virgo/samples/formtags/sharedlibs/web/ListController.java
@@ -9,11 +9,11 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.web;
+package org.eclipse.virgo.samples.formtags.sharedlibs.web;
-import org.eclipse.virgo.samples.formtags.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.sharedlibs.service.UserManager;
import org.springframework.web.servlet.ModelAndView;
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.project b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.project
index 98ee803..45528e2 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.project
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.project
@@ -26,5 +26,6 @@
<nature>org.springframework.ide.eclipse.core.springnature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.virgo.ide.facet.core.bundlenature</nature>
</natures>
</projectDescription>
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.settings/org.eclipse.wst.common.project.facet.core.xml b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.settings/org.eclipse.wst.common.project.facet.core.xml
index db240c2..426c41a 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -3,4 +3,5 @@
<runtime name="Virgo Runtime"/>
<installed facet="jst.java" version="5.0"/>
<installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/domain/Colour.java b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/eclipse/virgo/samples/formtags/sharedservice/domain/Colour.java
index ae3ecef..2ee289a 100644
--- a/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/domain/Colour.java
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/eclipse/virgo/samples/formtags/sharedservice/domain/Colour.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.domain;
+package org.eclipse.virgo.samples.formtags.sharedservice.domain;
diff --git a/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/domain/Country.java b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/eclipse/virgo/samples/formtags/sharedservice/domain/Country.java
index 3ac8011..419d3cd 100644
--- a/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/domain/Country.java
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/eclipse/virgo/samples/formtags/sharedservice/domain/Country.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.domain;
+package org.eclipse.virgo.samples.formtags.sharedservice.domain;
diff --git a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/domain/Preferences.java b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/eclipse/virgo/samples/formtags/sharedservice/domain/Preferences.java
index 0149aae..8b102c7 100644
--- a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/domain/Preferences.java
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/eclipse/virgo/samples/formtags/sharedservice/domain/Preferences.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.domain;
+package org.eclipse.virgo.samples.formtags.sharedservice.domain;
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/springframework/showcase/formtags/domain/User.java b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/eclipse/virgo/samples/formtags/sharedservice/domain/User.java
index eef8b10..1c22527 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/springframework/showcase/formtags/domain/User.java
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/eclipse/virgo/samples/formtags/sharedservice/domain/User.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.domain;
+package org.eclipse.virgo.samples.formtags.sharedservice.domain;
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/java/org/springframework/showcase/formtags/service/UserManager.java b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/eclipse/virgo/samples/formtags/sharedservice/service/UserManager.java
index 42b6090..ffe2092 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/java/org/springframework/showcase/formtags/service/UserManager.java
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/eclipse/virgo/samples/formtags/sharedservice/service/UserManager.java
@@ -9,13 +9,13 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.service;
+package org.eclipse.virgo.samples.formtags.sharedservice.service;
-import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
-import org.eclipse.virgo.samples.formtags.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.sharedservice.domain.Country;
+import org.eclipse.virgo.samples.formtags.sharedservice.domain.User;
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/java/org/springframework/showcase/formtags/service/internal/StubUserManager.java b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/eclipse/virgo/samples/formtags/sharedservice/service/internal/StubUserManager.java
index b9b803e..82bc1e1 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/java/org/springframework/showcase/formtags/service/internal/StubUserManager.java
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/eclipse/virgo/samples/formtags/sharedservice/service/internal/StubUserManager.java
@@ -9,15 +9,15 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.service.internal;
+package org.eclipse.virgo.samples.formtags.sharedservice.service.internal;
-import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
-import org.eclipse.virgo.samples.formtags.formtags.domain.User;
-import org.eclipse.virgo.samples.formtags.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.sharedservice.domain.Country;
+import org.eclipse.virgo.samples.formtags.sharedservice.domain.User;
+import org.eclipse.virgo.samples.formtags.sharedservice.service.UserManager;
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.classpath b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.classpath
index 0ec2835..02f3e87 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.classpath
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.classpath
@@ -5,6 +5,7 @@
<classpathentry kind="con" path="com.springsource.server.ide.jdt.core.MANIFEST_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.samples.formtags.shared-services.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/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 0f309d6..b1afc3f 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
@@ -40,5 +40,6 @@
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ <nature>org.eclipse.virgo.ide.facet.core.bundlenature</nature>
</natures>
</projectDescription>
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.wst.common.project.facet.core.xml b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.wst.common.project.facet.core.xml
index ca0de3d..f53416a 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -6,4 +6,5 @@
<installed facet="jst.java" version="5.0"/>
<installed facet="jst.web" version="2.4"/>
<installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/validation/CountryValidator.java b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/validation/CountryValidator.java
index 328326c..7f81e7d 100644
--- a/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/validation/CountryValidator.java
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/validation/CountryValidator.java
@@ -13,7 +13,7 @@ package org.eclipse.virgo.samples.formtags.formtags.validation;
-import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.sharedservice.domain.Country;
import org.springframework.util.StringUtils;
diff --git a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/validation/UserValidator.java b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/validation/UserValidator.java
index 0c71f27..1dbda5d 100644
--- a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/validation/UserValidator.java
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/validation/UserValidator.java
@@ -13,7 +13,7 @@ package org.eclipse.virgo.samples.formtags.formtags.validation;
-import org.eclipse.virgo.samples.formtags.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.sharedservice.domain.User;
import org.springframework.validation.Errors;
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/springframework/showcase/formtags/web/CountryEditor.java b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/CountryEditor.java
index 6b75b06..7ff947a 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/springframework/showcase/formtags/web/CountryEditor.java
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/CountryEditor.java
@@ -13,9 +13,9 @@ package org.eclipse.virgo.samples.formtags.formtags.web;
-import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.sharedservice.domain.Country;
-import org.eclipse.virgo.samples.formtags.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.sharedservice.service.UserManager;
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/web/FormController.java b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/FormController.java
index f9960f3..59bbee0 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/web/FormController.java
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/FormController.java
@@ -15,13 +15,13 @@ package org.eclipse.virgo.samples.formtags.formtags.web;
import org.springframework.core.enums.StaticLabeledEnumResolver;
-import org.eclipse.virgo.samples.formtags.formtags.domain.Colour;
+import org.eclipse.virgo.samples.formtags.sharedservice.domain.Colour;
-import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.sharedservice.domain.Country;
-import org.eclipse.virgo.samples.formtags.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.sharedservice.domain.User;
-import org.eclipse.virgo.samples.formtags.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.sharedservice.service.UserManager;
import org.springframework.ui.ModelMap;
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/springframework/showcase/formtags/web/ListController.java b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/ListController.java
index f73be7d..57b79d8 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/springframework/showcase/formtags/web/ListController.java
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/ListController.java
@@ -13,7 +13,7 @@ package org.eclipse.virgo.samples.formtags.formtags.web;
-import org.eclipse.virgo.samples.formtags.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.sharedservice.service.UserManager;
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/springframework/showcase/formtags/domain/Colour.java b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/domain/Colour.java
index ae3ecef..d7e16bd 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/springframework/showcase/formtags/domain/Colour.java
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/domain/Colour.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.domain;
+package org.eclipse.virgo.samples.formtags.war.domain;
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/springframework/showcase/formtags/domain/Country.java b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/domain/Country.java
index 3ac8011..334f819 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/springframework/showcase/formtags/domain/Country.java
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/domain/Country.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.domain;
+package org.eclipse.virgo.samples.formtags.war.domain;
diff --git a/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/domain/Preferences.java b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/domain/Preferences.java
index 0149aae..03d69e3 100644
--- a/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/domain/Preferences.java
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/domain/Preferences.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.domain;
+package org.eclipse.virgo.samples.formtags.war.domain;
diff --git a/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/domain/User.java b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/domain/User.java
index eef8b10..9265558 100644
--- a/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/domain/User.java
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/domain/User.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.domain;
+package org.eclipse.virgo.samples.formtags.war.domain;
diff --git a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/service/StubUserManager.java b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/service/StubUserManager.java
index e297111..a0bee88 100644
--- a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/service/StubUserManager.java
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/service/StubUserManager.java
@@ -9,13 +9,13 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.service;
+package org.eclipse.virgo.samples.formtags.war.service;
-import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
-import org.eclipse.virgo.samples.formtags.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.war.domain.Country;
+import org.eclipse.virgo.samples.formtags.war.domain.User;
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/springframework/showcase/formtags/service/UserManager.java b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/service/UserManager.java
index 42b6090..7ce1df0 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/springframework/showcase/formtags/service/UserManager.java
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/service/UserManager.java
@@ -9,13 +9,13 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.service;
+package org.eclipse.virgo.samples.formtags.war.service;
-import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
-import org.eclipse.virgo.samples.formtags.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.war.domain.Country;
+import org.eclipse.virgo.samples.formtags.war.domain.User;
diff --git a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/validation/CountryValidator.java b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/validation/CountryValidator.java
index 328326c..878f1a0 100644
--- a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/validation/CountryValidator.java
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/validation/CountryValidator.java
@@ -9,11 +9,11 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.validation;
+package org.eclipse.virgo.samples.formtags.war.validation;
-import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.war.domain.Country;
import org.springframework.util.StringUtils;
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/validation/UserValidator.java b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/validation/UserValidator.java
index 0c71f27..567b956 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/validation/UserValidator.java
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/validation/UserValidator.java
@@ -9,11 +9,11 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.validation;
+package org.eclipse.virgo.samples.formtags.war.validation;
-import org.eclipse.virgo.samples.formtags.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.war.domain.User;
import org.springframework.validation.Errors;
diff --git a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/web/CountryEditor.java b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/web/CountryEditor.java
index 6b75b06..f883d40 100644
--- a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/web/CountryEditor.java
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/web/CountryEditor.java
@@ -9,13 +9,13 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.web;
+package org.eclipse.virgo.samples.formtags.war.web;
-import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
-import org.eclipse.virgo.samples.formtags.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.war.domain.Country;
+import org.eclipse.virgo.samples.formtags.war.service.UserManager;
@@ -25,7 +25,7 @@ import java.beans.PropertyEditorSupport;
/**
- * Simple {@link java.beans.PropertyEditor} for the {@link org.eclipse.virgo.samples.formtags.formtags.domain.Country} class.
+ * Simple {@link java.beans.PropertyEditor} for the {@link org.eclipse.virgo.samples.formtags.war.domain.Country} class.
*
@@ -44,7 +44,7 @@ public class CountryEditor extends PropertyEditorSupport {
/**
- * Creates a new instance of the {@link org.eclipse.virgo.samples.formtags.formtags.web.CountryEditor} class.
+ * Creates a new instance of the {@link org.eclipse.virgo.samples.formtags.war.web.CountryEditor} class.
*
diff --git a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/web/FormController.java b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/web/FormController.java
index f9960f3..e194c05 100644
--- a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/web/FormController.java
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/web/FormController.java
@@ -9,19 +9,19 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.web;
+package org.eclipse.virgo.samples.formtags.war.web;
import org.springframework.core.enums.StaticLabeledEnumResolver;
-import org.eclipse.virgo.samples.formtags.formtags.domain.Colour;
-import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
-import org.eclipse.virgo.samples.formtags.formtags.domain.User;
-import org.eclipse.virgo.samples.formtags.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.war.domain.Colour;
+import org.eclipse.virgo.samples.formtags.war.domain.Country;
+import org.eclipse.virgo.samples.formtags.war.domain.User;
+import org.eclipse.virgo.samples.formtags.war.service.UserManager;
import org.springframework.ui.ModelMap;
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/web/ListController.java b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/web/ListController.java
index b9a0f03..da82dab 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/web/ListController.java
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/eclipse/virgo/samples/formtags/war/web/ListController.java
@@ -9,11 +9,11 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.web;
+package org.eclipse.virgo.samples.formtags.war.web;
-import org.eclipse.virgo.samples.formtags.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.war.service.UserManager;
import org.springframework.web.servlet.ModelAndView;
@@ -33,7 +33,7 @@ import javax.servlet.http.HttpServletResponse;
* that pretty much locates (and thus allows a {@link org.springframework.web.servlet.View}
- * to render a list) of all of the {@link org.eclipse.virgo.samples.formtags.formtags.domain.User Users}
+ * to render a list) of all of the {@link org.eclipse.virgo.samples.formtags.war.domain.User Users}
* in the application.
diff --git a/greenpages/greenpages.core/src/main/resources/META-INF/MANIFEST.MF b/greenpages/greenpages.core/src/main/resources/META-INF/MANIFEST.MF
index 081250f..1ccf5e4 100644
--- a/greenpages/greenpages.core/src/main/resources/META-INF/MANIFEST.MF
+++ b/greenpages/greenpages.core/src/main/resources/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
-Export-Package: greenpages;version="2.5.0"
+Export-Package: greenpages;version="2.6.0"
Bundle-Vendor: SpringSource Inc.
-Bundle-Version: 2.5.0
-Tool: Bundlor 1.1.0.M04
+Bundle-Version: 2.6.0
+Tool: Bundlor 1.1.0.RELEASE
Bundle-Name: GreenPages Service
Bundle-ManifestVersion: 2
Bundle-SymbolicName: greenpages.core
diff --git a/greenpages/greenpages.db/src/main/resources/META-INF/MANIFEST.MF b/greenpages/greenpages.db/src/main/resources/META-INF/MANIFEST.MF
index abb69e8..dce2d37 100644
--- a/greenpages/greenpages.db/src/main/resources/META-INF/MANIFEST.MF
+++ b/greenpages/greenpages.db/src/main/resources/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Bundle-Vendor: SpringSource
Bundle-Classpath: .
-Bundle-Version: 2.5.0
-Tool: Bundlor 1.1.0.M04
+Bundle-Version: 2.6.0
+Tool: Bundlor 1.1.0.RELEASE
Bundle-Name: GreenPages DataSource
Bundle-ManifestVersion: 2
Bundle-SymbolicName: greenpages.db
diff --git a/greenpages/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF b/greenpages/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
index 2f3a098..94bab51 100644
--- a/greenpages/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
+++ b/greenpages/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
@@ -3,15 +3,16 @@ Import-Bundle: com.springsource.org.eclipse.persistence;version="[1.0.
0, 1.0.0]",com.springsource.org.eclipse.persistence.jpa;version="[1.0
.0, 1.0.0]"
Bundle-Vendor: SpringSource
-Bundle-Version: 2.5.0
-Tool: Bundlor 1.1.0.M04
+Bundle-Version: 2.6.0
+Tool: Bundlor 1.1.0.RELEASE
Bundle-Name: GreenPages JPA
Bundle-ManifestVersion: 2
Bundle-SymbolicName: greenpages.jpa
-Import-Package: greenpages;version="[2.5, 2.6)",javax.persistence;version="[1, 1]",javax.sql;version="0",
- org.apache.commons.dbcp;version="[1.2.2.osgi, 1.2.2.osgi]",org.spring
- framework.context.weaving;version="[3.0, 3.5)",org.springframework.da
- o.annotation;version="[3.0, 3.5)",org.springframework.orm.jpa;version
- ="[3.0, 3.5)",org.springframework.orm.jpa.vendor;version="[3.0, 3.5)"
- ,org.springframework.transaction.aspectj;version="[3.0, 3.5)"
+Import-Package: greenpages;version="[2.5, 2.6)",javax.persistence;vers
+ ion="[1, 1]",javax.sql;version="0",org.apache.commons.dbcp;version="[
+ 1.2.2.osgi, 1.2.2.osgi]",org.springframework.context.weaving;version=
+ "[3.0, 3.5)",org.springframework.dao.annotation;version="[3.0, 3.5)",
+ org.springframework.orm.jpa;version="[3.0, 3.5)",org.springframework.
+ orm.jpa.vendor;version="[3.0, 3.5)",org.springframework.transaction.a
+ spectj;version="[3.0, 3.5)"
diff --git a/greenpages/greenpages.web/src/test/resources/META-INF/MANIFEST.MF b/greenpages/greenpages.web/src/test/resources/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..cee7b17
--- /dev/null
+++ b/greenpages/greenpages.web/src/test/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Import-Bundle: com.springsource.org.apache.taglibs.standard;version="[
+ 1.1.2,2.0)"
+Bundle-ClassPath: .,WEB-INF/classes
+Bundle-Version: 2.6.0
+Tool: Bundlor 1.1.0.RELEASE
+Bundle-Name: GreenPages Web
+Import-Library: org.springframework.spring;version="[3.0, 3.5)"
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: greenpages.web
+Web-ContextPath: greenpages
+Import-Package: freemarker.cache;version="[2.3.18,2.3.18]",javax.servl
+ et;version="[3.0.0, 3.1.0)",javax.servlet.jsp.jstl.core;version="[1.2
+ .0, 2.0.0)",javax.sql,org.apache.commons.dbcp,org.eclipse.virgo.web.d
+ m;version="[3.0.0, 4.0.0)"
+

Back to the top