Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2013-01-31 12:57:33 -0500
committerChristopher Frost2013-01-31 12:57:33 -0500
commit1ee6cc1635385822da0684ee81c5afe184a6893d (patch)
tree0dfe760ad2fa933102beb99a6a39eb347a46ddd2
parent931e3cbd7a09011c541e2bdf83d7759f73edfc47 (diff)
downloadorg.eclipse.virgo.samples-1ee6cc1635385822da0684ee81c5afe184a6893d.tar.gz
org.eclipse.virgo.samples-1ee6cc1635385822da0684ee81c5afe184a6893d.tar.xz
org.eclipse.virgo.samples-1ee6cc1635385822da0684ee81c5afe184a6893d.zip
329368 Formtags war, shared libs and shared service are now working and the par is almost there.
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/par/web/CountryEditor.java (renamed from formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/CountryEditor.java)4
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/par/web/FormController.java (renamed from formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/FormController.java)2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/par/web/ListController.java (renamed from formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/ListController.java)2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/par/web/validation/CountryValidator.java (renamed from formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/validation/CountryValidator.java)2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/par/web/validation/UserValidator.java (renamed from formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/validation/UserValidator.java)2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/META-INF/MANIFEST.MF1
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/WEB-INF/applicationContext.xml2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/WEB-INF/formtags-servlet.xml8
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/css/style.css2
-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.xml1
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/META-INF/MANIFEST.MF3
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/WEB-INF/applicationContext.xml2
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/WEB-INF/formtags-servlet.xml8
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/css/style.css2
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/resources/META-INF/MANIFEST.MF2
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/sharedservices/validation/CountryValidator.java (renamed from formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/validation/CountryValidator.java)2
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/sharedservices/validation/UserValidator.java (renamed from formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/validation/UserValidator.java)2
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/sharedservices/web/CountryEditor.java (renamed from formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/CountryEditor.java)4
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/sharedservices/web/FormController.java (renamed from formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/FormController.java)2
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/sharedservices/web/ListController.java (renamed from formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/ListController.java)2
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/META-INF/MANIFEST.MF3
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/WEB-INF/applicationContext.xml2
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/WEB-INF/formtags-servlet.xml8
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/css/style.css2
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/.classpath2
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/.settings/org.eclipse.wst.common.project.facet.core.xml1
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/applicationContext.xml2
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/WEB-INF/formtags-servlet.xml8
-rw-r--r--formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/css/style.css2
30 files changed, 48 insertions, 43 deletions
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/CountryEditor.java b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/par/web/CountryEditor.java
index d63f057..55fa95c 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/CountryEditor.java
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/par/web/CountryEditor.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.web;
+package org.eclipse.virgo.samples.formtags.par.web;
@@ -44,7 +44,7 @@ public class CountryEditor extends PropertyEditorSupport {
/**
- * Creates a new instance of the {@link org.eclipse.virgo.samples.formtags.formtags.web.CountryEditor} class.
+ * Creates a new instance of the {@link org.eclipse.virgo.samples.formtags.par.web.CountryEditor} class.
*
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/FormController.java b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/par/web/FormController.java
index 62e2882..80a9730 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/FormController.java
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/par/web/FormController.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.web;
+package org.eclipse.virgo.samples.formtags.par.web;
import org.eclipse.virgo.samples.formtags.par.domain.Colour;
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/ListController.java b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/par/web/ListController.java
index 211447a..09cfa91 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/ListController.java
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/par/web/ListController.java
@@ -8,7 +8,7 @@
* Contributors:
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.web;
+package org.eclipse.virgo.samples.formtags.par.web;
import org.eclipse.virgo.samples.formtags.par.service.UserManager;
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/validation/CountryValidator.java b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/par/web/validation/CountryValidator.java
index 63d6f0b..fc82866 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/validation/CountryValidator.java
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/par/web/validation/CountryValidator.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.validation;
+package org.eclipse.virgo.samples.formtags.par.web.validation;
import org.eclipse.virgo.samples.formtags.par.domain.Country;
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/validation/UserValidator.java b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/par/web/validation/UserValidator.java
index 6156a14..d4540ee 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/formtags/validation/UserValidator.java
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/java/org/eclipse/virgo/samples/formtags/par/web/validation/UserValidator.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.validation;
+package org.eclipse.virgo.samples.formtags.par.web.validation;
import org.eclipse.virgo.samples.formtags.par.domain.User;
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/META-INF/MANIFEST.MF b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/META-INF/MANIFEST.MF
index 07e4d16..b90d0d7 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/META-INF/MANIFEST.MF
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/META-INF/MANIFEST.MF
@@ -8,6 +8,7 @@ Import-Package: org.eclipse.virgo.samples.formtags.par.domain,
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
+Bundle-Classpath: .,WEB-INF/classes
Import-Bundle: com.springsource.org.apache.taglibs.standard;version="1.1.2"
Import-Library: org.springframework.spring;version="[2.5.6.A,5.0.0)"
Web-ContextPath: formtags-par
diff --git a/formtags/par/org.eclipse.virgo.samples.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 1176f5d..03b0e87 100644
--- a/formtags/par/org.eclipse.virgo.samples.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.eclipse.virgo.samples.formtags.formtags.service.UserManager" />
+ <reference id="userManager" interface="org.eclipse.virgo.samples.formtags.par.service.UserManager" />
</beans:beans>
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.web/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 29ae38b..370f41d 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.web/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.eclipse.virgo.samples.formtags.formtags.web.ListController">
+ <bean name="/list.htm" class="org.eclipse.virgo.samples.formtags.par.web.ListController">
<property name="userManager" ref="userManager"/>
</bean>
- <bean name="/form.htm" class="org.eclipse.virgo.samples.formtags.formtags.web.FormController">
+ <bean name="/form.htm" class="org.eclipse.virgo.samples.formtags.par.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.eclipse.virgo.samples.formtags.formtags.validation.UserValidator"/>
+ <bean id="userValidator" class="org.eclipse.virgo.samples.formtags.par.validation.UserValidator"/>
</property>
</bean>
- <bean name="/about.htm" class="org.eclipse.virgo.samples.formtags.formtags.web.ListController">
+ <bean name="/about.htm" class="org.eclipse.virgo.samples.formtags.par.web.ListController">
<property name="userManager" ref="userManager"/>
<property name="viewName" value="about"/>
</bean>
diff --git a/formtags/par/org.eclipse.virgo.samples.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..e504698 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/css/style.css
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/css/style.css
@@ -2,7 +2,7 @@ body
{
margin: 0;
margin: 0 auto;
- background: #f4f4f4 url(images/bg.gif) top center repeat-y;
+ background-color: #f4f4f4;
}
#header
{
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
index 8125842..4bfa96e 100644
--- 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
@@ -1,6 +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"/>
+ <bundle symbolicName="org.eclipse.virgo.samples.formtags.par.domain"/>
+ <bundle symbolicName="org.eclipse.virgo.samples.formtags.par.service"/>
+ <bundle symbolicName="org.eclipse.virgo.samples.formtags.par.web"/>
</org.eclipse.virgo.ide.par:Par>
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags/.settings/org.eclipse.wst.common.project.facet.core.xml b/formtags/par/org.eclipse.virgo.samples.formtags/.settings/org.eclipse.wst.common.project.facet.core.xml
index 3342fa9..4dfacf4 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/formtags/par/org.eclipse.virgo.samples.formtags/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
+ <runtime name="Virgo Runtime"/>
<installed facet="org.eclipse.virgo.server.par" version="1.0"/>
</faceted-project>
diff --git a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/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 04009c7..5e30935 100644
--- a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/META-INF/MANIFEST.MF
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/META-INF/MANIFEST.MF
@@ -7,4 +7,5 @@ Import-Package: javax.servlet.http,
javax.servlet.jsp.jstl.core;version="[1.1.2,1.2.1)"
Import-Library: org.springframework.spring;version="[2.5.6.A,5.0.0)"
Import-Bundle: com.springsource.org.apache.taglibs.standard;version="1.1.2"
-Web-ContextPath: formtags-par
+Web-ContextPath: formtags
+Bundle-Classpath: .,WEB-INF/classes
diff --git a/formtags/shared-libs/org.eclipse.virgo.samples.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 79de550..85b1cc6 100644
--- a/formtags/shared-libs/org.eclipse.virgo.samples.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.eclipse.virgo.samples.formtags.formtags.service.StubUserManager"/>
+ <bean id="userManager" class="org.eclipse.virgo.samples.formtags.sharedlibs.service.StubUserManager"/>
</beans> \ No newline at end of file
diff --git a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/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 29ae38b..ae75dc8 100644
--- a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/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.eclipse.virgo.samples.formtags.formtags.web.ListController">
+ <bean name="/list.htm" class="org.eclipse.virgo.samples.formtags.sharedlibs.web.ListController">
<property name="userManager" ref="userManager"/>
</bean>
- <bean name="/form.htm" class="org.eclipse.virgo.samples.formtags.formtags.web.FormController">
+ <bean name="/form.htm" class="org.eclipse.virgo.samples.formtags.sharedlibs.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.eclipse.virgo.samples.formtags.formtags.validation.UserValidator"/>
+ <bean id="userValidator" class="org.eclipse.virgo.samples.formtags.sharedlibs.validation.UserValidator"/>
</property>
</bean>
- <bean name="/about.htm" class="org.eclipse.virgo.samples.formtags.formtags.web.ListController">
+ <bean name="/about.htm" class="org.eclipse.virgo.samples.formtags.sharedlibs.web.ListController">
<property name="userManager" ref="userManager"/>
<property name="viewName" value="about"/>
</bean>
diff --git a/formtags/shared-libs/org.eclipse.virgo.samples.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..e504698 100644
--- a/formtags/shared-libs/org.eclipse.virgo.samples.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
@@ -2,7 +2,7 @@ body
{
margin: 0;
margin: 0 auto;
- background: #f4f4f4 url(images/bg.gif) top center repeat-y;
+ background-color: #f4f4f4;
}
#header
{
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
index f9bf475..76d22a6 100644
--- 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
@@ -6,5 +6,5 @@ Tool: Bundlor 1.1.0.RELEASE
Bundle-Name: FormTags Service (and implementation)
Bundle-ManifestVersion: 2
Import-Package: org.springframework.core.enums
-Bundle-SymbolicName: org.eclipse.virgo.samples.formtags.shared-services.service
+Bundle-SymbolicName: org.eclipse.virgo.samples.formtags.sharedservices.service
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/validation/CountryValidator.java b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/sharedservices/validation/CountryValidator.java
index 82d9070..7ab59c0 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/validation/CountryValidator.java
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/sharedservices/validation/CountryValidator.java
@@ -8,7 +8,7 @@
* Contributors:
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.validation;
+package org.eclipse.virgo.samples.formtags.sharedservices.validation;
import org.eclipse.virgo.samples.formtags.sharedservices.domain.Country;
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/validation/UserValidator.java b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/sharedservices/validation/UserValidator.java
index 3a89848..b4504d0 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/validation/UserValidator.java
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/sharedservices/validation/UserValidator.java
@@ -8,7 +8,7 @@
* Contributors:
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.validation;
+package org.eclipse.virgo.samples.formtags.sharedservices.validation;
import org.eclipse.virgo.samples.formtags.sharedservices.domain.User;
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/CountryEditor.java b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/sharedservices/web/CountryEditor.java
index b32085d..9e306d3 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/CountryEditor.java
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/sharedservices/web/CountryEditor.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.web;
+package org.eclipse.virgo.samples.formtags.sharedservices.web;
@@ -44,7 +44,7 @@ public class CountryEditor extends PropertyEditorSupport {
/**
- * Creates a new instance of the {@link org.eclipse.virgo.samples.formtags.formtags.web.CountryEditor} class.
+ * Creates a new instance of the {@link org.eclipse.virgo.samples.formtags.sharedservices.web.CountryEditor} class.
*
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/FormController.java b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/sharedservices/web/FormController.java
index aca0e03..24c513a 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/FormController.java
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/sharedservices/web/FormController.java
@@ -8,7 +8,7 @@
* Contributors:
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.web;
+package org.eclipse.virgo.samples.formtags.sharedservices.web;
import java.beans.PropertyEditorSupport;
import java.util.Map;
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/ListController.java b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/sharedservices/web/ListController.java
index 647a65a..7329457 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/formtags/web/ListController.java
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/java/org/eclipse/virgo/samples/formtags/sharedservices/web/ListController.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.samples.formtags.formtags.web;
+package org.eclipse.virgo.samples.formtags.sharedservices.web;
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/META-INF/MANIFEST.MF b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/META-INF/MANIFEST.MF
index 651a074..70cdcd7 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/META-INF/MANIFEST.MF
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/META-INF/MANIFEST.MF
@@ -3,6 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: FormTags Shared Services WAR
Bundle-SymbolicName: org.eclipse.virgo.samples.formtags.sharedservices.web
Bundle-Version: 3.0.0
+Bundle-Classpath: .,WEB-INF/classes
Import-Package: javax.servlet.http,
javax.servlet.jsp.jstl.core;version="[1.1.2,1.2.1)",
org.eclipse.virgo.samples.formtags.sharedservices.domain,
@@ -10,4 +11,4 @@ Import-Package: javax.servlet.http,
org.eclipse.virgo.web.dm;version="[3.0,5.0)"
Import-Library: org.springframework.spring;version="[2.5.6.A,4.0.0)"
Import-Bundle: com.springsource.org.apache.taglibs.standard;version="1.1.2.v20110517"
-Web-ContextPath: formtags-par
+Web-ContextPath: formtags
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.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 1eb7782..743f859 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.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.eclipse.virgo.samples.formtags.formtags.service.UserManager" />
+ <reference id="userManager" interface="org.eclipse.virgo.samples.formtags.sharedservices.service.UserManager" />
</beans:beans> \ No newline at end of file
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.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 927fbdf..558dd1e 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.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.eclipse.virgo.samples.formtags.formtags.web.ListController">
+ <bean name="/list.htm" class="org.eclipse.virgo.samples.formtags.sharedservices.web.ListController">
<property name="userManager" ref="userManager"/>
</bean>
- <bean name="/form.htm" class="org.eclipse.virgo.samples.formtags.formtags.web.FormController">
+ <bean name="/form.htm" class="org.eclipse.virgo.samples.formtags.sharedservices.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.eclipse.virgo.samples.formtags.formtags.validation.UserValidator"/>
+ <bean id="userValidator" class="org.eclipse.virgo.samples.formtags.sharedservices.validation.UserValidator"/>
</property>
</bean>
- <bean name="/about.htm" class="org.eclipse.virgo.samples.formtags.formtags.web.ListController">
+ <bean name="/about.htm" class="org.eclipse.virgo.samples.formtags.sharedservices.web.ListController">
<property name="userManager" ref="userManager"/>
<property name="viewName" value="about"/>
</bean>
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.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..e504698 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.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
@@ -2,7 +2,7 @@ body
{
margin: 0;
margin: 0 auto;
- background: #f4f4f4 url(images/bg.gif) top center repeat-y;
+ background-color: #f4f4f4;
}
#header
{
diff --git a/formtags/war/org.eclipse.virgo.samples.formtags.war/.classpath b/formtags/war/org.eclipse.virgo.samples.formtags.war/.classpath
index 0b3f3ce..c5a1856 100644
--- a/formtags/war/org.eclipse.virgo.samples.formtags.war/.classpath
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/.classpath
@@ -4,7 +4,7 @@
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
diff --git a/formtags/war/org.eclipse.virgo.samples.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 d24a733..46c7d35 100644
--- a/formtags/war/org.eclipse.virgo.samples.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
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
+ <runtime name="Virgo Runtime"/>
<fixed facet="jst.web"/>
<fixed facet="jst.java"/>
<installed facet="jst.java" version="5.0"/>
diff --git a/formtags/war/org.eclipse.virgo.samples.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 79de550..d202d41 100644
--- a/formtags/war/org.eclipse.virgo.samples.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.eclipse.virgo.samples.formtags.formtags.service.StubUserManager"/>
+ <bean id="userManager" class="org.eclipse.virgo.samples.formtags.war.service.StubUserManager"/>
</beans> \ No newline at end of file
diff --git a/formtags/war/org.eclipse.virgo.samples.formtags.war/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 29ae38b..b688410 100644
--- a/formtags/war/org.eclipse.virgo.samples.formtags.war/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.eclipse.virgo.samples.formtags.formtags.web.ListController">
+ <bean name="/list.htm" class="org.eclipse.virgo.samples.formtags.war.web.ListController">
<property name="userManager" ref="userManager"/>
</bean>
- <bean name="/form.htm" class="org.eclipse.virgo.samples.formtags.formtags.web.FormController">
+ <bean name="/form.htm" class="org.eclipse.virgo.samples.formtags.war.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.eclipse.virgo.samples.formtags.formtags.validation.UserValidator"/>
+ <bean id="userValidator" class="org.eclipse.virgo.samples.formtags.war.validation.UserValidator"/>
</property>
</bean>
- <bean name="/about.htm" class="org.eclipse.virgo.samples.formtags.formtags.web.ListController">
+ <bean name="/about.htm" class="org.eclipse.virgo.samples.formtags.war.web.ListController">
<property name="userManager" ref="userManager"/>
<property name="viewName" value="about"/>
</bean>
diff --git a/formtags/war/org.eclipse.virgo.samples.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..e504698 100644
--- a/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/css/style.css
+++ b/formtags/war/org.eclipse.virgo.samples.formtags.war/src/main/webapp/css/style.css
@@ -2,7 +2,7 @@ body
{
margin: 0;
margin: 0 auto;
- background: #f4f4f4 url(images/bg.gif) top center repeat-y;
+ background-color: #f4f4f4;
}
#header
{

Back to the top