329368 - FormTags Par sample now working
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/resources/META-INF/MANIFEST.MF b/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/resources/META-INF/MANIFEST.MF
index 3d905d2..a6bf5c8 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/resources/META-INF/MANIFEST.MF
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.domain/src/main/resources/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Version: 3.0.0
-Bundle-Name: FormTags Domain Model
-Bundle-SymbolicName: org.eclipse.virgo.samples.formtags.formtags.domain_par
+Bundle-Name: FormTags Par Domain Model
+Bundle-SymbolicName: org.eclipse.virgo.samples.formtags.par.domain
Export-Package: org.eclipse.virgo.samples.formtags.par.domain
Import-Bundle: javax.servlet;version="[2.5.0,3.1)"
Import-Library: org.springframework.spring;version="[2.5.6.A,4.0.0)"
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/resources/META-INF/MANIFEST.MF b/formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/resources/META-INF/MANIFEST.MF
index 7cd9289..46ae40b 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/resources/META-INF/MANIFEST.MF
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.service/src/main/resources/META-INF/MANIFEST.MF
@@ -1,8 +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.par.service_par
+Bundle-Name: FormTags Par Service (and implementation)
+Bundle-SymbolicName: org.eclipse.virgo.samples.formtags.par.service
Import-Package: org.eclipse.virgo.samples.formtags.par.domain
Export-Package: org.eclipse.virgo.samples.formtags.par.service
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.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 ff6b5ea..e68c987 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.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="userService" class="org.eclipse.virgo.samples.formtags.formtags.service.internal.StubUserManager"/>
+ <bean id="userService" class="org.eclipse.virgo.samples.formtags.par.service.internal.StubUserManager"/>
</beans>
diff --git a/formtags/par/org.eclipse.virgo.samples.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 915c1d0..88a5b67 100644
--- a/formtags/par/org.eclipse.virgo.samples.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.eclipse.virgo.samples.formtags.formtags.service.UserManager" />
+ interface="org.eclipse.virgo.samples.formtags.par.service.UserManager" />
</beans:beans>
\ No newline at end of file
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 b90d0d7..4ef1b5a 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
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Version: 3.0.0
-Bundle-Name: FormTags Web Bundle
-Bundle-SymbolicName: org.eclipse.virgo.samples.formtags.par.web_par
+Bundle-Name: FormTags Par Web Bundle
+Bundle-SymbolicName: org.eclipse.virgo.samples.formtags.par.web
Import-Package: org.eclipse.virgo.samples.formtags.par.domain,
org.eclipse.virgo.samples.formtags.par.service,
org.eclipse.virgo.web.dm;version="[3.0,5.0)",
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 370f41d..2cb6340 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
@@ -16,7 +16,7 @@
<property name="successView" value="redirect:list.htm"/>
<property name="userManager" ref="userManager"/>
<property name="validators">
- <bean id="userValidator" class="org.eclipse.virgo.samples.formtags.par.validation.UserValidator"/>
+ <bean id="userValidator" class="org.eclipse.virgo.samples.formtags.par.web.validation.UserValidator"/>
</property>
</bean>
diff --git a/formtags/par/org.eclipse.virgo.samples.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..a9dbf53 100644
--- a/formtags/par/org.eclipse.virgo.samples.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
@@ -24,7 +24,7 @@
</div>
<div id="header">
- <span class="title">Virgo Server<span class="darktitle">2.0</span> form tags</span><br/>
+ <span class="title">Virgo Server <span class="darktitle">3.0</span> form tags</span><br/>
</div>
@@ -32,7 +32,7 @@
<div id="block">
<p>
The Spring MVC form tags application showcases the new form
-tag library introduced in Spring 2.0.</p>
+tag library introduced in Spring.</p>
<p>The web application is *very* simplistic, because the intent is
to convey the essence of the new form tags themselves and nothing
@@ -49,7 +49,6 @@
</c:forEach>
</div>
- <p>New JSP tags in Spring 2.0 make building forms with Spring MVC much easier</p>
<div class="menu">
<a href="<c:url value="/list.htm"/>">Home</a>
</div>
diff --git a/formtags/par/org.eclipse.virgo.samples.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..330ab50 100644
--- a/formtags/par/org.eclipse.virgo.samples.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
@@ -22,7 +22,7 @@
</div>
<div id="header">
- <span class="title">Virgo Server <span class="darktitle">2.0</span> form tags</span><br/>
+ <span class="title">Virgo Server <span class="darktitle">3.0</span> form tags</span><br/>
</div>
<div id="content">
@@ -216,7 +216,6 @@
</c:forEach>
</div>
- <p>New JSP tags in Spring 2.0 make building forms with Spring MVC much easier.</p>
<div class="menu">
<a href="<c:url value="/about.htm"/>">About</a>
<a href="<c:url value="/list.htm"/>">Home</a>
diff --git a/formtags/par/org.eclipse.virgo.samples.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..796acfb 100644
--- a/formtags/par/org.eclipse.virgo.samples.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
@@ -24,13 +24,13 @@
</div>
<div id="header">
- <span class="title">Virgo Server<span class="darktitle">2.0</span> form tags</span><br/>
+ <span class="title">Virgo Server <span class="darktitle">3.0</span> form tags</span><br/>
</div>
<div id="content">
<div id="block">
- <p>Welcome to this Spring 2.0 showcase application that demonstrates
+ <p>Welcome to this Spring showcase application that demonstrates
the use of new JSP tags for creating form elements.</p>
<p>Choose an apprentice magician on the left-hand side to continue.</p>
@@ -47,7 +47,6 @@
</c:forEach>
</div>
- <p>New JSP tags in Spring 2.0 make building forms with Spring MVC much easier</p>
<div class="menu">
<a href="<c:url value="/about.htm"/>">About</a>
</div>
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags/META-INF/MANIFEST.MF b/formtags/par/org.eclipse.virgo.samples.formtags/META-INF/MANIFEST.MF
index e46a562..75065f5 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags/META-INF/MANIFEST.MF
+++ b/formtags/par/org.eclipse.virgo.samples.formtags/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
-Application-SymbolicName: org.eclipse.virgo.samples.formtags.formtags_par
+Application-SymbolicName: org.eclipse.virgo.samples.formtags.par
Application-Version: 3.0.0
-Application-Name: FormTags Showcase Application (PAR)
+Application-Name: FormTags Sample Application (PAR)
diff --git a/formtags/shared-libs/org.eclipse.virgo.samples.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..a9dbf53 100644
--- a/formtags/shared-libs/org.eclipse.virgo.samples.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
@@ -24,7 +24,7 @@
</div>
<div id="header">
- <span class="title">Virgo Server<span class="darktitle">2.0</span> form tags</span><br/>
+ <span class="title">Virgo Server <span class="darktitle">3.0</span> form tags</span><br/>
</div>
@@ -32,7 +32,7 @@
<div id="block">
<p>
The Spring MVC form tags application showcases the new form
-tag library introduced in Spring 2.0.</p>
+tag library introduced in Spring.</p>
<p>The web application is *very* simplistic, because the intent is
to convey the essence of the new form tags themselves and nothing
@@ -49,7 +49,6 @@
</c:forEach>
</div>
- <p>New JSP tags in Spring 2.0 make building forms with Spring MVC much easier</p>
<div class="menu">
<a href="<c:url value="/list.htm"/>">Home</a>
</div>
diff --git a/formtags/shared-libs/org.eclipse.virgo.samples.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..330ab50 100644
--- a/formtags/shared-libs/org.eclipse.virgo.samples.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
@@ -22,7 +22,7 @@
</div>
<div id="header">
- <span class="title">Virgo Server <span class="darktitle">2.0</span> form tags</span><br/>
+ <span class="title">Virgo Server <span class="darktitle">3.0</span> form tags</span><br/>
</div>
<div id="content">
@@ -216,7 +216,6 @@
</c:forEach>
</div>
- <p>New JSP tags in Spring 2.0 make building forms with Spring MVC much easier.</p>
<div class="menu">
<a href="<c:url value="/about.htm"/>">About</a>
<a href="<c:url value="/list.htm"/>">Home</a>
diff --git a/formtags/shared-libs/org.eclipse.virgo.samples.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..796acfb 100644
--- a/formtags/shared-libs/org.eclipse.virgo.samples.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
@@ -24,13 +24,13 @@
</div>
<div id="header">
- <span class="title">Virgo Server<span class="darktitle">2.0</span> form tags</span><br/>
+ <span class="title">Virgo Server <span class="darktitle">3.0</span> form tags</span><br/>
</div>
<div id="content">
<div id="block">
- <p>Welcome to this Spring 2.0 showcase application that demonstrates
+ <p>Welcome to this Spring showcase application that demonstrates
the use of new JSP tags for creating form elements.</p>
<p>Choose an apprentice magician on the left-hand side to continue.</p>
@@ -47,7 +47,6 @@
</c:forEach>
</div>
- <p>New JSP tags in Spring 2.0 make building forms with Spring MVC much easier</p>
<div class="menu">
<a href="<c:url value="/about.htm"/>">About</a>
</div>
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.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..a9dbf53 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.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
@@ -24,7 +24,7 @@
</div>
<div id="header">
- <span class="title">Virgo Server<span class="darktitle">2.0</span> form tags</span><br/>
+ <span class="title">Virgo Server <span class="darktitle">3.0</span> form tags</span><br/>
</div>
@@ -32,7 +32,7 @@
<div id="block">
<p>
The Spring MVC form tags application showcases the new form
-tag library introduced in Spring 2.0.</p>
+tag library introduced in Spring.</p>
<p>The web application is *very* simplistic, because the intent is
to convey the essence of the new form tags themselves and nothing
@@ -49,7 +49,6 @@
</c:forEach>
</div>
- <p>New JSP tags in Spring 2.0 make building forms with Spring MVC much easier</p>
<div class="menu">
<a href="<c:url value="/list.htm"/>">Home</a>
</div>
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.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..330ab50 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.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
@@ -22,7 +22,7 @@
</div>
<div id="header">
- <span class="title">Virgo Server <span class="darktitle">2.0</span> form tags</span><br/>
+ <span class="title">Virgo Server <span class="darktitle">3.0</span> form tags</span><br/>
</div>
<div id="content">
@@ -216,7 +216,6 @@
</c:forEach>
</div>
- <p>New JSP tags in Spring 2.0 make building forms with Spring MVC much easier.</p>
<div class="menu">
<a href="<c:url value="/about.htm"/>">About</a>
<a href="<c:url value="/list.htm"/>">Home</a>
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.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..8242122 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.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
@@ -24,13 +24,13 @@
</div>
<div id="header">
- <span class="title">Virgo Server<span class="darktitle">2.0</span> form tags</span><br/>
+ <span class="title">Virgo Server <span class="darktitle">3.0</span> form tags</span><br/>
</div>
<div id="content">
<div id="block">
- <p>Welcome to this Spring 2.0 showcase application that demonstrates
+ <p>Welcome to this Spring showcase application that demonstrates
the use of new JSP tags for creating form elements.</p>
<p>Choose an apprentice magician on the left-hand side to continue.</p>
@@ -47,7 +47,6 @@
</c:forEach>
</div>
- <p>New JSP tags in Spring 2.0 make building forms with Spring MVC much easier</p>
<div class="menu">
<a href="<c:url value="/about.htm"/>">About</a>
</div>
diff --git a/formtags/war/org.eclipse.virgo.samples.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..42c434d 100644
--- a/formtags/war/org.eclipse.virgo.samples.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
@@ -24,7 +24,7 @@
</div>
<div id="header">
- <span class="title">Virgo Server<span class="darktitle">2.0</span> form tags</span><br/>
+ <span class="title">Virgo Server <span class="darktitle">3.0</span> form tags</span><br/>
</div>
@@ -32,7 +32,7 @@
<div id="block">
<p>
The Spring MVC form tags application showcases the new form
-tag library introduced in Spring 2.0.</p>
+tag library introduced in Spring.</p>
<p>The web application is *very* simplistic, because the intent is
to convey the essence of the new form tags themselves and nothing
@@ -49,7 +49,6 @@
</c:forEach>
</div>
- <p>New JSP tags in Spring 2.0 make building forms with Spring MVC much easier</p>
<div class="menu">
<a href="<c:url value="/list.htm"/>">Home</a>
</div>
diff --git a/formtags/war/org.eclipse.virgo.samples.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..85cdb9d 100644
--- a/formtags/war/org.eclipse.virgo.samples.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
@@ -22,7 +22,7 @@
</div>
<div id="header">
- <span class="title">Virgo Server <span class="darktitle">2.0</span> form tags</span><br/>
+ <span class="title">Virgo Server <span class="darktitle">3.0</span> form tags</span><br/>
</div>
<div id="content">
@@ -216,7 +216,6 @@
</c:forEach>
</div>
- <p>New JSP tags in Spring 2.0 make building forms with Spring MVC much easier.</p>
<div class="menu">
<a href="<c:url value="/about.htm"/>">About</a>
<a href="<c:url value="/list.htm"/>">Home</a>
diff --git a/formtags/war/org.eclipse.virgo.samples.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..8242122 100644
--- a/formtags/war/org.eclipse.virgo.samples.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
@@ -24,13 +24,13 @@
</div>
<div id="header">
- <span class="title">Virgo Server<span class="darktitle">2.0</span> form tags</span><br/>
+ <span class="title">Virgo Server <span class="darktitle">3.0</span> form tags</span><br/>
</div>
<div id="content">
<div id="block">
- <p>Welcome to this Spring 2.0 showcase application that demonstrates
+ <p>Welcome to this Spring showcase application that demonstrates
the use of new JSP tags for creating form elements.</p>
<p>Choose an apprentice magician on the left-hand side to continue.</p>
@@ -47,7 +47,6 @@
</c:forEach>
</div>
- <p>New JSP tags in Spring 2.0 make building forms with Spring MVC much easier</p>
<div class="menu">
<a href="<c:url value="/about.htm"/>">About</a>
</div>
