Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2012-12-21 13:46:04 +0000
committerChristopher Frost2012-12-21 13:46:04 +0000
commit11318d6c622316c5818a10517b35846506da127d (patch)
tree0baaa1ebd0567bad62f50d1e35c13dce0fb6b645
parenta274cb42790fd8cc8958299a68bd445b56a83444 (diff)
downloadorg.eclipse.virgo.samples-11318d6c622316c5818a10517b35846506da127d.tar.gz
org.eclipse.virgo.samples-11318d6c622316c5818a10517b35846506da127d.tar.xz
org.eclipse.virgo.samples-11318d6c622316c5818a10517b35846506da127d.zip
387814 - Consolidate the 4 sample repo in to a single one and add a CI job
-rw-r--r--build-samples/README3
-rw-r--r--build-samples/build.xml47
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.classpath (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/.classpath)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.project (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/.project)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.settings/com.springsource.server.ide.bundlor.core.prefs (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/.settings/com.springsource.server.ide.bundlor.core.prefs)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.settings/org.eclipse.jdt.core.prefs (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.settings/org.eclipse.wst.common.project.facet.core.xml (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/.settings/org.eclipse.wst.common.project.facet.core.xml)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.springBeans (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/.springBeans)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/build.xml (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/build.xml)2
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/ivy.xml (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/ivy.xml)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/java/org/eclipse/virgo/sample/configuration/properties/core/PropertiesService.java (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/src/main/java/org/eclipse/virgo/sample/configuration/properties/core/PropertiesService.java)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/java/org/eclipse/virgo/sample/configuration/properties/core/StandardPropertiesService.java (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/src/main/java/org/eclipse/virgo/sample/configuration/properties/core/StandardPropertiesService.java)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/resources/META-INF/MANIFEST.MF (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/src/main/resources/META-INF/MANIFEST.MF)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/resources/META-INF/spring/module-context.xml (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/src/main/resources/META-INF/spring/module-context.xml)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/resources/META-INF/spring/osgi-context.xml (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/src/main/resources/META-INF/spring/osgi-context.xml)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/test/java/.gitignore (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/src/test/java/.gitignore)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/test/resources/.gitignore (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/src/test/resources/.gitignore)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/test/resources/META-INF/TEST.MF (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/src/test/resources/META-INF/TEST.MF)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/template.mf (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/template.mf)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.properties/.project (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.properties/.project)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.properties/.settings/org.eclipse.wst.common.project.facet.core.xml (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.properties/.settings/org.eclipse.wst.common.project.facet.core.xml)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.properties/build.xml (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.properties/build.xml)2
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.properties/ivy.xml (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.properties/ivy.xml)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.properties/src/org.eclipse.virgo.sample.configuration.properties (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.properties/src/org.eclipse.virgo.sample.configuration.properties)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.classpath (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.classpath)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.project (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.project)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.settings/.jsdtscope (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.settings/.jsdtscope)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.settings/com.springsource.server.ide.bundlor.core.prefs (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.settings/com.springsource.server.ide.bundlor.core.prefs)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.settings/org.eclipse.jdt.core.prefs (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.settings/org.eclipse.wst.common.component (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.wst.common.component)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.settings/org.eclipse.wst.common.project.facet.core.xml (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.wst.common.project.facet.core.xml)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.settings/org.eclipse.wst.jsdt.ui.superType.container (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.wst.jsdt.ui.superType.container)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.settings/org.eclipse.wst.jsdt.ui.superType.name (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.wst.jsdt.ui.superType.name)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.springBeans (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.springBeans)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/build.xml (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/build.xml)2
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/ivy.xml (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/ivy.xml)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/java/org/eclipse/virgo/sample/configuration/properties/web/PropertiesController.java (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/java/org/eclipse/virgo/sample/configuration/properties/web/PropertiesController.java)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/resources/.gitignore (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/resources/.gitignore)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/META-INF/MANIFEST.MF (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/META-INF/MANIFEST.MF)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/WEB-INF/applicationContext.xml (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/WEB-INF/applicationContext.xml)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/WEB-INF/jsp/properties.jsp (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/WEB-INF/jsp/properties.jsp)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/WEB-INF/sample-servlet.xml (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/WEB-INF/sample-servlet.xml)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/WEB-INF/web.xml (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/WEB-INF/web.xml)0
-rwxr-xr-xconfiguration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/favicon.ico (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/favicon.ico)bin1150 -> 1150 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/footer-left.png (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/footer-left.png)bin2792 -> 2792 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/footer-right.png (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/footer-right.png)bin2792 -> 2792 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/footer-stretch.png (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/footer-stretch.png)bin2726 -> 2726 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/header-left.png (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/header-left.png)bin2887 -> 2887 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/header-right.png (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/header-right.png)bin2918 -> 2918 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/loader-white-large.gif (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/loader-white-large.gif)bin7399 -> 7399 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/loader-white-small.gif (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/loader-white-small.gif)bin2228 -> 2228 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/menu-curve-left.png (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/menu-curve-left.png)bin1277 -> 1277 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/menu-curve-right.png (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/menu-curve-right.png)bin1278 -> 1278 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/menu-stretch.png (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/menu-stretch.png)bin2720 -> 2720 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/mini-header-left.png (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/mini-header-left.png)bin236 -> 236 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/mini-header-right.png (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/mini-header-right.png)bin955 -> 955 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/server-splash.png (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/server-splash.png)bin50830 -> 50830 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/spring.png (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/spring.png)bin3139 -> 3139 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/table-header-background.png (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/table-header-background.png)bin2765 -> 2765 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/index.html (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/index.html)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/styles/local.css (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/styles/local.css)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/styles/main.css (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/styles/main.css)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/styles/print.css (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/styles/print.css)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/test/java/.gitignore (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/test/java/.gitignore)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/test/resources/.gitignore (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/test/resources/.gitignore)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/template.mf (renamed from configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/template.mf)0
-rw-r--r--formtags/par/README.TXT10
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.domain/.classpath (renamed from formtags/par/org.springframework.showcase.formtags.domain/.classpath)0
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.domain/.project (renamed from formtags/par/org.springframework.showcase.formtags.domain/.project)2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.domain/.settings/org.eclipse.jdt.core.prefs (renamed from formtags/par/org.springframework.showcase.formtags.domain/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.domain/.settings/org.eclipse.wst.common.project.facet.core.xml (renamed from formtags/par/org.springframework.showcase.formtags.domain/.settings/org.eclipse.wst.common.project.facet.core.xml)0
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.domain/.springBeans (renamed from formtags/par/org.springframework.showcase.formtags.domain/.springBeans)0
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.domain/build.xml (renamed from formtags/par/org.springframework.showcase.formtags.domain/build.xml)2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.domain/ivy.xml (renamed from formtags/par/org.springframework.showcase.formtags.domain/ivy.xml)0
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/springframework/showcase/formtags/domain/Colour.java (renamed from formtags/war/formtags-war/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/springframework/showcase/formtags/domain/Country.java (renamed from formtags/war/formtags-war/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/springframework/showcase/formtags/domain/Preferences.java (renamed from formtags/shared-services/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/springframework/showcase/formtags/domain/User.java (renamed from formtags/shared-services/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.MF (renamed from formtags/par/org.springframework.showcase.formtags.domain/src/main/resources/META-INF/MANIFEST.MF)4
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.service/.classpath (renamed from formtags/par/org.springframework.showcase.formtags.service/.classpath)0
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.service/.project (renamed from formtags/par/org.springframework.showcase.formtags.service/.project)4
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.service/.settings/org.eclipse.jdt.core.prefs (renamed from formtags/par/org.springframework.showcase.formtags.service/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.service/.settings/org.eclipse.wst.common.project.facet.core.xml (renamed from formtags/par/org.springframework.showcase.formtags.service/.settings/org.eclipse.wst.common.project.facet.core.xml)0
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.service/.springBeans (renamed from formtags/par/org.springframework.showcase.formtags.service/.springBeans)0
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.service/build.xml (renamed from formtags/par/org.springframework.showcase.formtags.service/build.xml)2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.service/ivy.xml (renamed from formtags/par/org.springframework.showcase.formtags.service/ivy.xml)2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/java/org/springframework/showcase/formtags/service/UserManager.java (renamed from formtags/war/formtags-war/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/springframework/showcase/formtags/service/internal/StubUserManager.java (renamed from formtags/shared-services/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.MF8
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/resources/META-INF/spring/module-context.xml (renamed from formtags/shared-services/formtags-shared-services-service/src/main/resources/META-INF/spring/module-context.xml)2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/resources/META-INF/spring/osgi-context.xml (renamed from formtags/par/org.springframework.showcase.formtags.service/src/main/resources/META-INF/spring/osgi-context.xml)2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/.classpath (renamed from formtags/par/org.springframework.showcase.formtags.web/.classpath)0
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/.project (renamed from formtags/par/org.springframework.showcase.formtags.web/.project)6
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/.settings/org.eclipse.jdt.core.prefs (renamed from formtags/par/org.springframework.showcase.formtags.web/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/.settings/org.eclipse.wst.common.component (renamed from formtags/par/org.springframework.showcase.formtags.web/.settings/org.eclipse.wst.common.component)2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/.settings/org.eclipse.wst.common.project.facet.core.xml (renamed from formtags/par/org.springframework.showcase.formtags.web/.settings/org.eclipse.wst.common.project.facet.core.xml)0
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/.settings/org.eclipse.wst.jsdt.ui.superType.container (renamed from formtags/par/org.springframework.showcase.formtags.web/.settings/org.eclipse.wst.jsdt.ui.superType.container)0
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/.settings/org.eclipse.wst.jsdt.ui.superType.name (renamed from formtags/par/org.springframework.showcase.formtags.web/.settings/org.eclipse.wst.jsdt.ui.superType.name)0
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/.springBeans (renamed from formtags/par/org.springframework.showcase.formtags.web/.springBeans)0
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/build.xml (renamed from formtags/par/org.springframework.showcase.formtags.web/build.xml)2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/ivy.xml (renamed from formtags/par/org.springframework.showcase.formtags.web/ivy.xml)4
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/validation/CountryValidator.java (renamed from formtags/shared-libs/formtags-shared-libs/src/main/java/org/springframework/showcase/formtags/validation/CountryValidator.java)4
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/validation/UserValidator.java (renamed from formtags/par/org.springframework.showcase.formtags.web/src/main/java/org/springframework/showcase/formtags/validation/UserValidator.java)4
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/web/CountryEditor.java (renamed from formtags/par/org.springframework.showcase.formtags.web/src/main/java/org/springframework/showcase/formtags/web/CountryEditor.java)10
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/web/FormController.java (renamed from formtags/shared-libs/formtags-shared-libs/src/main/java/org/springframework/showcase/formtags/web/FormController.java)10
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/web/ListController.java (renamed from formtags/war/formtags-war/src/main/java/org/springframework/showcase/formtags/web/ListController.java)6
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/resources/i18n.properties (renamed from formtags/par/org.springframework.showcase.formtags.web/src/main/resources/i18n.properties)0
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/resources/i18n_en_GB.properties (renamed from formtags/par/org.springframework.showcase.formtags.web/src/main/resources/i18n_en_GB.properties)0
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/META-INF/MANIFEST.MF (renamed from formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/META-INF/MANIFEST.MF)6
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/WEB-INF/applicationContext.xml (renamed from formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/WEB-INF/applicationContext.xml)2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/WEB-INF/formtags-servlet.xml (renamed from formtags/war/formtags-war/src/main/webapp/WEB-INF/formtags-servlet.xml)8
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/WEB-INF/jsp/about.jsp (renamed from formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/WEB-INF/jsp/about.jsp)0
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/WEB-INF/jsp/form.jsp (renamed from formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/WEB-INF/jsp/form.jsp)0
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/WEB-INF/jsp/list.jsp (renamed from formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/WEB-INF/jsp/list.jsp)0
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/WEB-INF/web.xml (renamed from formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/WEB-INF/web.xml)0
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/css/base.css (renamed from formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/css/base.css)0
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/css/style.css (renamed from formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/css/style.css)0
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/favicon.ico (renamed from formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/favicon.ico)bin894 -> 894 bytes
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/index.jsp (renamed from formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/index.jsp)0
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags/.project (renamed from formtags/par/org.springframework.showcase.formtags/.project)2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags/.settings/org.eclipse.virgo.ide.runtime.core.par.xml6
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags/.settings/org.eclipse.wst.common.project.facet.core.xml (renamed from formtags/par/org.springframework.showcase.formtags/.settings/org.eclipse.wst.common.project.facet.core.xml)0
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags/.springBeans (renamed from formtags/par/org.springframework.showcase.formtags/.springBeans)0
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags/META-INF/MANIFEST.MF (renamed from formtags/par/org.springframework.showcase.formtags/META-INF/MANIFEST.MF)2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags/build.xml (renamed from formtags/par/org.springframework.showcase.formtags/build.xml)8
-rw-r--r--formtags/par/org.springframework.showcase.formtags.service/src/main/resources/META-INF/MANIFEST.MF8
-rw-r--r--formtags/par/org.springframework.showcase.formtags/.settings/org.eclipse.virgo.ide.runtime.core.par.xml6
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.classpath (renamed from formtags/shared-libs/formtags-shared-libs/.classpath)0
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.project (renamed from formtags/shared-libs/formtags-shared-libs/.project)0
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/.jsdtscope (renamed from formtags/shared-libs/formtags-shared-libs/.settings/.jsdtscope)0
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/com.springsource.server.ide.jdt.core.prefs (renamed from formtags/shared-libs/formtags-shared-libs/.settings/com.springsource.server.ide.jdt.core.prefs)0
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.jdt.core.prefs (renamed from formtags/shared-libs/formtags-shared-libs/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.jst.common.project.facet.core.prefs (renamed from formtags/shared-libs/formtags-shared-libs/.settings/org.eclipse.jst.common.project.facet.core.prefs)0
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.wst.common.component (renamed from formtags/shared-libs/formtags-shared-libs/.settings/org.eclipse.wst.common.component)0
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.wst.common.project.facet.core.xml (renamed from formtags/shared-libs/formtags-shared-libs/.settings/org.eclipse.wst.common.project.facet.core.xml)0
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.wst.jsdt.ui.superType.container (renamed from formtags/shared-libs/formtags-shared-libs/.settings/org.eclipse.wst.jsdt.ui.superType.container)0
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.wst.jsdt.ui.superType.name (renamed from formtags/shared-libs/formtags-shared-libs/.settings/org.eclipse.wst.jsdt.ui.superType.name)0
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.springBeans (renamed from formtags/shared-libs/formtags-shared-libs/.springBeans)0
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/build.xml (renamed from formtags/shared-libs/formtags-shared-libs/build.xml)2
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/ivy.xml (renamed from formtags/shared-libs/formtags-shared-libs/ivy.xml)0
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/java/org/springframework/showcase/formtags/domain/Colour.java (renamed from formtags/shared-libs/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/springframework/showcase/formtags/domain/Country.java (renamed from formtags/shared-libs/formtags-shared-libs/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/springframework/showcase/formtags/domain/Preferences.java (renamed from formtags/shared-libs/formtags-shared-libs/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/springframework/showcase/formtags/domain/User.java (renamed from formtags/par/org.springframework.showcase.formtags.domain/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/springframework/showcase/formtags/service/StubUserManager.java (renamed from formtags/shared-libs/formtags-shared-libs/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/springframework/showcase/formtags/service/UserManager.java (renamed from formtags/par/org.springframework.showcase.formtags.service/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/springframework/showcase/formtags/validation/CountryValidator.java (renamed from formtags/war/formtags-war/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/springframework/showcase/formtags/validation/UserValidator.java (renamed from formtags/shared-services/formtags-shared-services-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/springframework/showcase/formtags/web/CountryEditor.java (renamed from formtags/shared-services/formtags-shared-services-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/springframework/showcase/formtags/web/FormController.java (renamed from formtags/shared-services/formtags-shared-services-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/springframework/showcase/formtags/web/ListController.java (renamed from formtags/par/org.springframework.showcase.formtags.web/src/main/java/org/springframework/showcase/formtags/web/ListController.java)6
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/resources/i18n.properties (renamed from formtags/shared-libs/formtags-shared-libs/src/main/resources/i18n.properties)0
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/resources/i18n_en_GB.properties (renamed from formtags/shared-libs/formtags-shared-libs/src/main/resources/i18n_en_GB.properties)0
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/META-INF/MANIFEST.MF (renamed from formtags/shared-libs/formtags-shared-libs/src/main/webapp/META-INF/MANIFEST.MF)2
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/WEB-INF/applicationContext.xml (renamed from formtags/shared-libs/formtags-shared-libs/src/main/webapp/WEB-INF/applicationContext.xml)2
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/WEB-INF/formtags-servlet.xml (renamed from formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/WEB-INF/formtags-servlet.xml)8
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/WEB-INF/jsp/about.jsp (renamed from formtags/shared-libs/formtags-shared-libs/src/main/webapp/WEB-INF/jsp/about.jsp)0
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/WEB-INF/jsp/form.jsp (renamed from formtags/shared-libs/formtags-shared-libs/src/main/webapp/WEB-INF/jsp/form.jsp)0
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/WEB-INF/jsp/list.jsp (renamed from formtags/shared-libs/formtags-shared-libs/src/main/webapp/WEB-INF/jsp/list.jsp)0
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/WEB-INF/web.xml (renamed from formtags/shared-libs/formtags-shared-libs/src/main/webapp/WEB-INF/web.xml)0
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/css/base.css (renamed from formtags/shared-libs/formtags-shared-libs/src/main/webapp/css/base.css)0
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/css/style.css (renamed from formtags/shared-libs/formtags-shared-libs/src/main/webapp/css/style.css)0
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/favicon.ico (renamed from formtags/shared-libs/formtags-shared-libs/src/main/webapp/favicon.ico)bin894 -> 894 bytes
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/index.jsp (renamed from formtags/shared-libs/formtags-shared-libs/src/main/webapp/index.jsp)0
-rw-r--r--formtags/shared-services/formtags-shared-services-service/src/main/resources/META-INF/MANIFEST.MF9
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.classpath (renamed from formtags/shared-services/formtags-shared-services-service/.classpath)0
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.project (renamed from formtags/shared-services/formtags-shared-services-service/.project)0
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.settings/org.eclipse.jdt.core.prefs (renamed from formtags/shared-services/formtags-shared-services-service/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.settings/org.eclipse.jst.common.project.facet.core.prefs (renamed from formtags/shared-services/formtags-shared-services-service/.settings/org.eclipse.jst.common.project.facet.core.prefs)0
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.settings/org.eclipse.wst.common.project.facet.core.xml (renamed from formtags/shared-services/formtags-shared-services-service/.settings/org.eclipse.wst.common.project.facet.core.xml)0
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.springBeans (renamed from formtags/shared-services/formtags-shared-services-service/.springBeans)0
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/build.xml (renamed from formtags/shared-services/formtags-shared-services-service/build.xml)2
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/ivy.xml (renamed from formtags/shared-services/formtags-shared-services-service/ivy.xml)0
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/java/org/springframework/showcase/formtags/domain/Colour.java (renamed from formtags/par/org.springframework.showcase.formtags.domain/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/springframework/showcase/formtags/domain/Country.java (renamed from formtags/par/org.springframework.showcase.formtags.domain/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/springframework/showcase/formtags/domain/Preferences.java (renamed from formtags/par/org.springframework.showcase.formtags.domain/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/springframework/showcase/formtags/domain/User.java (renamed from formtags/shared-libs/formtags-shared-libs/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/springframework/showcase/formtags/service/UserManager.java (renamed from formtags/shared-services/formtags-shared-services-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/springframework/showcase/formtags/service/internal/StubUserManager.java (renamed from formtags/par/org.springframework.showcase.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.service/src/main/resources/META-INF/MANIFEST.MF9
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/resources/META-INF/spring/module-context.xml (renamed from formtags/par/org.springframework.showcase.formtags.service/src/main/resources/META-INF/spring/module-context.xml)2
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/resources/META-INF/spring/osgi-context.xml (renamed from formtags/shared-services/formtags-shared-services-service/src/main/resources/META-INF/spring/osgi-context.xml)2
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.classpath (renamed from formtags/shared-services/formtags-shared-services-war/.classpath)0
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.project (renamed from formtags/shared-services/formtags-shared-services-war/.project)0
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/.jsdtscope (renamed from formtags/shared-services/formtags-shared-services-war/.settings/.jsdtscope)0
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.jdt.core.prefs (renamed from formtags/shared-services/formtags-shared-services-war/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.jst.common.project.facet.core.prefs (renamed from formtags/shared-services/formtags-shared-services-war/.settings/org.eclipse.jst.common.project.facet.core.prefs)0
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.wst.common.component (renamed from formtags/shared-services/formtags-shared-services-war/.settings/org.eclipse.wst.common.component)0
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.wst.common.project.facet.core.xml (renamed from formtags/shared-services/formtags-shared-services-war/.settings/org.eclipse.wst.common.project.facet.core.xml)0
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.wst.jsdt.ui.superType.container (renamed from formtags/shared-services/formtags-shared-services-war/.settings/org.eclipse.wst.jsdt.ui.superType.container)0
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.wst.jsdt.ui.superType.name (renamed from formtags/shared-services/formtags-shared-services-war/.settings/org.eclipse.wst.jsdt.ui.superType.name)0
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.springBeans (renamed from formtags/shared-services/formtags-shared-services-war/.springBeans)0
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/build.xml (renamed from formtags/shared-services/formtags-shared-services-war/build.xml)2
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/ivy.xml (renamed from formtags/shared-services/formtags-shared-services-war/ivy.xml)0
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/springframework/showcase/formtags/validation/CountryValidator.java (renamed from formtags/shared-services/formtags-shared-services-war/src/main/java/org/springframework/showcase/formtags/validation/CountryValidator.java)4
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/springframework/showcase/formtags/validation/UserValidator.java (renamed from formtags/shared-libs/formtags-shared-libs/src/main/java/org/springframework/showcase/formtags/validation/UserValidator.java)4
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/springframework/showcase/formtags/web/CountryEditor.java (renamed from formtags/shared-libs/formtags-shared-libs/src/main/java/org/springframework/showcase/formtags/web/CountryEditor.java)10
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/springframework/showcase/formtags/web/FormController.java (renamed from formtags/par/org.springframework.showcase.formtags.web/src/main/java/org/springframework/showcase/formtags/web/FormController.java)10
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/springframework/showcase/formtags/web/ListController.java (renamed from formtags/shared-services/formtags-shared-services-war/src/main/java/org/springframework/showcase/formtags/web/ListController.java)6
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/resources/i18n.properties (renamed from formtags/shared-services/formtags-shared-services-war/src/main/resources/i18n.properties)0
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/resources/i18n_en_GB.properties (renamed from formtags/shared-services/formtags-shared-services-war/src/main/resources/i18n_en_GB.properties)0
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/META-INF/MANIFEST.MF (renamed from formtags/shared-services/formtags-shared-services-war/src/main/webapp/META-INF/MANIFEST.MF)6
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/WEB-INF/applicationContext.xml (renamed from formtags/shared-services/formtags-shared-services-war/src/main/webapp/WEB-INF/applicationContext.xml)2
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/WEB-INF/formtags-servlet.xml (renamed from formtags/shared-services/formtags-shared-services-war/src/main/webapp/WEB-INF/formtags-servlet.xml)8
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/WEB-INF/jsp/about.jsp (renamed from formtags/shared-services/formtags-shared-services-war/src/main/webapp/WEB-INF/jsp/about.jsp)0
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/WEB-INF/jsp/form.jsp (renamed from formtags/shared-services/formtags-shared-services-war/src/main/webapp/WEB-INF/jsp/form.jsp)0
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/WEB-INF/jsp/list.jsp (renamed from formtags/shared-services/formtags-shared-services-war/src/main/webapp/WEB-INF/jsp/list.jsp)0
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/WEB-INF/web.xml (renamed from formtags/shared-services/formtags-shared-services-war/src/main/webapp/WEB-INF/web.xml)0
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/css/base.css (renamed from formtags/shared-services/formtags-shared-services-war/src/main/webapp/css/base.css)0
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/css/style.css (renamed from formtags/shared-services/formtags-shared-services-war/src/main/webapp/css/style.css)0
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/favicon.ico (renamed from formtags/shared-services/formtags-shared-services-war/src/main/webapp/favicon.ico)bin894 -> 894 bytes
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/index.jsp (renamed from formtags/shared-services/formtags-shared-services-war/src/main/webapp/index.jsp)0
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/.classpath (renamed from formtags/war/formtags-war/.classpath)0
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/.project (renamed from formtags/war/formtags-war/.project)0
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/.jsdtscope (renamed from formtags/war/formtags-war/.settings/.jsdtscope)0
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.jdt.core.prefs (renamed from formtags/war/formtags-war/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.jst.common.project.facet.core.prefs (renamed from formtags/war/formtags-war/.settings/org.eclipse.jst.common.project.facet.core.prefs)0
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.wst.common.component (renamed from formtags/war/formtags-war/.settings/org.eclipse.wst.common.component)0
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.wst.common.project.facet.core.xml (renamed from formtags/war/formtags-war/.settings/org.eclipse.wst.common.project.facet.core.xml)0
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.wst.jsdt.ui.superType.container (renamed from formtags/war/formtags-war/.settings/org.eclipse.wst.jsdt.ui.superType.container)0
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.wst.jsdt.ui.superType.name (renamed from formtags/war/formtags-war/.settings/org.eclipse.wst.jsdt.ui.superType.name)0
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/.springBeans (renamed from formtags/war/formtags-war/.springBeans)0
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/build.xml (renamed from formtags/war/formtags-war/build.xml)2
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/ivy.xml (renamed from formtags/war/formtags-war/ivy.xml)0
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/domain/Colour.java (renamed from formtags/shared-services/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/springframework/showcase/formtags/domain/Country.java (renamed from formtags/shared-services/formtags-shared-services-service/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/springframework/showcase/formtags/domain/Preferences.java (renamed from formtags/war/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/springframework/showcase/formtags/domain/User.java (renamed from formtags/war/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/springframework/showcase/formtags/service/StubUserManager.java (renamed from formtags/war/formtags-war/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/springframework/showcase/formtags/service/UserManager.java (renamed from formtags/shared-libs/formtags-shared-libs/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/springframework/showcase/formtags/validation/CountryValidator.java (renamed from formtags/par/org.springframework.showcase.formtags.web/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/springframework/showcase/formtags/validation/UserValidator.java (renamed from formtags/war/formtags-war/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/springframework/showcase/formtags/web/CountryEditor.java (renamed from formtags/war/formtags-war/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/springframework/showcase/formtags/web/FormController.java (renamed from formtags/war/formtags-war/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/springframework/showcase/formtags/web/ListController.java (renamed from formtags/shared-libs/formtags-shared-libs/src/main/java/org/springframework/showcase/formtags/web/ListController.java)6
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/resources/i18n.properties (renamed from formtags/war/formtags-war/src/main/resources/i18n.properties)0
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/resources/i18n_en_GB.properties (renamed from formtags/war/formtags-war/src/main/resources/i18n_en_GB.properties)0
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/META-INF/MANIFEST.MF (renamed from formtags/war/formtags-war/src/main/webapp/META-INF/MANIFEST.MF)0
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/applicationContext.xml (renamed from formtags/war/formtags-war/src/main/webapp/WEB-INF/applicationContext.xml)2
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/formtags-servlet.xml (renamed from formtags/shared-libs/formtags-shared-libs/src/main/webapp/WEB-INF/formtags-servlet.xml)8
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/jsp/about.jsp (renamed from formtags/war/formtags-war/src/main/webapp/WEB-INF/jsp/about.jsp)0
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/jsp/form.jsp (renamed from formtags/war/formtags-war/src/main/webapp/WEB-INF/jsp/form.jsp)0
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/jsp/list.jsp (renamed from formtags/war/formtags-war/src/main/webapp/WEB-INF/jsp/list.jsp)0
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/com.springsource.javax.servlet-2.5.0.jar (renamed from formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/com.springsource.javax.servlet-2.5.0.jar)bin89582 -> 89582 bytes
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/com.springsource.javax.servlet.jsp.jstl-1.1.2.jar (renamed from formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/com.springsource.javax.servlet.jsp.jstl-1.1.2.jar)bin21266 -> 21266 bytes
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/com.springsource.org.apache.commons.logging-1.1.1.jar (renamed from formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/com.springsource.org.apache.commons.logging-1.1.1.jar)bin61464 -> 61464 bytes
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/com.springsource.org.apache.taglibs.standard-1.1.2.jar (renamed from formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/com.springsource.org.apache.taglibs.standard-1.1.2.jar)bin398371 -> 398371 bytes
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/org.springframework.asm-3.0.0.RELEASE.jar (renamed from formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/org.springframework.asm-3.0.0.RELEASE.jar)bin53081 -> 53081 bytes
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/org.springframework.beans-3.0.0.RELEASE.jar (renamed from formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/org.springframework.beans-3.0.0.RELEASE.jar)bin551967 -> 551967 bytes
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/org.springframework.context-3.0.0.RELEASE.jar (renamed from formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/org.springframework.context-3.0.0.RELEASE.jar)bin657492 -> 657492 bytes
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/org.springframework.context.support-3.0.0.RELEASE.jar (renamed from formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/org.springframework.context.support-3.0.0.RELEASE.jar)bin101176 -> 101176 bytes
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/org.springframework.core-3.0.0.RELEASE.jar (renamed from formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/org.springframework.core-3.0.0.RELEASE.jar)bin359338 -> 359338 bytes
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/org.springframework.expression-3.0.0.RELEASE.jar (renamed from formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/org.springframework.expression-3.0.0.RELEASE.jar)bin154200 -> 154200 bytes
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/org.springframework.web-3.0.0.RELEASE.jar (renamed from formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/org.springframework.web-3.0.0.RELEASE.jar)bin359154 -> 359154 bytes
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/org.springframework.web.servlet-3.0.0.RELEASE.jar (renamed from formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/org.springframework.web.servlet-3.0.0.RELEASE.jar)bin386749 -> 386749 bytes
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/web.xml (renamed from formtags/war/formtags-war/src/main/webapp/WEB-INF/web.xml)0
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/css/base.css (renamed from formtags/war/formtags-war/src/main/webapp/css/base.css)0
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/css/style.css (renamed from formtags/war/formtags-war/src/main/webapp/css/style.css)0
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/favicon.ico (renamed from formtags/war/formtags-war/src/main/webapp/favicon.ico)bin894 -> 894 bytes
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/index.jsp (renamed from formtags/war/formtags-war/src/main/webapp/index.jsp)0
-rw-r--r--osgi-examples/README (renamed from osgi-examples/basic-wiring/README)0
-rw-r--r--osgi-examples/bundle.x/.classpath (renamed from osgi-examples/basic-wiring/bundle.x/.classpath)0
-rw-r--r--osgi-examples/bundle.x/.project (renamed from osgi-examples/basic-wiring/bundle.x/.project)0
-rw-r--r--osgi-examples/bundle.x/.settings/org.eclipse.wst.common.project.facet.core.xml (renamed from osgi-examples/basic-wiring/bundle.x/.settings/org.eclipse.wst.common.project.facet.core.xml)0
-rw-r--r--osgi-examples/bundle.x/src/main/resources/META-INF/MANIFEST.MF (renamed from osgi-examples/basic-wiring/bundle.x/src/main/resources/META-INF/MANIFEST.MF)0
-rw-r--r--osgi-examples/bundle.y1/.classpath (renamed from osgi-examples/basic-wiring/bundle.y1/.classpath)0
-rw-r--r--osgi-examples/bundle.y1/.project (renamed from osgi-examples/basic-wiring/bundle.y1/.project)0
-rw-r--r--osgi-examples/bundle.y1/.settings/org.eclipse.wst.common.project.facet.core.xml (renamed from osgi-examples/basic-wiring/bundle.y1/.settings/org.eclipse.wst.common.project.facet.core.xml)0
-rw-r--r--osgi-examples/bundle.y1/src/main/resources/META-INF/MANIFEST.MF (renamed from osgi-examples/basic-wiring/bundle.y1/src/main/resources/META-INF/MANIFEST.MF)0
-rw-r--r--osgi-examples/bundle.y2/.classpath (renamed from osgi-examples/basic-wiring/bundle.y2/.classpath)0
-rw-r--r--osgi-examples/bundle.y2/.project (renamed from osgi-examples/basic-wiring/bundle.y2/.project)0
-rw-r--r--osgi-examples/bundle.y2/.settings/org.eclipse.wst.common.project.facet.core.xml (renamed from osgi-examples/basic-wiring/bundle.y2/.settings/org.eclipse.wst.common.project.facet.core.xml)0
-rw-r--r--osgi-examples/bundle.y2/src/main/resources/META-INF/MANIFEST.MF (renamed from osgi-examples/basic-wiring/bundle.y2/src/main/resources/META-INF/MANIFEST.MF)0
-rw-r--r--osgi-examples/bundle.z/.classpath (renamed from osgi-examples/basic-wiring/bundle.z/.classpath)0
-rw-r--r--osgi-examples/bundle.z/.project (renamed from osgi-examples/basic-wiring/bundle.z/.project)0
-rw-r--r--osgi-examples/bundle.z/src/main/resources/META-INF/MANIFEST.MF (renamed from osgi-examples/basic-wiring/bundle.z/src/main/resources/META-INF/MANIFEST.MF)0
-rw-r--r--osgi-examples/commands (renamed from osgi-examples/basic-wiring/commands)0
-rw-r--r--osgi-examples/ivy.xml23
-rw-r--r--osgi-examples/org.eclipse.osgi-3.7.0.v20110124-0830.jarbin1339731 -> 0 bytes
279 files changed, 260 insertions, 207 deletions
diff --git a/build-samples/README b/build-samples/README
new file mode 100644
index 0000000..61adc47
--- /dev/null
+++ b/build-samples/README
@@ -0,0 +1,3 @@
+To build all the samples and produce a combined zip for distribution, run;
+
+ant clean test package \ No newline at end of file
diff --git a/build-samples/build.xml b/build-samples/build.xml
index 263c8dc..0dc6ae8 100644
--- a/build-samples/build.xml
+++ b/build-samples/build.xml
@@ -5,14 +5,14 @@
<path id="bundles">
<path refid="unit.test.bundles" />
- <pathelement location="../configuration-properties/org.eclipse.virgo.sample.configuration.properties.properties"/>
- <pathelement location="../configuration-properties/org.eclipse.virgo.sample.configuration.properties.core"/>
- <pathelement location="../configuration-properties/org.eclipse.virgo.sample.configuration.properties.web"/>
- <pathelement location="../formtags/war/formtags-war" />
- <pathelement location="../formtags/shared-libs/formtags-shared-libs"/>
- <pathelement location="../formtags/shared-services/formtags-shared-services-service"/>
- <pathelement location="../formtags/shared-services/formtags-shared-services-war"/>
- <pathelement location="../formtags/par/org.springframework.showcase.formtags"/>
+ <pathelement location="../configuration-properties/org.eclipse.virgo.samples.configuration-properties.properties"/>
+ <pathelement location="../configuration-properties/org.eclipse.virgo.samples.configuration-properties.core"/>
+ <pathelement location="../configuration-properties/org.eclipse.virgo.samples.configuration-properties.web"/>
+ <pathelement location="../formtags/war/org.eclipse.virgo.samples.formtags.war" />
+ <pathelement location="../formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs"/>
+ <pathelement location="../formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service"/>
+ <pathelement location="../formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war"/>
+ <pathelement location="../formtags/par/org.eclipse.virgo.samples.formtags"/>
</path>
<path id="doc.bundles">
@@ -26,7 +26,7 @@
<property file="${basedir}/../build.versions"/>
<import file="${basedir}/../virgo-build/multi-bundle/default.xml"/>
- <target name="package-greenpages" description="Creates the release package for this project">
+ <target name="package" description="Creates the release package for this project">
<delete dir="${package.output.dir}" quiet="true"/>
<mkdir dir="${package.output.dir}"/>
<delete file="${package.output.file}" quiet="true"/>
@@ -36,7 +36,7 @@
<property name="docbook.output.dir" value="${package.docs.dir}"/>
</all-bundles>
- <copy todir="${package.output.dir}">
+ <copy todir="${package.output.dir}/greenpages">
<fileset dir="${basedir}/../greenpages">
<include name="db/**"/>
<include name="greenpages/**"/>
@@ -49,6 +49,33 @@
<exclude name="**/target/**"/>
</fileset>
</copy>
+
+ <copy todir="${package.output.dir}/osgi-101">
+ <fileset dir="${basedir}/../osgi-examples">
+ <include name="bundle.x/**"/>
+ <include name="bundle.y1/**"/>
+ <include name="bundle.y2/**"/>
+ <include name="bundle.z/**"/>
+ <include name="commands"/>
+ <exclude name="**/target/**"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${package.output.dir}/configuration-properties">
+ <fileset dir="${basedir}/../configuration-properties">
+ <include name="**/target/artifacts/*.jar"/>
+ <include name="**/target/artifacts/*.war"/>
+ </fileset>
+ <flattenmapper/>
+ </copy>
+
+ <copy todir="${package.output.dir}/formtags">
+ <fileset dir="${basedir}/../formtags">
+ <include name="**/target/artifacts/*.jar"/>
+ <include name="**/target/artifacts/*.war"/>
+ </fileset>
+ <flattenmapper/>
+ </copy>
<chmod perm="755">
<fileset dir="${package.output.dir}">
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/.classpath b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.classpath
index 43dbd3d..43dbd3d 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/.classpath
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.classpath
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/.project b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.project
index ade7b4d..ade7b4d 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/.project
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.project
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/.settings/com.springsource.server.ide.bundlor.core.prefs b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.settings/com.springsource.server.ide.bundlor.core.prefs
index eb109f7..eb109f7 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/.settings/com.springsource.server.ide.bundlor.core.prefs
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.settings/com.springsource.server.ide.bundlor.core.prefs
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/.settings/org.eclipse.jdt.core.prefs b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.settings/org.eclipse.jdt.core.prefs
index c7ec0a9..c7ec0a9 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/.settings/org.eclipse.jdt.core.prefs
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/configuration-properties/org.eclipse.virgo.sample.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 31a5903..31a5903 100644
--- a/configuration-properties/org.eclipse.virgo.sample.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
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/.springBeans b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.springBeans
index 34b281c..34b281c 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/.springBeans
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.springBeans
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/build.xml b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/build.xml
index f0a74f5..61dfce1 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/build.xml
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/build.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.virgo.sample.configuration.properties.core">
+<project name="org.eclipse.virgo.samples.configuration-properties.core">
<property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../build.versions"/>
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/ivy.xml b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/ivy.xml
index d541575..d541575 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/ivy.xml
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/ivy.xml
diff --git a/configuration-properties/org.eclipse.virgo.sample.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/sample/configuration/properties/core/PropertiesService.java
index fb56569..fb56569 100644
--- a/configuration-properties/org.eclipse.virgo.sample.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/sample/configuration/properties/core/PropertiesService.java
diff --git a/configuration-properties/org.eclipse.virgo.sample.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/sample/configuration/properties/core/StandardPropertiesService.java
index abfe28d..abfe28d 100644
--- a/configuration-properties/org.eclipse.virgo.sample.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/sample/configuration/properties/core/StandardPropertiesService.java
diff --git a/configuration-properties/org.eclipse.virgo.sample.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..e1cb377 100644
--- a/configuration-properties/org.eclipse.virgo.sample.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
diff --git a/configuration-properties/org.eclipse.virgo.sample.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..bf6beaf 100644
--- a/configuration-properties/org.eclipse.virgo.sample.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
diff --git a/configuration-properties/org.eclipse.virgo.sample.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..530c4da 100644
--- a/configuration-properties/org.eclipse.virgo.sample.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
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/src/test/java/.gitignore b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/test/java/.gitignore
index e69de29..e69de29 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/src/test/java/.gitignore
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/test/java/.gitignore
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/src/test/resources/.gitignore b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/test/resources/.gitignore
index e69de29..e69de29 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/src/test/resources/.gitignore
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/test/resources/.gitignore
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/src/test/resources/META-INF/TEST.MF b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/test/resources/META-INF/TEST.MF
index 3ec0672..3ec0672 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/src/test/resources/META-INF/TEST.MF
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/test/resources/META-INF/TEST.MF
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/template.mf b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/template.mf
index 1657aff..1657aff 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.core/template.mf
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/template.mf
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.properties/.project b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.properties/.project
index 981320e..981320e 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.properties/.project
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.properties/.project
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.properties/.settings/org.eclipse.wst.common.project.facet.core.xml b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.properties/.settings/org.eclipse.wst.common.project.facet.core.xml
index 801f856..801f856 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.properties/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.properties/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.properties/build.xml b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.properties/build.xml
index 3c3ffab..f354aee 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.properties/build.xml
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.properties/build.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.virgo.sample.configuration.properties.properties">
+<project name="org.eclipse.virgo.samples.configuration-properties.properties">
<property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../build.versions"/>
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.properties/ivy.xml b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.properties/ivy.xml
index 337f93b..337f93b 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.properties/ivy.xml
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.properties/ivy.xml
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.properties/src/org.eclipse.virgo.sample.configuration.properties b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.properties/src/org.eclipse.virgo.sample.configuration.properties
index 3b03725..3b03725 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.properties/src/org.eclipse.virgo.sample.configuration.properties
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.properties/src/org.eclipse.virgo.sample.configuration.properties
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.classpath b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.classpath
index 6f131eb..6f131eb 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.classpath
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.classpath
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.project b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.project
index bc28d44..bc28d44 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.project
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.project
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.settings/.jsdtscope b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.settings/.jsdtscope
index 5d8de19..5d8de19 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.settings/.jsdtscope
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.settings/.jsdtscope
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.settings/com.springsource.server.ide.bundlor.core.prefs b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.settings/com.springsource.server.ide.bundlor.core.prefs
index dea2208..dea2208 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.settings/com.springsource.server.ide.bundlor.core.prefs
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.settings/com.springsource.server.ide.bundlor.core.prefs
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.jdt.core.prefs b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.settings/org.eclipse.jdt.core.prefs
index f26c14e..f26c14e 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.jdt.core.prefs
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.settings/org.eclipse.jdt.core.prefs
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.wst.common.component b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.settings/org.eclipse.wst.common.component
index ebc4447..ebc4447 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.wst.common.component
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.settings/org.eclipse.wst.common.component
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.wst.common.project.facet.core.xml b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.settings/org.eclipse.wst.common.project.facet.core.xml
index 66f4e39..66f4e39 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.wst.jsdt.ui.superType.container b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.settings/org.eclipse.wst.jsdt.ui.superType.container
index 3bd5d0a..3bd5d0a 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.settings/org.eclipse.wst.jsdt.ui.superType.container
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.wst.jsdt.ui.superType.name b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.settings/org.eclipse.wst.jsdt.ui.superType.name
index 05bd71b..05bd71b 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.settings/org.eclipse.wst.jsdt.ui.superType.name
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.springBeans b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.springBeans
index 34b281c..34b281c 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/.springBeans
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.springBeans
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/build.xml b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/build.xml
index 7b5c84a..930634f 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/build.xml
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/build.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.virgo.sample.configuration.properties.web">
+<project name="org.eclipse.virgo.samples.configuration-properties.web">
<property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../build.versions"/>
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/ivy.xml b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/ivy.xml
index bec12ad..bec12ad 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/ivy.xml
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/ivy.xml
diff --git a/configuration-properties/org.eclipse.virgo.sample.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/sample/configuration/properties/web/PropertiesController.java
index 3cc9aa0..3cc9aa0 100644
--- a/configuration-properties/org.eclipse.virgo.sample.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/sample/configuration/properties/web/PropertiesController.java
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/resources/.gitignore b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/resources/.gitignore
index e69de29..e69de29 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/resources/.gitignore
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/resources/.gitignore
diff --git a/configuration-properties/org.eclipse.virgo.sample.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..b5d5c4f 100644
--- a/configuration-properties/org.eclipse.virgo.sample.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
diff --git a/configuration-properties/org.eclipse.virgo.sample.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..d58d75f 100644
--- a/configuration-properties/org.eclipse.virgo.sample.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
diff --git a/configuration-properties/org.eclipse.virgo.sample.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..9db256d 100644
--- a/configuration-properties/org.eclipse.virgo.sample.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
diff --git a/configuration-properties/org.eclipse.virgo.sample.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..8fa829a 100644
--- a/configuration-properties/org.eclipse.virgo.sample.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
diff --git a/configuration-properties/org.eclipse.virgo.sample.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..d71a201 100644
--- a/configuration-properties/org.eclipse.virgo.sample.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
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/favicon.ico b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/favicon.ico
index 9244a9c..9244a9c 100755
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/favicon.ico
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/favicon.ico
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/footer-left.png b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/footer-left.png
index 8bfe3b1..8bfe3b1 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/footer-left.png
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/footer-left.png
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/footer-right.png b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/footer-right.png
index 51527ad..51527ad 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/footer-right.png
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/footer-right.png
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/footer-stretch.png b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/footer-stretch.png
index c58f721..c58f721 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/footer-stretch.png
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/footer-stretch.png
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/header-left.png b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/header-left.png
index 4920a0a..4920a0a 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/header-left.png
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/header-left.png
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/header-right.png b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/header-right.png
index 09b0a59..09b0a59 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/header-right.png
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/header-right.png
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/loader-white-large.gif b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/loader-white-large.gif
index aa4ec5a..aa4ec5a 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/loader-white-large.gif
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/loader-white-large.gif
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/loader-white-small.gif b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/loader-white-small.gif
index 75ad2b3..75ad2b3 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/loader-white-small.gif
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/loader-white-small.gif
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/menu-curve-left.png b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/menu-curve-left.png
index c48a2e0..c48a2e0 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/menu-curve-left.png
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/menu-curve-left.png
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/menu-curve-right.png b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/menu-curve-right.png
index 1f3b100..1f3b100 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/menu-curve-right.png
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/menu-curve-right.png
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/menu-stretch.png b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/menu-stretch.png
index 0ca66f7..0ca66f7 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/menu-stretch.png
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/menu-stretch.png
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/mini-header-left.png b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/mini-header-left.png
index 72551e7..72551e7 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/mini-header-left.png
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/mini-header-left.png
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/mini-header-right.png b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/mini-header-right.png
index 8aaf50c..8aaf50c 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/mini-header-right.png
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/mini-header-right.png
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/server-splash.png b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/server-splash.png
index f8fe1f9..f8fe1f9 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/server-splash.png
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/server-splash.png
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/spring.png b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/spring.png
index 05a1940..05a1940 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/spring.png
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/spring.png
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/table-header-background.png b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/table-header-background.png
index 8f2ba1b..8f2ba1b 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/table-header-background.png
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/table-header-background.png
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.sample.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..9840cca 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/index.html
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/index.html
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/styles/local.css b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/styles/local.css
index 8bdb7f4..8bdb7f4 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/styles/local.css
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/styles/local.css
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/styles/main.css b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/styles/main.css
index ea3ccff..ea3ccff 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/styles/main.css
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/styles/main.css
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/styles/print.css b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/styles/print.css
index 3abe1c0..3abe1c0 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/styles/print.css
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/styles/print.css
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/test/java/.gitignore b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/test/java/.gitignore
index e69de29..e69de29 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/test/java/.gitignore
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/test/java/.gitignore
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/test/resources/.gitignore b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/test/resources/.gitignore
index e69de29..e69de29 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/src/test/resources/.gitignore
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/test/resources/.gitignore
diff --git a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/template.mf b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/template.mf
index 3e45ff7..3e45ff7 100644
--- a/configuration-properties/org.eclipse.virgo.sample.configuration.properties.web/template.mf
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/template.mf
diff --git a/formtags/par/README.TXT b/formtags/par/README.TXT
index b560ff7..df445f1 100644
--- a/formtags/par/README.TXT
+++ b/formtags/par/README.TXT
@@ -15,16 +15,16 @@ converted into a PAR with domain and service bundles as well as a Web Module.
PROJECTS
- - org.springframework.showcase.formtags: the build directory for the PAR
- - org.springframework.showcase.formtags.domain: the domain classes
- - org.springframework.showcase.formtags.service: the service API and implementation
- - org.springframework.showcase.formtags.web: the web module
+ - org.eclipse.virgo.samples.formtags.formtags: the build directory for the PAR
+ - org.eclipse.virgo.samples.formtags.formtags.domain: the domain classes
+ - org.eclipse.virgo.samples.formtags.formtags.service: the service API and implementation
+ - org.eclipse.virgo.samples.formtags.formtags.web: the web module
--------------------------------------------------------------------------------
BUILD AND DEPLOYMENT
-1) $> cd org.springframework.showcase.formtags
+1) $> cd org.eclipse.virgo.samples.formtags.formtags
2) $> ant jar
diff --git a/formtags/par/org.springframework.showcase.formtags.domain/.classpath b/formtags/par/org.eclipse.virgo.samples.formtags.domain/.classpath
index 9abd83e..9abd83e 100644
--- a/formtags/par/org.springframework.showcase.formtags.domain/.classpath
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.domain/.classpath
diff --git a/formtags/par/org.springframework.showcase.formtags.domain/.project b/formtags/par/org.eclipse.virgo.samples.formtags.domain/.project
index 7f922c7..1e78258 100644
--- a/formtags/par/org.springframework.showcase.formtags.domain/.project
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.domain/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.springframework.showcase.formtags.domain</name>
+ <name>org.eclipse.virgo.samples.formtags.formtags.domain</name>
<comment></comment>
<projects>
</projects>
diff --git a/formtags/par/org.springframework.showcase.formtags.domain/.settings/org.eclipse.jdt.core.prefs b/formtags/par/org.eclipse.virgo.samples.formtags.domain/.settings/org.eclipse.jdt.core.prefs
index 57deb69..57deb69 100644
--- a/formtags/par/org.springframework.showcase.formtags.domain/.settings/org.eclipse.jdt.core.prefs
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.domain/.settings/org.eclipse.jdt.core.prefs
diff --git a/formtags/par/org.springframework.showcase.formtags.domain/.settings/org.eclipse.wst.common.project.facet.core.xml b/formtags/par/org.eclipse.virgo.samples.formtags.domain/.settings/org.eclipse.wst.common.project.facet.core.xml
index b9f452a..b9f452a 100644
--- a/formtags/par/org.springframework.showcase.formtags.domain/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.domain/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/formtags/par/org.springframework.showcase.formtags.domain/.springBeans b/formtags/par/org.eclipse.virgo.samples.formtags.domain/.springBeans
index 3949aa3..3949aa3 100644
--- a/formtags/par/org.springframework.showcase.formtags.domain/.springBeans
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.domain/.springBeans
diff --git a/formtags/par/org.springframework.showcase.formtags.domain/build.xml b/formtags/par/org.eclipse.virgo.samples.formtags.domain/build.xml
index 160a7fd..823cd92 100644
--- a/formtags/par/org.springframework.showcase.formtags.domain/build.xml
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.domain/build.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.springframework.showcase.formtags.domain">
+<project name="org.eclipse.virgo.samples.formtags.par.domain">
<property file="${basedir}/../../../build.properties" />
<property file="${basedir}/../../../build.versions" />
diff --git a/formtags/par/org.springframework.showcase.formtags.domain/ivy.xml b/formtags/par/org.eclipse.virgo.samples.formtags.domain/ivy.xml
index 9bbd94d..9bbd94d 100644
--- a/formtags/par/org.springframework.showcase.formtags.domain/ivy.xml
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.domain/ivy.xml
diff --git a/formtags/war/formtags-war/src/main/java/org/springframework/showcase/formtags/domain/Colour.java b/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/springframework/showcase/formtags/domain/Colour.java
index 88e715e..ae3ecef 100644
--- a/formtags/war/formtags-war/src/main/java/org/springframework/showcase/formtags/domain/Colour.java
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/springframework/showcase/formtags/domain/Colour.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.domain;
+package org.eclipse.virgo.samples.formtags.formtags.domain;
diff --git a/formtags/war/formtags-war/src/main/java/org/springframework/showcase/formtags/domain/Country.java b/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/springframework/showcase/formtags/domain/Country.java
index caf564c..3ac8011 100644
--- a/formtags/war/formtags-war/src/main/java/org/springframework/showcase/formtags/domain/Country.java
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/java/org/springframework/showcase/formtags/domain/Country.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.domain;
+package org.eclipse.virgo.samples.formtags.formtags.domain;
diff --git a/formtags/shared-services/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/springframework/showcase/formtags/domain/Preferences.java
index ab6c627..0149aae 100644
--- a/formtags/shared-services/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/springframework/showcase/formtags/domain/Preferences.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.domain;
+package org.eclipse.virgo.samples.formtags.formtags.domain;
diff --git a/formtags/shared-services/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/springframework/showcase/formtags/domain/User.java
index 925392f..eef8b10 100644
--- a/formtags/shared-services/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/springframework/showcase/formtags/domain/User.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.domain;
+package org.eclipse.virgo.samples.formtags.formtags.domain;
diff --git a/formtags/par/org.springframework.showcase.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 f5b11ca..d7121c5 100644
--- a/formtags/par/org.springframework.showcase.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
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Version: 3.0.0
Bundle-Name: FormTags Domain Model
-Bundle-SymbolicName: org.springframework.showcase.formtags.domain_par
-Export-Package: org.springframework.showcase.formtags.domain
+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"
Import-Library: org.springframework.spring;version="[2.5.6.A,4.0.0)"
diff --git a/formtags/par/org.springframework.showcase.formtags.service/.classpath b/formtags/par/org.eclipse.virgo.samples.formtags.service/.classpath
index 9abd83e..9abd83e 100644
--- a/formtags/par/org.springframework.showcase.formtags.service/.classpath
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.service/.classpath
diff --git a/formtags/par/org.springframework.showcase.formtags.service/.project b/formtags/par/org.eclipse.virgo.samples.formtags.service/.project
index e44f30a..c49dbc3 100644
--- a/formtags/par/org.springframework.showcase.formtags.service/.project
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.service/.project
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.springframework.showcase.formtags.service</name>
+ <name>org.eclipse.virgo.samples.formtags.formtags.service</name>
<comment></comment>
<projects>
- <project>org.springframework.showcase.formtags.domain</project>
+ <project>org.eclipse.virgo.samples.formtags.formtags.domain</project>
</projects>
<buildSpec>
<buildCommand>
diff --git a/formtags/par/org.springframework.showcase.formtags.service/.settings/org.eclipse.jdt.core.prefs b/formtags/par/org.eclipse.virgo.samples.formtags.service/.settings/org.eclipse.jdt.core.prefs
index 1c62194..1c62194 100644
--- a/formtags/par/org.springframework.showcase.formtags.service/.settings/org.eclipse.jdt.core.prefs
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.service/.settings/org.eclipse.jdt.core.prefs
diff --git a/formtags/par/org.springframework.showcase.formtags.service/.settings/org.eclipse.wst.common.project.facet.core.xml b/formtags/par/org.eclipse.virgo.samples.formtags.service/.settings/org.eclipse.wst.common.project.facet.core.xml
index b9f452a..b9f452a 100644
--- a/formtags/par/org.springframework.showcase.formtags.service/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.service/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/formtags/par/org.springframework.showcase.formtags.service/.springBeans b/formtags/par/org.eclipse.virgo.samples.formtags.service/.springBeans
index 02c34e1..02c34e1 100644
--- a/formtags/par/org.springframework.showcase.formtags.service/.springBeans
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.service/.springBeans
diff --git a/formtags/par/org.springframework.showcase.formtags.service/build.xml b/formtags/par/org.eclipse.virgo.samples.formtags.service/build.xml
index 511a48c..874a4f2 100644
--- a/formtags/par/org.springframework.showcase.formtags.service/build.xml
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.service/build.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.springframework.showcase.formtags.service">
+<project name="org.eclipse.virgo.samples.formtags.par.service">
<property file="${basedir}/../../../build.properties" />
<property file="${basedir}/../../../build.versions" />
diff --git a/formtags/par/org.springframework.showcase.formtags.service/ivy.xml b/formtags/par/org.eclipse.virgo.samples.formtags.service/ivy.xml
index 37e7b5b..26844bc 100644
--- a/formtags/par/org.springframework.showcase.formtags.service/ivy.xml
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.service/ivy.xml
@@ -17,7 +17,7 @@
</publications>
<dependencies>
- <dependency org="org.eclipse.virgo.samples" name="org.springframework.showcase.formtags.domain" rev="latest.integration" conf="compile->compile"/>
+ <dependency org="org.eclipse.virgo.samples" name="org.eclipse.virgo.samples.formtags.formtags.domain" rev="latest.integration" conf="compile->compile"/>
</dependencies>
</ivy-module>
diff --git a/formtags/war/formtags-war/src/main/java/org/springframework/showcase/formtags/service/UserManager.java b/formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/java/org/springframework/showcase/formtags/service/UserManager.java
index 5bcaa12..42b6090 100644
--- a/formtags/war/formtags-war/src/main/java/org/springframework/showcase/formtags/service/UserManager.java
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/java/org/springframework/showcase/formtags/service/UserManager.java
@@ -9,13 +9,13 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.service;
+package org.eclipse.virgo.samples.formtags.formtags.service;
-import org.springframework.showcase.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
-import org.springframework.showcase.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.formtags.domain.User;
diff --git a/formtags/shared-services/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/springframework/showcase/formtags/service/internal/StubUserManager.java
index f47660e..b9b803e 100644
--- a/formtags/shared-services/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/springframework/showcase/formtags/service/internal/StubUserManager.java
@@ -9,15 +9,15 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.service.internal;
+package org.eclipse.virgo.samples.formtags.formtags.service.internal;
-import org.springframework.showcase.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
-import org.springframework.showcase.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.formtags.domain.User;
-import org.springframework.showcase.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.formtags.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
new file mode 100644
index 0000000..a875242
--- /dev/null
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+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
+
diff --git a/formtags/shared-services/formtags-shared-services-service/src/main/resources/META-INF/spring/module-context.xml b/formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/resources/META-INF/spring/module-context.xml
index 8593098..ff6b5ea 100644
--- a/formtags/shared-services/formtags-shared-services-service/src/main/resources/META-INF/spring/module-context.xml
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/resources/META-INF/spring/module-context.xml
@@ -10,6 +10,6 @@
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
- <bean id="userManager" class="org.springframework.showcase.formtags.service.internal.StubUserManager"/>
+ <bean id="userService" class="org.eclipse.virgo.samples.formtags.formtags.service.internal.StubUserManager"/>
</beans>
diff --git a/formtags/par/org.springframework.showcase.formtags.service/src/main/resources/META-INF/spring/osgi-context.xml b/formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/resources/META-INF/spring/osgi-context.xml
index 57ae111..915c1d0 100644
--- a/formtags/par/org.springframework.showcase.formtags.service/src/main/resources/META-INF/spring/osgi-context.xml
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/resources/META-INF/spring/osgi-context.xml
@@ -9,6 +9,6 @@
http://www.springframework.org/schema/beans/spring-beans.xsd">
<service ref="userService"
- interface="org.springframework.showcase.formtags.service.UserManager" />
+ interface="org.eclipse.virgo.samples.formtags.formtags.service.UserManager" />
</beans:beans> \ No newline at end of file
diff --git a/formtags/par/org.springframework.showcase.formtags.web/.classpath b/formtags/par/org.eclipse.virgo.samples.formtags.web/.classpath
index 9abd83e..9abd83e 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/.classpath
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/.classpath
diff --git a/formtags/par/org.springframework.showcase.formtags.web/.project b/formtags/par/org.eclipse.virgo.samples.formtags.web/.project
index fa4f409..ddb618c 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/.project
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/.project
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.springframework.showcase.formtags.web</name>
+ <name>org.eclipse.virgo.samples.formtags.formtags.web</name>
<comment></comment>
<projects>
- <project>org.springframework.showcase.formtags.domain</project>
- <project>org.springframework.showcase.formtags.service</project>
+ <project>org.eclipse.virgo.samples.formtags.formtags.domain</project>
+ <project>org.eclipse.virgo.samples.formtags.formtags.service</project>
</projects>
<buildSpec>
<buildCommand>
diff --git a/formtags/par/org.springframework.showcase.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..935ed0d 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/.settings/org.eclipse.jdt.core.prefs
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/.settings/org.eclipse.jdt.core.prefs
diff --git a/formtags/par/org.springframework.showcase.formtags.web/.settings/org.eclipse.wst.common.component b/formtags/par/org.eclipse.virgo.samples.formtags.web/.settings/org.eclipse.wst.common.component
index 212d673..a95a9ae 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/.settings/org.eclipse.wst.common.component
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/.settings/org.eclipse.wst.common.component
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-modules id="moduleCoreId" project-version="1.5.0">
-<wb-module deploy-name="org.springframework.showcase.formtags.web">
+<wb-module deploy-name="org.eclipse.virgo.samples.formtags.formtags.web">
<wb-resource deploy-path="/" source-path="/src/main/webapp"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
diff --git a/formtags/par/org.springframework.showcase.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 94643fd..94643fd 100644
--- a/formtags/par/org.springframework.showcase.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
diff --git a/formtags/par/org.springframework.showcase.formtags.web/.settings/org.eclipse.wst.jsdt.ui.superType.container b/formtags/par/org.eclipse.virgo.samples.formtags.web/.settings/org.eclipse.wst.jsdt.ui.superType.container
index 3bd5d0a..3bd5d0a 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/.settings/org.eclipse.wst.jsdt.ui.superType.container
diff --git a/formtags/par/org.springframework.showcase.formtags.web/.settings/org.eclipse.wst.jsdt.ui.superType.name b/formtags/par/org.eclipse.virgo.samples.formtags.web/.settings/org.eclipse.wst.jsdt.ui.superType.name
index 05bd71b..05bd71b 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/.settings/org.eclipse.wst.jsdt.ui.superType.name
diff --git a/formtags/par/org.springframework.showcase.formtags.web/.springBeans b/formtags/par/org.eclipse.virgo.samples.formtags.web/.springBeans
index 8ce1035..8ce1035 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/.springBeans
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/.springBeans
diff --git a/formtags/par/org.springframework.showcase.formtags.web/build.xml b/formtags/par/org.eclipse.virgo.samples.formtags.web/build.xml
index 2d20fd3..98631ba 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/build.xml
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/build.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.springframework.showcase.formtags.web">
+<project name="org.eclipse.virgo.samples.formtags.par.web">
<property file="${basedir}/../../../build.properties" />
<property file="${basedir}/../../../build.versions" />
diff --git a/formtags/par/org.springframework.showcase.formtags.web/ivy.xml b/formtags/par/org.eclipse.virgo.samples.formtags.web/ivy.xml
index 1ec4aae..7335825 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/ivy.xml
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/ivy.xml
@@ -17,8 +17,8 @@
</publications>
<dependencies>
- <dependency org="org.eclipse.virgo.samples" name="org.springframework.showcase.formtags.domain" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.eclipse.virgo.samples" name="org.springframework.showcase.formtags.service" rev="latest.integration" conf="compile->compile"/>
+ <dependency org="org.eclipse.virgo.samples" name="org.eclipse.virgo.samples.formtags.formtags.domain" rev="latest.integration" conf="compile->compile"/>
+ <dependency org="org.eclipse.virgo.samples" name="org.eclipse.virgo.samples.formtags.formtags.service" rev="latest.integration" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.spring-library" rev="${org.springframework}" conf="server-provided->compile"/>
<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="server-provided->compile"/>
diff --git a/formtags/shared-libs/formtags-shared-libs/src/main/java/org/springframework/showcase/formtags/validation/CountryValidator.java b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/validation/CountryValidator.java
index c4a591c..328326c 100644
--- a/formtags/shared-libs/formtags-shared-libs/src/main/java/org/springframework/showcase/formtags/validation/CountryValidator.java
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/validation/CountryValidator.java
@@ -9,11 +9,11 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.validation;
+package org.eclipse.virgo.samples.formtags.formtags.validation;
-import org.springframework.showcase.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
import org.springframework.util.StringUtils;
diff --git a/formtags/par/org.springframework.showcase.formtags.web/src/main/java/org/springframework/showcase/formtags/validation/UserValidator.java b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/validation/UserValidator.java
index 88e8aad..0c71f27 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/src/main/java/org/springframework/showcase/formtags/validation/UserValidator.java
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/validation/UserValidator.java
@@ -9,11 +9,11 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.validation;
+package org.eclipse.virgo.samples.formtags.formtags.validation;
-import org.springframework.showcase.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.formtags.domain.User;
import org.springframework.validation.Errors;
diff --git a/formtags/par/org.springframework.showcase.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/springframework/showcase/formtags/web/CountryEditor.java
index 6c098e1..6b75b06 100644
--- a/formtags/par/org.springframework.showcase.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/springframework/showcase/formtags/web/CountryEditor.java
@@ -9,13 +9,13 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.web;
+package org.eclipse.virgo.samples.formtags.formtags.web;
-import org.springframework.showcase.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
-import org.springframework.showcase.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.formtags.service.UserManager;
@@ -25,7 +25,7 @@ import java.beans.PropertyEditorSupport;
/**
- * Simple {@link java.beans.PropertyEditor} for the {@link org.springframework.showcase.formtags.domain.Country} class.
+ * Simple {@link java.beans.PropertyEditor} for the {@link org.eclipse.virgo.samples.formtags.formtags.domain.Country} class.
*
@@ -44,7 +44,7 @@ public class CountryEditor extends PropertyEditorSupport {
/**
- * Creates a new instance of the {@link org.springframework.showcase.formtags.web.CountryEditor} class.
+ * Creates a new instance of the {@link org.eclipse.virgo.samples.formtags.formtags.web.CountryEditor} class.
*
diff --git a/formtags/shared-libs/formtags-shared-libs/src/main/java/org/springframework/showcase/formtags/web/FormController.java b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/web/FormController.java
index 70a82f0..f9960f3 100644
--- a/formtags/shared-libs/formtags-shared-libs/src/main/java/org/springframework/showcase/formtags/web/FormController.java
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/web/FormController.java
@@ -9,19 +9,19 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.web;
+package org.eclipse.virgo.samples.formtags.formtags.web;
import org.springframework.core.enums.StaticLabeledEnumResolver;
-import org.springframework.showcase.formtags.domain.Colour;
+import org.eclipse.virgo.samples.formtags.formtags.domain.Colour;
-import org.springframework.showcase.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
-import org.springframework.showcase.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.formtags.domain.User;
-import org.springframework.showcase.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.formtags.service.UserManager;
import org.springframework.ui.ModelMap;
diff --git a/formtags/war/formtags-war/src/main/java/org/springframework/showcase/formtags/web/ListController.java b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/web/ListController.java
index b98d743..b9a0f03 100644
--- a/formtags/war/formtags-war/src/main/java/org/springframework/showcase/formtags/web/ListController.java
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/springframework/showcase/formtags/web/ListController.java
@@ -9,11 +9,11 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.web;
+package org.eclipse.virgo.samples.formtags.formtags.web;
-import org.springframework.showcase.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.formtags.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.springframework.showcase.formtags.domain.User Users}
+ * to render a list) of all of the {@link org.eclipse.virgo.samples.formtags.formtags.domain.User Users}
* in the application.
diff --git a/formtags/par/org.springframework.showcase.formtags.web/src/main/resources/i18n.properties b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/resources/i18n.properties
index fa1de17..fa1de17 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/src/main/resources/i18n.properties
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/resources/i18n.properties
diff --git a/formtags/par/org.springframework.showcase.formtags.web/src/main/resources/i18n_en_GB.properties b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/resources/i18n_en_GB.properties
index d597e96..d597e96 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/src/main/resources/i18n_en_GB.properties
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/resources/i18n_en_GB.properties
diff --git a/formtags/par/org.springframework.showcase.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 6180abb..0042aae 100644
--- a/formtags/par/org.springframework.showcase.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.springframework.showcase.formtags.web_par
-Import-Package: org.springframework.showcase.formtags.domain,
- org.springframework.showcase.formtags.service,
+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,
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.springframework.showcase.formtags.web/src/main/webapp/WEB-INF/applicationContext.xml b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/WEB-INF/applicationContext.xml
index 19a1a73..1176f5d 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/WEB-INF/applicationContext.xml
@@ -5,6 +5,6 @@
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.xsd">
- <reference id="userManager" interface="org.springframework.showcase.formtags.service.UserManager" />
+ <reference id="userManager" interface="org.eclipse.virgo.samples.formtags.formtags.service.UserManager" />
</beans:beans>
diff --git a/formtags/war/formtags-war/src/main/webapp/WEB-INF/formtags-servlet.xml b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/WEB-INF/formtags-servlet.xml
index 4e01c91..29ae38b 100644
--- a/formtags/war/formtags-war/src/main/webapp/WEB-INF/formtags-servlet.xml
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/WEB-INF/formtags-servlet.xml
@@ -7,20 +7,20 @@
<property name="suffix" value=".jsp"/>
</bean>
- <bean name="/list.htm" class="org.springframework.showcase.formtags.web.ListController">
+ <bean name="/list.htm" class="org.eclipse.virgo.samples.formtags.formtags.web.ListController">
<property name="userManager" ref="userManager"/>
</bean>
- <bean name="/form.htm" class="org.springframework.showcase.formtags.web.FormController">
+ <bean name="/form.htm" class="org.eclipse.virgo.samples.formtags.formtags.web.FormController">
<property name="formView" value="form"/>
<property name="successView" value="redirect:list.htm"/>
<property name="userManager" ref="userManager"/>
<property name="validators">
- <bean id="userValidator" class="org.springframework.showcase.formtags.validation.UserValidator"/>
+ <bean id="userValidator" class="org.eclipse.virgo.samples.formtags.formtags.validation.UserValidator"/>
</property>
</bean>
- <bean name="/about.htm" class="org.springframework.showcase.formtags.web.ListController">
+ <bean name="/about.htm" class="org.eclipse.virgo.samples.formtags.formtags.web.ListController">
<property name="userManager" ref="userManager"/>
<property name="viewName" value="about"/>
</bean>
diff --git a/formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/WEB-INF/jsp/about.jsp b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/WEB-INF/jsp/about.jsp
index 69bb766..69bb766 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/WEB-INF/jsp/about.jsp
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/WEB-INF/jsp/about.jsp
diff --git a/formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/WEB-INF/jsp/form.jsp b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/WEB-INF/jsp/form.jsp
index 7b67053..7b67053 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/WEB-INF/jsp/form.jsp
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/WEB-INF/jsp/form.jsp
diff --git a/formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/WEB-INF/jsp/list.jsp b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/WEB-INF/jsp/list.jsp
index 91f2eb7..91f2eb7 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/WEB-INF/jsp/list.jsp
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/WEB-INF/jsp/list.jsp
diff --git a/formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/WEB-INF/web.xml b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/WEB-INF/web.xml
index c7b9f3d..c7b9f3d 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/WEB-INF/web.xml
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/WEB-INF/web.xml
diff --git a/formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/css/base.css b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/css/base.css
index 4cafa80..4cafa80 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/css/base.css
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/css/base.css
diff --git a/formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/css/style.css b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/css/style.css
index 3b337a8..3b337a8 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/css/style.css
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/css/style.css
diff --git a/formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/favicon.ico b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/favicon.ico
index 7e54ebd..7e54ebd 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/favicon.ico
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/favicon.ico
Binary files differ
diff --git a/formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/index.jsp b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/index.jsp
index 92d1b12..92d1b12 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/index.jsp
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/index.jsp
diff --git a/formtags/par/org.springframework.showcase.formtags/.project b/formtags/par/org.eclipse.virgo.samples.formtags/.project
index c310bc1..67a541f 100644
--- a/formtags/par/org.springframework.showcase.formtags/.project
+++ b/formtags/par/org.eclipse.virgo.samples.formtags/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.springframework.showcase.formtags</name>
+ <name>org.eclipse.virgo.samples.formtags.formtags</name>
<comment></comment>
<projects>
</projects>
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags/.settings/org.eclipse.virgo.ide.runtime.core.par.xml b/formtags/par/org.eclipse.virgo.samples.formtags/.settings/org.eclipse.virgo.ide.runtime.core.par.xml
new file mode 100644
index 0000000..8125842
--- /dev/null
+++ b/formtags/par/org.eclipse.virgo.samples.formtags/.settings/org.eclipse.virgo.ide.runtime.core.par.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.virgo.ide.par:Par xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.virgo.ide.par="http://eclipse.org/virgo/par.ecore">
+ <bundle symbolicName="org.eclipse.virgo.samples.formtags.formtags.domain"/>
+ <bundle symbolicName="org.eclipse.virgo.samples.formtags.formtags.service"/>
+ <bundle symbolicName="org.eclipse.virgo.samples.formtags.formtags.web"/>
+</org.eclipse.virgo.ide.par:Par>
diff --git a/formtags/par/org.springframework.showcase.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 8383324..8383324 100644
--- a/formtags/par/org.springframework.showcase.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
diff --git a/formtags/par/org.springframework.showcase.formtags/.springBeans b/formtags/par/org.eclipse.virgo.samples.formtags/.springBeans
index 3949aa3..3949aa3 100644
--- a/formtags/par/org.springframework.showcase.formtags/.springBeans
+++ b/formtags/par/org.eclipse.virgo.samples.formtags/.springBeans
diff --git a/formtags/par/org.springframework.showcase.formtags/META-INF/MANIFEST.MF b/formtags/par/org.eclipse.virgo.samples.formtags/META-INF/MANIFEST.MF
index 3b5c5a2..e46a562 100644
--- a/formtags/par/org.springframework.showcase.formtags/META-INF/MANIFEST.MF
+++ b/formtags/par/org.eclipse.virgo.samples.formtags/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
-Application-SymbolicName: org.springframework.showcase.formtags_par
+Application-SymbolicName: org.eclipse.virgo.samples.formtags.formtags_par
Application-Version: 3.0.0
Application-Name: FormTags Showcase Application (PAR)
diff --git a/formtags/par/org.springframework.showcase.formtags/build.xml b/formtags/par/org.eclipse.virgo.samples.formtags/build.xml
index c001964..1a0b268 100644
--- a/formtags/par/org.springframework.showcase.formtags/build.xml
+++ b/formtags/par/org.eclipse.virgo.samples.formtags/build.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="formtags-par">
+<project name="org.eclipse.virgo.samples.formtags.par">
<path id="bundles">
- <pathelement location="../org.springframework.showcase.formtags.domain" />
- <pathelement location="../org.springframework.showcase.formtags.service" />
- <pathelement location="../org.springframework.showcase.formtags.web" />
+ <pathelement location="../org.eclipse.virgo.samples.formtags.domain" />
+ <pathelement location="../org.eclipse.virgo.samples.formtags.service" />
+ <pathelement location="../org.eclipse.virgo.samples.formtags.web" />
</path>
<property file="${basedir}/../../../build.properties" />
diff --git a/formtags/par/org.springframework.showcase.formtags.service/src/main/resources/META-INF/MANIFEST.MF b/formtags/par/org.springframework.showcase.formtags.service/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 987d6a7..0000000
--- a/formtags/par/org.springframework.showcase.formtags.service/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Version: 3.0.0
-Bundle-ManifestVersion: 2
-Bundle-Name: FormTags Service (and implementation)
-Bundle-SymbolicName: org.springframework.showcase.formtags.service_par
-Import-Package: org.springframework.showcase.formtags.domain
-Export-Package: org.springframework.showcase.formtags.service
-
diff --git a/formtags/par/org.springframework.showcase.formtags/.settings/org.eclipse.virgo.ide.runtime.core.par.xml b/formtags/par/org.springframework.showcase.formtags/.settings/org.eclipse.virgo.ide.runtime.core.par.xml
deleted file mode 100644
index 3848f66..0000000
--- a/formtags/par/org.springframework.showcase.formtags/.settings/org.eclipse.virgo.ide.runtime.core.par.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.virgo.ide.par:Par xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.virgo.ide.par="http://eclipse.org/virgo/par.ecore">
- <bundle symbolicName="org.springframework.showcase.formtags.domain"/>
- <bundle symbolicName="org.springframework.showcase.formtags.service"/>
- <bundle symbolicName="org.springframework.showcase.formtags.web"/>
-</org.eclipse.virgo.ide.par:Par>
diff --git a/formtags/shared-libs/formtags-shared-libs/.classpath b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.classpath
index 58d433f..58d433f 100644
--- a/formtags/shared-libs/formtags-shared-libs/.classpath
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.classpath
diff --git a/formtags/shared-libs/formtags-shared-libs/.project b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.project
index 2bc3cd7..2bc3cd7 100644
--- a/formtags/shared-libs/formtags-shared-libs/.project
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.project
diff --git a/formtags/shared-libs/formtags-shared-libs/.settings/.jsdtscope b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/.jsdtscope
index 8fbc6ca..8fbc6ca 100644
--- a/formtags/shared-libs/formtags-shared-libs/.settings/.jsdtscope
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/.jsdtscope
diff --git a/formtags/shared-libs/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
index fd17e07..fd17e07 100644
--- a/formtags/shared-libs/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
diff --git a/formtags/shared-libs/formtags-shared-libs/.settings/org.eclipse.jdt.core.prefs b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.jdt.core.prefs
index c8c423d..c8c423d 100644
--- a/formtags/shared-libs/formtags-shared-libs/.settings/org.eclipse.jdt.core.prefs
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.jdt.core.prefs
diff --git a/formtags/shared-libs/formtags-shared-libs/.settings/org.eclipse.jst.common.project.facet.core.prefs b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.jst.common.project.facet.core.prefs
index af1970c..af1970c 100644
--- a/formtags/shared-libs/formtags-shared-libs/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.jst.common.project.facet.core.prefs
diff --git a/formtags/shared-libs/formtags-shared-libs/.settings/org.eclipse.wst.common.component b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.wst.common.component
index 8abc65f..8abc65f 100644
--- a/formtags/shared-libs/formtags-shared-libs/.settings/org.eclipse.wst.common.component
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.wst.common.component
diff --git a/formtags/shared-libs/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 fa9b239..fa9b239 100644
--- a/formtags/shared-libs/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
diff --git a/formtags/shared-libs/formtags-shared-libs/.settings/org.eclipse.wst.jsdt.ui.superType.container b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.wst.jsdt.ui.superType.container
index 3bd5d0a..3bd5d0a 100644
--- a/formtags/shared-libs/formtags-shared-libs/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.wst.jsdt.ui.superType.container
diff --git a/formtags/shared-libs/formtags-shared-libs/.settings/org.eclipse.wst.jsdt.ui.superType.name b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.wst.jsdt.ui.superType.name
index 05bd71b..05bd71b 100644
--- a/formtags/shared-libs/formtags-shared-libs/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.settings/org.eclipse.wst.jsdt.ui.superType.name
diff --git a/formtags/shared-libs/formtags-shared-libs/.springBeans b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.springBeans
index 8ce1035..8ce1035 100644
--- a/formtags/shared-libs/formtags-shared-libs/.springBeans
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/.springBeans
diff --git a/formtags/shared-libs/formtags-shared-libs/build.xml b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/build.xml
index d4d0f33..2680f3b 100644
--- a/formtags/shared-libs/formtags-shared-libs/build.xml
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/build.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="formtags-shared-libs">
+<project name="org.eclipse.virgo.samples.formtags.shared-libs">
<property file="${basedir}/../../../build.properties" />
<property file="${basedir}/../../../build.versions" />
diff --git a/formtags/shared-libs/formtags-shared-libs/ivy.xml b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/ivy.xml
index e62805e..e62805e 100644
--- a/formtags/shared-libs/formtags-shared-libs/ivy.xml
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/ivy.xml
diff --git a/formtags/shared-libs/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/springframework/showcase/formtags/domain/Colour.java
index 88e715e..ae3ecef 100644
--- a/formtags/shared-libs/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/springframework/showcase/formtags/domain/Colour.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.domain;
+package org.eclipse.virgo.samples.formtags.formtags.domain;
diff --git a/formtags/shared-libs/formtags-shared-libs/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/springframework/showcase/formtags/domain/Country.java
index caf564c..3ac8011 100644
--- a/formtags/shared-libs/formtags-shared-libs/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/springframework/showcase/formtags/domain/Country.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.domain;
+package org.eclipse.virgo.samples.formtags.formtags.domain;
diff --git a/formtags/shared-libs/formtags-shared-libs/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/springframework/showcase/formtags/domain/Preferences.java
index ab6c627..0149aae 100644
--- a/formtags/shared-libs/formtags-shared-libs/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/springframework/showcase/formtags/domain/Preferences.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.domain;
+package org.eclipse.virgo.samples.formtags.formtags.domain;
diff --git a/formtags/par/org.springframework.showcase.formtags.domain/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/springframework/showcase/formtags/domain/User.java
index 925392f..eef8b10 100644
--- a/formtags/par/org.springframework.showcase.formtags.domain/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/springframework/showcase/formtags/domain/User.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.domain;
+package org.eclipse.virgo.samples.formtags.formtags.domain;
diff --git a/formtags/shared-libs/formtags-shared-libs/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/springframework/showcase/formtags/service/StubUserManager.java
index b9a321c..e297111 100644
--- a/formtags/shared-libs/formtags-shared-libs/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/springframework/showcase/formtags/service/StubUserManager.java
@@ -9,13 +9,13 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.service;
+package org.eclipse.virgo.samples.formtags.formtags.service;
-import org.springframework.showcase.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
-import org.springframework.showcase.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.formtags.domain.User;
diff --git a/formtags/par/org.springframework.showcase.formtags.service/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/springframework/showcase/formtags/service/UserManager.java
index 5bcaa12..42b6090 100644
--- a/formtags/par/org.springframework.showcase.formtags.service/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/springframework/showcase/formtags/service/UserManager.java
@@ -9,13 +9,13 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.service;
+package org.eclipse.virgo.samples.formtags.formtags.service;
-import org.springframework.showcase.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
-import org.springframework.showcase.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.formtags.domain.User;
diff --git a/formtags/war/formtags-war/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/springframework/showcase/formtags/validation/CountryValidator.java
index c4a591c..328326c 100644
--- a/formtags/war/formtags-war/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/springframework/showcase/formtags/validation/CountryValidator.java
@@ -9,11 +9,11 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.validation;
+package org.eclipse.virgo.samples.formtags.formtags.validation;
-import org.springframework.showcase.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
import org.springframework.util.StringUtils;
diff --git a/formtags/shared-services/formtags-shared-services-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/springframework/showcase/formtags/validation/UserValidator.java
index 88e8aad..0c71f27 100644
--- a/formtags/shared-services/formtags-shared-services-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/springframework/showcase/formtags/validation/UserValidator.java
@@ -9,11 +9,11 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.validation;
+package org.eclipse.virgo.samples.formtags.formtags.validation;
-import org.springframework.showcase.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.formtags.domain.User;
import org.springframework.validation.Errors;
diff --git a/formtags/shared-services/formtags-shared-services-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/springframework/showcase/formtags/web/CountryEditor.java
index 6c098e1..6b75b06 100644
--- a/formtags/shared-services/formtags-shared-services-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/springframework/showcase/formtags/web/CountryEditor.java
@@ -9,13 +9,13 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.web;
+package org.eclipse.virgo.samples.formtags.formtags.web;
-import org.springframework.showcase.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
-import org.springframework.showcase.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.formtags.service.UserManager;
@@ -25,7 +25,7 @@ import java.beans.PropertyEditorSupport;
/**
- * Simple {@link java.beans.PropertyEditor} for the {@link org.springframework.showcase.formtags.domain.Country} class.
+ * Simple {@link java.beans.PropertyEditor} for the {@link org.eclipse.virgo.samples.formtags.formtags.domain.Country} class.
*
@@ -44,7 +44,7 @@ public class CountryEditor extends PropertyEditorSupport {
/**
- * Creates a new instance of the {@link org.springframework.showcase.formtags.web.CountryEditor} class.
+ * Creates a new instance of the {@link org.eclipse.virgo.samples.formtags.formtags.web.CountryEditor} class.
*
diff --git a/formtags/shared-services/formtags-shared-services-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/springframework/showcase/formtags/web/FormController.java
index 70a82f0..f9960f3 100644
--- a/formtags/shared-services/formtags-shared-services-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/springframework/showcase/formtags/web/FormController.java
@@ -9,19 +9,19 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.web;
+package org.eclipse.virgo.samples.formtags.formtags.web;
import org.springframework.core.enums.StaticLabeledEnumResolver;
-import org.springframework.showcase.formtags.domain.Colour;
+import org.eclipse.virgo.samples.formtags.formtags.domain.Colour;
-import org.springframework.showcase.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
-import org.springframework.showcase.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.formtags.domain.User;
-import org.springframework.showcase.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.formtags.service.UserManager;
import org.springframework.ui.ModelMap;
diff --git a/formtags/par/org.springframework.showcase.formtags.web/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/springframework/showcase/formtags/web/ListController.java
index b98d743..b9a0f03 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/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/springframework/showcase/formtags/web/ListController.java
@@ -9,11 +9,11 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.web;
+package org.eclipse.virgo.samples.formtags.formtags.web;
-import org.springframework.showcase.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.formtags.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.springframework.showcase.formtags.domain.User Users}
+ * to render a list) of all of the {@link org.eclipse.virgo.samples.formtags.formtags.domain.User Users}
* in the application.
diff --git a/formtags/shared-libs/formtags-shared-libs/src/main/resources/i18n.properties b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/resources/i18n.properties
index fa1de17..fa1de17 100644
--- a/formtags/shared-libs/formtags-shared-libs/src/main/resources/i18n.properties
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/resources/i18n.properties
diff --git a/formtags/shared-libs/formtags-shared-libs/src/main/resources/i18n_en_GB.properties b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/resources/i18n_en_GB.properties
index d597e96..d597e96 100644
--- a/formtags/shared-libs/formtags-shared-libs/src/main/resources/i18n_en_GB.properties
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/resources/i18n_en_GB.properties
diff --git a/formtags/shared-libs/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 579469b..7623036 100644
--- a/formtags/shared-libs/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,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Version: 3.0.0
Bundle-Name: FormTags Shared Library War
-Bundle-SymbolicName: org.springframework.showcase.formtags_shared_libs
+Bundle-SymbolicName: org.eclipse.virgo.samples.formtags.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)"
diff --git a/formtags/shared-libs/formtags-shared-libs/src/main/webapp/WEB-INF/applicationContext.xml b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/WEB-INF/applicationContext.xml
index 6daba4b..79de550 100644
--- a/formtags/shared-libs/formtags-shared-libs/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/WEB-INF/applicationContext.xml
@@ -2,6 +2,6 @@
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans>
- <bean id="userManager" class="org.springframework.showcase.formtags.service.StubUserManager"/>
+ <bean id="userManager" class="org.eclipse.virgo.samples.formtags.formtags.service.StubUserManager"/>
</beans> \ No newline at end of file
diff --git a/formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/WEB-INF/formtags-servlet.xml b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/WEB-INF/formtags-servlet.xml
index 4e01c91..29ae38b 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/src/main/webapp/WEB-INF/formtags-servlet.xml
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/WEB-INF/formtags-servlet.xml
@@ -7,20 +7,20 @@
<property name="suffix" value=".jsp"/>
</bean>
- <bean name="/list.htm" class="org.springframework.showcase.formtags.web.ListController">
+ <bean name="/list.htm" class="org.eclipse.virgo.samples.formtags.formtags.web.ListController">
<property name="userManager" ref="userManager"/>
</bean>
- <bean name="/form.htm" class="org.springframework.showcase.formtags.web.FormController">
+ <bean name="/form.htm" class="org.eclipse.virgo.samples.formtags.formtags.web.FormController">
<property name="formView" value="form"/>
<property name="successView" value="redirect:list.htm"/>
<property name="userManager" ref="userManager"/>
<property name="validators">
- <bean id="userValidator" class="org.springframework.showcase.formtags.validation.UserValidator"/>
+ <bean id="userValidator" class="org.eclipse.virgo.samples.formtags.formtags.validation.UserValidator"/>
</property>
</bean>
- <bean name="/about.htm" class="org.springframework.showcase.formtags.web.ListController">
+ <bean name="/about.htm" class="org.eclipse.virgo.samples.formtags.formtags.web.ListController">
<property name="userManager" ref="userManager"/>
<property name="viewName" value="about"/>
</bean>
diff --git a/formtags/shared-libs/formtags-shared-libs/src/main/webapp/WEB-INF/jsp/about.jsp b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/WEB-INF/jsp/about.jsp
index 69bb766..69bb766 100644
--- a/formtags/shared-libs/formtags-shared-libs/src/main/webapp/WEB-INF/jsp/about.jsp
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/WEB-INF/jsp/about.jsp
diff --git a/formtags/shared-libs/formtags-shared-libs/src/main/webapp/WEB-INF/jsp/form.jsp b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/WEB-INF/jsp/form.jsp
index 7b67053..7b67053 100644
--- a/formtags/shared-libs/formtags-shared-libs/src/main/webapp/WEB-INF/jsp/form.jsp
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/WEB-INF/jsp/form.jsp
diff --git a/formtags/shared-libs/formtags-shared-libs/src/main/webapp/WEB-INF/jsp/list.jsp b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/WEB-INF/jsp/list.jsp
index 91f2eb7..91f2eb7 100644
--- a/formtags/shared-libs/formtags-shared-libs/src/main/webapp/WEB-INF/jsp/list.jsp
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/WEB-INF/jsp/list.jsp
diff --git a/formtags/shared-libs/formtags-shared-libs/src/main/webapp/WEB-INF/web.xml b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/WEB-INF/web.xml
index 3957ca9..3957ca9 100644
--- a/formtags/shared-libs/formtags-shared-libs/src/main/webapp/WEB-INF/web.xml
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/WEB-INF/web.xml
diff --git a/formtags/shared-libs/formtags-shared-libs/src/main/webapp/css/base.css b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/css/base.css
index 4cafa80..4cafa80 100644
--- a/formtags/shared-libs/formtags-shared-libs/src/main/webapp/css/base.css
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/css/base.css
diff --git a/formtags/shared-libs/formtags-shared-libs/src/main/webapp/css/style.css b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/css/style.css
index 3b337a8..3b337a8 100644
--- a/formtags/shared-libs/formtags-shared-libs/src/main/webapp/css/style.css
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/css/style.css
diff --git a/formtags/shared-libs/formtags-shared-libs/src/main/webapp/favicon.ico b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/favicon.ico
index 7e54ebd..7e54ebd 100644
--- a/formtags/shared-libs/formtags-shared-libs/src/main/webapp/favicon.ico
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/favicon.ico
Binary files differ
diff --git a/formtags/shared-libs/formtags-shared-libs/src/main/webapp/index.jsp b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/index.jsp
index 92d1b12..92d1b12 100644
--- a/formtags/shared-libs/formtags-shared-libs/src/main/webapp/index.jsp
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/index.jsp
diff --git a/formtags/shared-services/formtags-shared-services-service/src/main/resources/META-INF/MANIFEST.MF b/formtags/shared-services/formtags-shared-services-service/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 331fe96..0000000
--- a/formtags/shared-services/formtags-shared-services-service/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: FormTags Service (and implementation)
-Bundle-SymbolicName: org.springframework.showcase.formtags.service_shared_services
-Bundle-Version: 3.0.0
-Import-Library: org.springframework.spring;version="[2.5.6.A,4.0.0)"
-Export-Package: org.springframework.showcase.formtags.domain,
- org.springframework.showcase.formtags.service
-
diff --git a/formtags/shared-services/formtags-shared-services-service/.classpath b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.classpath
index 3671d42..3671d42 100644
--- a/formtags/shared-services/formtags-shared-services-service/.classpath
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.classpath
diff --git a/formtags/shared-services/formtags-shared-services-service/.project b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.project
index 31b5a56..31b5a56 100644
--- a/formtags/shared-services/formtags-shared-services-service/.project
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.project
diff --git a/formtags/shared-services/formtags-shared-services-service/.settings/org.eclipse.jdt.core.prefs b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.settings/org.eclipse.jdt.core.prefs
index 1c62194..1c62194 100644
--- a/formtags/shared-services/formtags-shared-services-service/.settings/org.eclipse.jdt.core.prefs
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.settings/org.eclipse.jdt.core.prefs
diff --git a/formtags/shared-services/formtags-shared-services-service/.settings/org.eclipse.jst.common.project.facet.core.prefs b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.settings/org.eclipse.jst.common.project.facet.core.prefs
index 73cb4d8..73cb4d8 100644
--- a/formtags/shared-services/formtags-shared-services-service/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.settings/org.eclipse.jst.common.project.facet.core.prefs
diff --git a/formtags/shared-services/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 4eff0bc..4eff0bc 100644
--- a/formtags/shared-services/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
diff --git a/formtags/shared-services/formtags-shared-services-service/.springBeans b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.springBeans
index 02c34e1..02c34e1 100644
--- a/formtags/shared-services/formtags-shared-services-service/.springBeans
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/.springBeans
diff --git a/formtags/shared-services/formtags-shared-services-service/build.xml b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/build.xml
index 4f1b888..f47f7fe 100644
--- a/formtags/shared-services/formtags-shared-services-service/build.xml
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/build.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="formtags-shared-services-service">
+<project name="org.eclipse.virgo.samples.formtags.shared-services.service">
<property file="${basedir}/../../../build.properties" />
<property file="${basedir}/../../../build.versions" />
diff --git a/formtags/shared-services/formtags-shared-services-service/ivy.xml b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/ivy.xml
index 6409229..6409229 100644
--- a/formtags/shared-services/formtags-shared-services-service/ivy.xml
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/ivy.xml
diff --git a/formtags/par/org.springframework.showcase.formtags.domain/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/springframework/showcase/formtags/domain/Colour.java
index 88e715e..ae3ecef 100644
--- a/formtags/par/org.springframework.showcase.formtags.domain/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/springframework/showcase/formtags/domain/Colour.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.domain;
+package org.eclipse.virgo.samples.formtags.formtags.domain;
diff --git a/formtags/par/org.springframework.showcase.formtags.domain/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/springframework/showcase/formtags/domain/Country.java
index caf564c..3ac8011 100644
--- a/formtags/par/org.springframework.showcase.formtags.domain/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/springframework/showcase/formtags/domain/Country.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.domain;
+package org.eclipse.virgo.samples.formtags.formtags.domain;
diff --git a/formtags/par/org.springframework.showcase.formtags.domain/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/springframework/showcase/formtags/domain/Preferences.java
index ab6c627..0149aae 100644
--- a/formtags/par/org.springframework.showcase.formtags.domain/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/springframework/showcase/formtags/domain/Preferences.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.domain;
+package org.eclipse.virgo.samples.formtags.formtags.domain;
diff --git a/formtags/shared-libs/formtags-shared-libs/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/springframework/showcase/formtags/domain/User.java
index 925392f..eef8b10 100644
--- a/formtags/shared-libs/formtags-shared-libs/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/springframework/showcase/formtags/domain/User.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.domain;
+package org.eclipse.virgo.samples.formtags.formtags.domain;
diff --git a/formtags/shared-services/formtags-shared-services-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/springframework/showcase/formtags/service/UserManager.java
index 5bcaa12..42b6090 100644
--- a/formtags/shared-services/formtags-shared-services-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/springframework/showcase/formtags/service/UserManager.java
@@ -9,13 +9,13 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.service;
+package org.eclipse.virgo.samples.formtags.formtags.service;
-import org.springframework.showcase.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
-import org.springframework.showcase.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.formtags.domain.User;
diff --git a/formtags/par/org.springframework.showcase.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/springframework/showcase/formtags/service/internal/StubUserManager.java
index f47660e..b9b803e 100644
--- a/formtags/par/org.springframework.showcase.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/springframework/showcase/formtags/service/internal/StubUserManager.java
@@ -9,15 +9,15 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.service.internal;
+package org.eclipse.virgo.samples.formtags.formtags.service.internal;
-import org.springframework.showcase.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
-import org.springframework.showcase.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.formtags.domain.User;
-import org.springframework.showcase.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.formtags.service.UserManager;
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/resources/META-INF/MANIFEST.MF b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/resources/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..cb8656a
--- /dev/null
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: FormTags Service (and implementation)
+Bundle-SymbolicName: org.eclipse.virgo.samples.formtags.formtags.service_shared_services
+Bundle-Version: 3.0.0
+Import-Library: org.springframework.spring;version="[2.5.6.A,4.0.0)"
+Export-Package: org.eclipse.virgo.samples.formtags.formtags.domain,
+ org.eclipse.virgo.samples.formtags.formtags.service
+
diff --git a/formtags/par/org.springframework.showcase.formtags.service/src/main/resources/META-INF/spring/module-context.xml b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/resources/META-INF/spring/module-context.xml
index 4254775..4a94074 100644
--- a/formtags/par/org.springframework.showcase.formtags.service/src/main/resources/META-INF/spring/module-context.xml
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/resources/META-INF/spring/module-context.xml
@@ -10,6 +10,6 @@
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
- <bean id="userService" class="org.springframework.showcase.formtags.service.internal.StubUserManager"/>
+ <bean id="userManager" class="org.eclipse.virgo.samples.formtags.formtags.service.internal.StubUserManager"/>
</beans>
diff --git a/formtags/shared-services/formtags-shared-services-service/src/main/resources/META-INF/spring/osgi-context.xml b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/resources/META-INF/spring/osgi-context.xml
index a4b7392..bfc2735 100644
--- a/formtags/shared-services/formtags-shared-services-service/src/main/resources/META-INF/spring/osgi-context.xml
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/resources/META-INF/spring/osgi-context.xml
@@ -8,6 +8,6 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
- <service ref="userManager" interface="org.springframework.showcase.formtags.service.UserManager" />
+ <service ref="userManager" interface="org.eclipse.virgo.samples.formtags.formtags.service.UserManager" />
</beans:beans> \ No newline at end of file
diff --git a/formtags/shared-services/formtags-shared-services-war/.classpath b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.classpath
index 58d433f..58d433f 100644
--- a/formtags/shared-services/formtags-shared-services-war/.classpath
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.classpath
diff --git a/formtags/shared-services/formtags-shared-services-war/.project b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.project
index afbe4ef..afbe4ef 100644
--- a/formtags/shared-services/formtags-shared-services-war/.project
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.project
diff --git a/formtags/shared-services/formtags-shared-services-war/.settings/.jsdtscope b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/.jsdtscope
index 8fbc6ca..8fbc6ca 100644
--- a/formtags/shared-services/formtags-shared-services-war/.settings/.jsdtscope
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/.jsdtscope
diff --git a/formtags/shared-services/formtags-shared-services-war/.settings/org.eclipse.jdt.core.prefs b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.jdt.core.prefs
index cb7f697..cb7f697 100644
--- a/formtags/shared-services/formtags-shared-services-war/.settings/org.eclipse.jdt.core.prefs
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.jdt.core.prefs
diff --git a/formtags/shared-services/formtags-shared-services-war/.settings/org.eclipse.jst.common.project.facet.core.prefs b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.jst.common.project.facet.core.prefs
index 50d7f87..50d7f87 100644
--- a/formtags/shared-services/formtags-shared-services-war/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.jst.common.project.facet.core.prefs
diff --git a/formtags/shared-services/formtags-shared-services-war/.settings/org.eclipse.wst.common.component b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.wst.common.component
index e508df3..e508df3 100644
--- a/formtags/shared-services/formtags-shared-services-war/.settings/org.eclipse.wst.common.component
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.wst.common.component
diff --git a/formtags/shared-services/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 8899e70..8899e70 100644
--- a/formtags/shared-services/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
diff --git a/formtags/shared-services/formtags-shared-services-war/.settings/org.eclipse.wst.jsdt.ui.superType.container b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.wst.jsdt.ui.superType.container
index 3bd5d0a..3bd5d0a 100644
--- a/formtags/shared-services/formtags-shared-services-war/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.wst.jsdt.ui.superType.container
diff --git a/formtags/shared-services/formtags-shared-services-war/.settings/org.eclipse.wst.jsdt.ui.superType.name b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.wst.jsdt.ui.superType.name
index 05bd71b..05bd71b 100644
--- a/formtags/shared-services/formtags-shared-services-war/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/org.eclipse.wst.jsdt.ui.superType.name
diff --git a/formtags/shared-services/formtags-shared-services-war/.springBeans b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.springBeans
index 3949aa3..3949aa3 100644
--- a/formtags/shared-services/formtags-shared-services-war/.springBeans
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.springBeans
diff --git a/formtags/shared-services/formtags-shared-services-war/build.xml b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/build.xml
index 3b44cb5..93a5005 100644
--- a/formtags/shared-services/formtags-shared-services-war/build.xml
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/build.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="formtags-shared-services-war">
+<project name="org.eclipse.virgo.samples.formtags.shared-services.war">
<property file="${basedir}/../../../build.properties" />
<property file="${basedir}/../../../build.versions" />
diff --git a/formtags/shared-services/formtags-shared-services-war/ivy.xml b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/ivy.xml
index b6f139f..b6f139f 100644
--- a/formtags/shared-services/formtags-shared-services-war/ivy.xml
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/ivy.xml
diff --git a/formtags/shared-services/formtags-shared-services-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/springframework/showcase/formtags/validation/CountryValidator.java
index c4a591c..328326c 100644
--- a/formtags/shared-services/formtags-shared-services-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/springframework/showcase/formtags/validation/CountryValidator.java
@@ -9,11 +9,11 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.validation;
+package org.eclipse.virgo.samples.formtags.formtags.validation;
-import org.springframework.showcase.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
import org.springframework.util.StringUtils;
diff --git a/formtags/shared-libs/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/springframework/showcase/formtags/validation/UserValidator.java
index 88e8aad..0c71f27 100644
--- a/formtags/shared-libs/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/springframework/showcase/formtags/validation/UserValidator.java
@@ -9,11 +9,11 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.validation;
+package org.eclipse.virgo.samples.formtags.formtags.validation;
-import org.springframework.showcase.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.formtags.domain.User;
import org.springframework.validation.Errors;
diff --git a/formtags/shared-libs/formtags-shared-libs/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/springframework/showcase/formtags/web/CountryEditor.java
index 6c098e1..6b75b06 100644
--- a/formtags/shared-libs/formtags-shared-libs/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/springframework/showcase/formtags/web/CountryEditor.java
@@ -9,13 +9,13 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.web;
+package org.eclipse.virgo.samples.formtags.formtags.web;
-import org.springframework.showcase.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
-import org.springframework.showcase.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.formtags.service.UserManager;
@@ -25,7 +25,7 @@ import java.beans.PropertyEditorSupport;
/**
- * Simple {@link java.beans.PropertyEditor} for the {@link org.springframework.showcase.formtags.domain.Country} class.
+ * Simple {@link java.beans.PropertyEditor} for the {@link org.eclipse.virgo.samples.formtags.formtags.domain.Country} class.
*
@@ -44,7 +44,7 @@ public class CountryEditor extends PropertyEditorSupport {
/**
- * Creates a new instance of the {@link org.springframework.showcase.formtags.web.CountryEditor} class.
+ * Creates a new instance of the {@link org.eclipse.virgo.samples.formtags.formtags.web.CountryEditor} class.
*
diff --git a/formtags/par/org.springframework.showcase.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/springframework/showcase/formtags/web/FormController.java
index 70a82f0..f9960f3 100644
--- a/formtags/par/org.springframework.showcase.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/springframework/showcase/formtags/web/FormController.java
@@ -9,19 +9,19 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.web;
+package org.eclipse.virgo.samples.formtags.formtags.web;
import org.springframework.core.enums.StaticLabeledEnumResolver;
-import org.springframework.showcase.formtags.domain.Colour;
+import org.eclipse.virgo.samples.formtags.formtags.domain.Colour;
-import org.springframework.showcase.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
-import org.springframework.showcase.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.formtags.domain.User;
-import org.springframework.showcase.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.formtags.service.UserManager;
import org.springframework.ui.ModelMap;
diff --git a/formtags/shared-services/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/springframework/showcase/formtags/web/ListController.java
index 140d362..f73be7d 100644
--- a/formtags/shared-services/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/springframework/showcase/formtags/web/ListController.java
@@ -9,11 +9,11 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.web;
+package org.eclipse.virgo.samples.formtags.formtags.web;
-import org.springframework.showcase.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.formtags.service.UserManager;
@@ -35,7 +35,7 @@ import org.springframework.web.servlet.mvc.AbstractController;
* that pretty much locates (and thus allows a {@link org.springframework.web.servlet.View}
- * to render a list) of all of the {@link org.springframework.showcase.formtags.domain.User Users}
+ * to render a list) of all of the {@link org.eclipse.virgo.samples.formtags.formtags.domain.User Users}
* in the application.
diff --git a/formtags/shared-services/formtags-shared-services-war/src/main/resources/i18n.properties b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/resources/i18n.properties
index fa1de17..fa1de17 100644
--- a/formtags/shared-services/formtags-shared-services-war/src/main/resources/i18n.properties
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/resources/i18n.properties
diff --git a/formtags/shared-services/formtags-shared-services-war/src/main/resources/i18n_en_GB.properties b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/resources/i18n_en_GB.properties
index d597e96..d597e96 100644
--- a/formtags/shared-services/formtags-shared-services-war/src/main/resources/i18n_en_GB.properties
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/resources/i18n_en_GB.properties
diff --git a/formtags/shared-services/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 91f71e3..eeded7a 100644
--- a/formtags/shared-services/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
@@ -1,11 +1,11 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: FormTags Shared Services WAR
-Bundle-SymbolicName: org.springframework.showcase.formtags.web_shared_services
+Bundle-SymbolicName: org.eclipse.virgo.samples.formtags.formtags.web_shared_services
Bundle-Version: 3.0.0
Import-Package: javax.servlet.http,
- org.springframework.showcase.formtags.domain,
- org.springframework.showcase.formtags.service,
+ org.eclipse.virgo.samples.formtags.formtags.domain,
+ org.eclipse.virgo.samples.formtags.formtags.service,
org.eclipse.virgo.web.dm;version="[1.0,2.2)",
javax.servlet.jsp.jstl.core;version="[1.1.2,1.2.0)"
Import-Library: org.springframework.spring;version="[2.5.6.A,4.0.0)"
diff --git a/formtags/shared-services/formtags-shared-services-war/src/main/webapp/WEB-INF/applicationContext.xml b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/WEB-INF/applicationContext.xml
index da193ea..1eb7782 100644
--- a/formtags/shared-services/formtags-shared-services-war/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/WEB-INF/applicationContext.xml
@@ -5,6 +5,6 @@
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.xsd">
- <reference id="userManager" interface="org.springframework.showcase.formtags.service.UserManager" />
+ <reference id="userManager" interface="org.eclipse.virgo.samples.formtags.formtags.service.UserManager" />
</beans:beans> \ No newline at end of file
diff --git a/formtags/shared-services/formtags-shared-services-war/src/main/webapp/WEB-INF/formtags-servlet.xml b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/WEB-INF/formtags-servlet.xml
index 6ce5a48..927fbdf 100644
--- a/formtags/shared-services/formtags-shared-services-war/src/main/webapp/WEB-INF/formtags-servlet.xml
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/WEB-INF/formtags-servlet.xml
@@ -8,20 +8,20 @@
<property name="suffix" value=".jsp"/>
</bean>
- <bean name="/list.htm" class="org.springframework.showcase.formtags.web.ListController">
+ <bean name="/list.htm" class="org.eclipse.virgo.samples.formtags.formtags.web.ListController">
<property name="userManager" ref="userManager"/>
</bean>
- <bean name="/form.htm" class="org.springframework.showcase.formtags.web.FormController">
+ <bean name="/form.htm" class="org.eclipse.virgo.samples.formtags.formtags.web.FormController">
<property name="formView" value="form"/>
<property name="successView" value="redirect:list.htm"/>
<property name="userManager" ref="userManager"/>
<property name="validators">
- <bean id="userValidator" class="org.springframework.showcase.formtags.validation.UserValidator"/>
+ <bean id="userValidator" class="org.eclipse.virgo.samples.formtags.formtags.validation.UserValidator"/>
</property>
</bean>
- <bean name="/about.htm" class="org.springframework.showcase.formtags.web.ListController">
+ <bean name="/about.htm" class="org.eclipse.virgo.samples.formtags.formtags.web.ListController">
<property name="userManager" ref="userManager"/>
<property name="viewName" value="about"/>
</bean>
diff --git a/formtags/shared-services/formtags-shared-services-war/src/main/webapp/WEB-INF/jsp/about.jsp b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/WEB-INF/jsp/about.jsp
index 69bb766..69bb766 100644
--- a/formtags/shared-services/formtags-shared-services-war/src/main/webapp/WEB-INF/jsp/about.jsp
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/WEB-INF/jsp/about.jsp
diff --git a/formtags/shared-services/formtags-shared-services-war/src/main/webapp/WEB-INF/jsp/form.jsp b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/WEB-INF/jsp/form.jsp
index 7b67053..7b67053 100644
--- a/formtags/shared-services/formtags-shared-services-war/src/main/webapp/WEB-INF/jsp/form.jsp
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/WEB-INF/jsp/form.jsp
diff --git a/formtags/shared-services/formtags-shared-services-war/src/main/webapp/WEB-INF/jsp/list.jsp b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/WEB-INF/jsp/list.jsp
index f311bcd..f311bcd 100644
--- a/formtags/shared-services/formtags-shared-services-war/src/main/webapp/WEB-INF/jsp/list.jsp
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/WEB-INF/jsp/list.jsp
diff --git a/formtags/shared-services/formtags-shared-services-war/src/main/webapp/WEB-INF/web.xml b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/WEB-INF/web.xml
index 8f5f497..8f5f497 100644
--- a/formtags/shared-services/formtags-shared-services-war/src/main/webapp/WEB-INF/web.xml
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/WEB-INF/web.xml
diff --git a/formtags/shared-services/formtags-shared-services-war/src/main/webapp/css/base.css b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/css/base.css
index 4cafa80..4cafa80 100644
--- a/formtags/shared-services/formtags-shared-services-war/src/main/webapp/css/base.css
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/css/base.css
diff --git a/formtags/shared-services/formtags-shared-services-war/src/main/webapp/css/style.css b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/css/style.css
index 3b337a8..3b337a8 100644
--- a/formtags/shared-services/formtags-shared-services-war/src/main/webapp/css/style.css
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/css/style.css
diff --git a/formtags/shared-services/formtags-shared-services-war/src/main/webapp/favicon.ico b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/favicon.ico
index 7e54ebd..7e54ebd 100644
--- a/formtags/shared-services/formtags-shared-services-war/src/main/webapp/favicon.ico
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/favicon.ico
Binary files differ
diff --git a/formtags/shared-services/formtags-shared-services-war/src/main/webapp/index.jsp b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/index.jsp
index 92d1b12..92d1b12 100644
--- a/formtags/shared-services/formtags-shared-services-war/src/main/webapp/index.jsp
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/index.jsp
diff --git a/formtags/war/formtags-war/.classpath b/formtags/war/org.eclipse.virgo.samples.formtags.war/.classpath
index baa95c3..baa95c3 100644
--- a/formtags/war/formtags-war/.classpath
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/.classpath
diff --git a/formtags/war/formtags-war/.project b/formtags/war/org.eclipse.virgo.samples.formtags.war/.project
index bf927a6..bf927a6 100644
--- a/formtags/war/formtags-war/.project
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/.project
diff --git a/formtags/war/formtags-war/.settings/.jsdtscope b/formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/.jsdtscope
index 8fbc6ca..8fbc6ca 100644
--- a/formtags/war/formtags-war/.settings/.jsdtscope
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/.jsdtscope
diff --git a/formtags/war/formtags-war/.settings/org.eclipse.jdt.core.prefs b/formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.jdt.core.prefs
index 7974218..7974218 100644
--- a/formtags/war/formtags-war/.settings/org.eclipse.jdt.core.prefs
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.jdt.core.prefs
diff --git a/formtags/war/formtags-war/.settings/org.eclipse.jst.common.project.facet.core.prefs b/formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.jst.common.project.facet.core.prefs
index afd6530..afd6530 100644
--- a/formtags/war/formtags-war/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.jst.common.project.facet.core.prefs
diff --git a/formtags/war/formtags-war/.settings/org.eclipse.wst.common.component b/formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.wst.common.component
index 50eb4af..50eb4af 100644
--- a/formtags/war/formtags-war/.settings/org.eclipse.wst.common.component
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.wst.common.component
diff --git a/formtags/war/formtags-war/.settings/org.eclipse.wst.common.project.facet.core.xml b/formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.wst.common.project.facet.core.xml
index c6dc5ee..c6dc5ee 100644
--- a/formtags/war/formtags-war/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/formtags/war/formtags-war/.settings/org.eclipse.wst.jsdt.ui.superType.container b/formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.wst.jsdt.ui.superType.container
index 3bd5d0a..3bd5d0a 100644
--- a/formtags/war/formtags-war/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.wst.jsdt.ui.superType.container
diff --git a/formtags/war/formtags-war/.settings/org.eclipse.wst.jsdt.ui.superType.name b/formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.wst.jsdt.ui.superType.name
index 05bd71b..05bd71b 100644
--- a/formtags/war/formtags-war/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.wst.jsdt.ui.superType.name
diff --git a/formtags/war/formtags-war/.springBeans b/formtags/war/org.eclipse.virgo.samples.formtags.war/.springBeans
index 3949aa3..3949aa3 100644
--- a/formtags/war/formtags-war/.springBeans
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/.springBeans
diff --git a/formtags/war/formtags-war/build.xml b/formtags/war/org.eclipse.virgo.samples.formtags.war/build.xml
index dc6cfab..25d40e6 100644
--- a/formtags/war/formtags-war/build.xml
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/build.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="formtags-war" xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="org.eclipse.virgo.samples.formtags.war">
<property file="${basedir}/../../../build.properties"/>
<property file="${basedir}/../../../build.versions"/>
diff --git a/formtags/war/formtags-war/ivy.xml b/formtags/war/org.eclipse.virgo.samples.formtags.war/ivy.xml
index c985b4d..c985b4d 100644
--- a/formtags/war/formtags-war/ivy.xml
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/ivy.xml
diff --git a/formtags/shared-services/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/springframework/showcase/formtags/domain/Colour.java
index 88e715e..ae3ecef 100644
--- a/formtags/shared-services/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/springframework/showcase/formtags/domain/Colour.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.domain;
+package org.eclipse.virgo.samples.formtags.formtags.domain;
diff --git a/formtags/shared-services/formtags-shared-services-service/src/main/java/org/springframework/showcase/formtags/domain/Country.java b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/domain/Country.java
index caf564c..3ac8011 100644
--- a/formtags/shared-services/formtags-shared-services-service/src/main/java/org/springframework/showcase/formtags/domain/Country.java
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/domain/Country.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.domain;
+package org.eclipse.virgo.samples.formtags.formtags.domain;
diff --git a/formtags/war/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/springframework/showcase/formtags/domain/Preferences.java
index ab6c627..0149aae 100644
--- a/formtags/war/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/springframework/showcase/formtags/domain/Preferences.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.domain;
+package org.eclipse.virgo.samples.formtags.formtags.domain;
diff --git a/formtags/war/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/springframework/showcase/formtags/domain/User.java
index 925392f..eef8b10 100644
--- a/formtags/war/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/springframework/showcase/formtags/domain/User.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.domain;
+package org.eclipse.virgo.samples.formtags.formtags.domain;
diff --git a/formtags/war/formtags-war/src/main/java/org/springframework/showcase/formtags/service/StubUserManager.java b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/service/StubUserManager.java
index b9a321c..e297111 100644
--- a/formtags/war/formtags-war/src/main/java/org/springframework/showcase/formtags/service/StubUserManager.java
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/service/StubUserManager.java
@@ -9,13 +9,13 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.service;
+package org.eclipse.virgo.samples.formtags.formtags.service;
-import org.springframework.showcase.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
-import org.springframework.showcase.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.formtags.domain.User;
diff --git a/formtags/shared-libs/formtags-shared-libs/src/main/java/org/springframework/showcase/formtags/service/UserManager.java b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/service/UserManager.java
index 5bcaa12..42b6090 100644
--- a/formtags/shared-libs/formtags-shared-libs/src/main/java/org/springframework/showcase/formtags/service/UserManager.java
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/service/UserManager.java
@@ -9,13 +9,13 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.service;
+package org.eclipse.virgo.samples.formtags.formtags.service;
-import org.springframework.showcase.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
-import org.springframework.showcase.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.formtags.domain.User;
diff --git a/formtags/par/org.springframework.showcase.formtags.web/src/main/java/org/springframework/showcase/formtags/validation/CountryValidator.java b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/validation/CountryValidator.java
index c4a591c..328326c 100644
--- a/formtags/par/org.springframework.showcase.formtags.web/src/main/java/org/springframework/showcase/formtags/validation/CountryValidator.java
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/validation/CountryValidator.java
@@ -9,11 +9,11 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.validation;
+package org.eclipse.virgo.samples.formtags.formtags.validation;
-import org.springframework.showcase.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
import org.springframework.util.StringUtils;
diff --git a/formtags/war/formtags-war/src/main/java/org/springframework/showcase/formtags/validation/UserValidator.java b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/validation/UserValidator.java
index 88e8aad..0c71f27 100644
--- a/formtags/war/formtags-war/src/main/java/org/springframework/showcase/formtags/validation/UserValidator.java
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/validation/UserValidator.java
@@ -9,11 +9,11 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.validation;
+package org.eclipse.virgo.samples.formtags.formtags.validation;
-import org.springframework.showcase.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.formtags.domain.User;
import org.springframework.validation.Errors;
diff --git a/formtags/war/formtags-war/src/main/java/org/springframework/showcase/formtags/web/CountryEditor.java b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/web/CountryEditor.java
index 6c098e1..6b75b06 100644
--- a/formtags/war/formtags-war/src/main/java/org/springframework/showcase/formtags/web/CountryEditor.java
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/web/CountryEditor.java
@@ -9,13 +9,13 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.web;
+package org.eclipse.virgo.samples.formtags.formtags.web;
-import org.springframework.showcase.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
-import org.springframework.showcase.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.formtags.service.UserManager;
@@ -25,7 +25,7 @@ import java.beans.PropertyEditorSupport;
/**
- * Simple {@link java.beans.PropertyEditor} for the {@link org.springframework.showcase.formtags.domain.Country} class.
+ * Simple {@link java.beans.PropertyEditor} for the {@link org.eclipse.virgo.samples.formtags.formtags.domain.Country} class.
*
@@ -44,7 +44,7 @@ public class CountryEditor extends PropertyEditorSupport {
/**
- * Creates a new instance of the {@link org.springframework.showcase.formtags.web.CountryEditor} class.
+ * Creates a new instance of the {@link org.eclipse.virgo.samples.formtags.formtags.web.CountryEditor} class.
*
diff --git a/formtags/war/formtags-war/src/main/java/org/springframework/showcase/formtags/web/FormController.java b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/web/FormController.java
index 70a82f0..f9960f3 100644
--- a/formtags/war/formtags-war/src/main/java/org/springframework/showcase/formtags/web/FormController.java
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/web/FormController.java
@@ -9,19 +9,19 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.web;
+package org.eclipse.virgo.samples.formtags.formtags.web;
import org.springframework.core.enums.StaticLabeledEnumResolver;
-import org.springframework.showcase.formtags.domain.Colour;
+import org.eclipse.virgo.samples.formtags.formtags.domain.Colour;
-import org.springframework.showcase.formtags.domain.Country;
+import org.eclipse.virgo.samples.formtags.formtags.domain.Country;
-import org.springframework.showcase.formtags.domain.User;
+import org.eclipse.virgo.samples.formtags.formtags.domain.User;
-import org.springframework.showcase.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.formtags.service.UserManager;
import org.springframework.ui.ModelMap;
diff --git a/formtags/shared-libs/formtags-shared-libs/src/main/java/org/springframework/showcase/formtags/web/ListController.java b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/web/ListController.java
index b98d743..b9a0f03 100644
--- a/formtags/shared-libs/formtags-shared-libs/src/main/java/org/springframework/showcase/formtags/web/ListController.java
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/java/org/springframework/showcase/formtags/web/ListController.java
@@ -9,11 +9,11 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.springframework.showcase.formtags.web;
+package org.eclipse.virgo.samples.formtags.formtags.web;
-import org.springframework.showcase.formtags.service.UserManager;
+import org.eclipse.virgo.samples.formtags.formtags.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.springframework.showcase.formtags.domain.User Users}
+ * to render a list) of all of the {@link org.eclipse.virgo.samples.formtags.formtags.domain.User Users}
* in the application.
diff --git a/formtags/war/formtags-war/src/main/resources/i18n.properties b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/resources/i18n.properties
index fa1de17..fa1de17 100644
--- a/formtags/war/formtags-war/src/main/resources/i18n.properties
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/resources/i18n.properties
diff --git a/formtags/war/formtags-war/src/main/resources/i18n_en_GB.properties b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/resources/i18n_en_GB.properties
index d597e96..d597e96 100644
--- a/formtags/war/formtags-war/src/main/resources/i18n_en_GB.properties
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/resources/i18n_en_GB.properties
diff --git a/formtags/war/formtags-war/src/main/webapp/META-INF/MANIFEST.MF b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/META-INF/MANIFEST.MF
index c20f14b..c20f14b 100644
--- a/formtags/war/formtags-war/src/main/webapp/META-INF/MANIFEST.MF
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/META-INF/MANIFEST.MF
diff --git a/formtags/war/formtags-war/src/main/webapp/WEB-INF/applicationContext.xml b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/applicationContext.xml
index 6daba4b..79de550 100644
--- a/formtags/war/formtags-war/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/applicationContext.xml
@@ -2,6 +2,6 @@
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans>
- <bean id="userManager" class="org.springframework.showcase.formtags.service.StubUserManager"/>
+ <bean id="userManager" class="org.eclipse.virgo.samples.formtags.formtags.service.StubUserManager"/>
</beans> \ No newline at end of file
diff --git a/formtags/shared-libs/formtags-shared-libs/src/main/webapp/WEB-INF/formtags-servlet.xml b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/formtags-servlet.xml
index 4e01c91..29ae38b 100644
--- a/formtags/shared-libs/formtags-shared-libs/src/main/webapp/WEB-INF/formtags-servlet.xml
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/formtags-servlet.xml
@@ -7,20 +7,20 @@
<property name="suffix" value=".jsp"/>
</bean>
- <bean name="/list.htm" class="org.springframework.showcase.formtags.web.ListController">
+ <bean name="/list.htm" class="org.eclipse.virgo.samples.formtags.formtags.web.ListController">
<property name="userManager" ref="userManager"/>
</bean>
- <bean name="/form.htm" class="org.springframework.showcase.formtags.web.FormController">
+ <bean name="/form.htm" class="org.eclipse.virgo.samples.formtags.formtags.web.FormController">
<property name="formView" value="form"/>
<property name="successView" value="redirect:list.htm"/>
<property name="userManager" ref="userManager"/>
<property name="validators">
- <bean id="userValidator" class="org.springframework.showcase.formtags.validation.UserValidator"/>
+ <bean id="userValidator" class="org.eclipse.virgo.samples.formtags.formtags.validation.UserValidator"/>
</property>
</bean>
- <bean name="/about.htm" class="org.springframework.showcase.formtags.web.ListController">
+ <bean name="/about.htm" class="org.eclipse.virgo.samples.formtags.formtags.web.ListController">
<property name="userManager" ref="userManager"/>
<property name="viewName" value="about"/>
</bean>
diff --git a/formtags/war/formtags-war/src/main/webapp/WEB-INF/jsp/about.jsp b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/jsp/about.jsp
index e9dee68..e9dee68 100644
--- a/formtags/war/formtags-war/src/main/webapp/WEB-INF/jsp/about.jsp
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/jsp/about.jsp
diff --git a/formtags/war/formtags-war/src/main/webapp/WEB-INF/jsp/form.jsp b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/jsp/form.jsp
index eb48441..eb48441 100644
--- a/formtags/war/formtags-war/src/main/webapp/WEB-INF/jsp/form.jsp
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/jsp/form.jsp
diff --git a/formtags/war/formtags-war/src/main/webapp/WEB-INF/jsp/list.jsp b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/jsp/list.jsp
index f311bcd..f311bcd 100644
--- a/formtags/war/formtags-war/src/main/webapp/WEB-INF/jsp/list.jsp
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/jsp/list.jsp
diff --git a/formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/com.springsource.javax.servlet-2.5.0.jar b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/com.springsource.javax.servlet-2.5.0.jar
index 27d67da..27d67da 100644
--- a/formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/com.springsource.javax.servlet-2.5.0.jar
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/com.springsource.javax.servlet-2.5.0.jar
Binary files differ
diff --git a/formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/com.springsource.javax.servlet.jsp.jstl-1.1.2.jar b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/com.springsource.javax.servlet.jsp.jstl-1.1.2.jar
index aeb37d0..aeb37d0 100644
--- a/formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/com.springsource.javax.servlet.jsp.jstl-1.1.2.jar
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/com.springsource.javax.servlet.jsp.jstl-1.1.2.jar
Binary files differ
diff --git a/formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/com.springsource.org.apache.commons.logging-1.1.1.jar b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/com.springsource.org.apache.commons.logging-1.1.1.jar
index f50c78c..f50c78c 100644
--- a/formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/com.springsource.org.apache.commons.logging-1.1.1.jar
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/com.springsource.org.apache.commons.logging-1.1.1.jar
Binary files differ
diff --git a/formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/com.springsource.org.apache.taglibs.standard-1.1.2.jar b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/com.springsource.org.apache.taglibs.standard-1.1.2.jar
index 7c29d1e..7c29d1e 100644
--- a/formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/com.springsource.org.apache.taglibs.standard-1.1.2.jar
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/com.springsource.org.apache.taglibs.standard-1.1.2.jar
Binary files differ
diff --git a/formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/org.springframework.asm-3.0.0.RELEASE.jar b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/org.springframework.asm-3.0.0.RELEASE.jar
index a92d19b..a92d19b 100644
--- a/formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/org.springframework.asm-3.0.0.RELEASE.jar
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/org.springframework.asm-3.0.0.RELEASE.jar
Binary files differ
diff --git a/formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/org.springframework.beans-3.0.0.RELEASE.jar b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/org.springframework.beans-3.0.0.RELEASE.jar
index 37b9abe..37b9abe 100644
--- a/formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/org.springframework.beans-3.0.0.RELEASE.jar
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/org.springframework.beans-3.0.0.RELEASE.jar
Binary files differ
diff --git a/formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/org.springframework.context-3.0.0.RELEASE.jar b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/org.springframework.context-3.0.0.RELEASE.jar
index 7869adb..7869adb 100644
--- a/formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/org.springframework.context-3.0.0.RELEASE.jar
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/org.springframework.context-3.0.0.RELEASE.jar
Binary files differ
diff --git a/formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/org.springframework.context.support-3.0.0.RELEASE.jar b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/org.springframework.context.support-3.0.0.RELEASE.jar
index fdd4dc8..fdd4dc8 100644
--- a/formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/org.springframework.context.support-3.0.0.RELEASE.jar
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/org.springframework.context.support-3.0.0.RELEASE.jar
Binary files differ
diff --git a/formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/org.springframework.core-3.0.0.RELEASE.jar b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/org.springframework.core-3.0.0.RELEASE.jar
index 8f0134e..8f0134e 100644
--- a/formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/org.springframework.core-3.0.0.RELEASE.jar
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/org.springframework.core-3.0.0.RELEASE.jar
Binary files differ
diff --git a/formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/org.springframework.expression-3.0.0.RELEASE.jar b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/org.springframework.expression-3.0.0.RELEASE.jar
index a34ef90..a34ef90 100644
--- a/formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/org.springframework.expression-3.0.0.RELEASE.jar
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/org.springframework.expression-3.0.0.RELEASE.jar
Binary files differ
diff --git a/formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/org.springframework.web-3.0.0.RELEASE.jar b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/org.springframework.web-3.0.0.RELEASE.jar
index 928ea03..928ea03 100644
--- a/formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/org.springframework.web-3.0.0.RELEASE.jar
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/org.springframework.web-3.0.0.RELEASE.jar
Binary files differ
diff --git a/formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/org.springframework.web.servlet-3.0.0.RELEASE.jar b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/org.springframework.web.servlet-3.0.0.RELEASE.jar
index aa75c06..aa75c06 100644
--- a/formtags/war/formtags-war/src/main/webapp/WEB-INF/lib/org.springframework.web.servlet-3.0.0.RELEASE.jar
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/lib/org.springframework.web.servlet-3.0.0.RELEASE.jar
Binary files differ
diff --git a/formtags/war/formtags-war/src/main/webapp/WEB-INF/web.xml b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/web.xml
index 51b3e30..51b3e30 100644
--- a/formtags/war/formtags-war/src/main/webapp/WEB-INF/web.xml
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/web.xml
diff --git a/formtags/war/formtags-war/src/main/webapp/css/base.css b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/css/base.css
index 4cafa80..4cafa80 100644
--- a/formtags/war/formtags-war/src/main/webapp/css/base.css
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/css/base.css
diff --git a/formtags/war/formtags-war/src/main/webapp/css/style.css b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/css/style.css
index 3b337a8..3b337a8 100644
--- a/formtags/war/formtags-war/src/main/webapp/css/style.css
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/css/style.css
diff --git a/formtags/war/formtags-war/src/main/webapp/favicon.ico b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/favicon.ico
index 7e54ebd..7e54ebd 100644
--- a/formtags/war/formtags-war/src/main/webapp/favicon.ico
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/favicon.ico
Binary files differ
diff --git a/formtags/war/formtags-war/src/main/webapp/index.jsp b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/index.jsp
index 92d1b12..92d1b12 100644
--- a/formtags/war/formtags-war/src/main/webapp/index.jsp
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/index.jsp
diff --git a/osgi-examples/basic-wiring/README b/osgi-examples/README
index 2b77a02..2b77a02 100644
--- a/osgi-examples/basic-wiring/README
+++ b/osgi-examples/README
diff --git a/osgi-examples/basic-wiring/bundle.x/.classpath b/osgi-examples/bundle.x/.classpath
index 4f0fdbe..4f0fdbe 100644
--- a/osgi-examples/basic-wiring/bundle.x/.classpath
+++ b/osgi-examples/bundle.x/.classpath
diff --git a/osgi-examples/basic-wiring/bundle.x/.project b/osgi-examples/bundle.x/.project
index bc788fd..bc788fd 100644
--- a/osgi-examples/basic-wiring/bundle.x/.project
+++ b/osgi-examples/bundle.x/.project
diff --git a/osgi-examples/basic-wiring/bundle.x/.settings/org.eclipse.wst.common.project.facet.core.xml b/osgi-examples/bundle.x/.settings/org.eclipse.wst.common.project.facet.core.xml
index 31a5903..31a5903 100644
--- a/osgi-examples/basic-wiring/bundle.x/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/osgi-examples/bundle.x/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/osgi-examples/basic-wiring/bundle.x/src/main/resources/META-INF/MANIFEST.MF b/osgi-examples/bundle.x/src/main/resources/META-INF/MANIFEST.MF
index 7bee035..7bee035 100644
--- a/osgi-examples/basic-wiring/bundle.x/src/main/resources/META-INF/MANIFEST.MF
+++ b/osgi-examples/bundle.x/src/main/resources/META-INF/MANIFEST.MF
diff --git a/osgi-examples/basic-wiring/bundle.y1/.classpath b/osgi-examples/bundle.y1/.classpath
index 4f0fdbe..4f0fdbe 100644
--- a/osgi-examples/basic-wiring/bundle.y1/.classpath
+++ b/osgi-examples/bundle.y1/.classpath
diff --git a/osgi-examples/basic-wiring/bundle.y1/.project b/osgi-examples/bundle.y1/.project
index 9758595..9758595 100644
--- a/osgi-examples/basic-wiring/bundle.y1/.project
+++ b/osgi-examples/bundle.y1/.project
diff --git a/osgi-examples/basic-wiring/bundle.y1/.settings/org.eclipse.wst.common.project.facet.core.xml b/osgi-examples/bundle.y1/.settings/org.eclipse.wst.common.project.facet.core.xml
index 31a5903..31a5903 100644
--- a/osgi-examples/basic-wiring/bundle.y1/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/osgi-examples/bundle.y1/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/osgi-examples/basic-wiring/bundle.y1/src/main/resources/META-INF/MANIFEST.MF b/osgi-examples/bundle.y1/src/main/resources/META-INF/MANIFEST.MF
index bfa48fe..bfa48fe 100644
--- a/osgi-examples/basic-wiring/bundle.y1/src/main/resources/META-INF/MANIFEST.MF
+++ b/osgi-examples/bundle.y1/src/main/resources/META-INF/MANIFEST.MF
diff --git a/osgi-examples/basic-wiring/bundle.y2/.classpath b/osgi-examples/bundle.y2/.classpath
index 4f0fdbe..4f0fdbe 100644
--- a/osgi-examples/basic-wiring/bundle.y2/.classpath
+++ b/osgi-examples/bundle.y2/.classpath
diff --git a/osgi-examples/basic-wiring/bundle.y2/.project b/osgi-examples/bundle.y2/.project
index 4761c53..4761c53 100644
--- a/osgi-examples/basic-wiring/bundle.y2/.project
+++ b/osgi-examples/bundle.y2/.project
diff --git a/osgi-examples/basic-wiring/bundle.y2/.settings/org.eclipse.wst.common.project.facet.core.xml b/osgi-examples/bundle.y2/.settings/org.eclipse.wst.common.project.facet.core.xml
index 31a5903..31a5903 100644
--- a/osgi-examples/basic-wiring/bundle.y2/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/osgi-examples/bundle.y2/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/osgi-examples/basic-wiring/bundle.y2/src/main/resources/META-INF/MANIFEST.MF b/osgi-examples/bundle.y2/src/main/resources/META-INF/MANIFEST.MF
index 9a81dda..9a81dda 100644
--- a/osgi-examples/basic-wiring/bundle.y2/src/main/resources/META-INF/MANIFEST.MF
+++ b/osgi-examples/bundle.y2/src/main/resources/META-INF/MANIFEST.MF
diff --git a/osgi-examples/basic-wiring/bundle.z/.classpath b/osgi-examples/bundle.z/.classpath
index 4f0fdbe..4f0fdbe 100644
--- a/osgi-examples/basic-wiring/bundle.z/.classpath
+++ b/osgi-examples/bundle.z/.classpath
diff --git a/osgi-examples/basic-wiring/bundle.z/.project b/osgi-examples/bundle.z/.project
index bb5c5fc..bb5c5fc 100644
--- a/osgi-examples/basic-wiring/bundle.z/.project
+++ b/osgi-examples/bundle.z/.project
diff --git a/osgi-examples/basic-wiring/bundle.z/src/main/resources/META-INF/MANIFEST.MF b/osgi-examples/bundle.z/src/main/resources/META-INF/MANIFEST.MF
index 189ce9c..189ce9c 100644
--- a/osgi-examples/basic-wiring/bundle.z/src/main/resources/META-INF/MANIFEST.MF
+++ b/osgi-examples/bundle.z/src/main/resources/META-INF/MANIFEST.MF
diff --git a/osgi-examples/basic-wiring/commands b/osgi-examples/commands
index bcdf946..bcdf946 100644
--- a/osgi-examples/basic-wiring/commands
+++ b/osgi-examples/commands
diff --git a/osgi-examples/ivy.xml b/osgi-examples/ivy.xml
new file mode 100644
index 0000000..41dae89
--- /dev/null
+++ b/osgi-examples/ivy.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
+<ivy-module
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
+ version="1.3">
+
+ <info organisation="org.eclipse.virgo.samples" module="${ant.project.name}"/>
+
+ <configurations>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
+ </configurations>
+
+ <publications>
+ <artifact name="${ant.project.name}"/>
+ <artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
+ </publications>
+
+ <dependencies>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="compile->runtime"/>
+ </dependencies>
+
+</ivy-module> \ No newline at end of file
diff --git a/osgi-examples/org.eclipse.osgi-3.7.0.v20110124-0830.jar b/osgi-examples/org.eclipse.osgi-3.7.0.v20110124-0830.jar
deleted file mode 100644
index 5e0ae28..0000000
--- a/osgi-examples/org.eclipse.osgi-3.7.0.v20110124-0830.jar
+++ /dev/null
Binary files differ

Back to the top