APF-1419: Tapestry cleanup after upgrading tutorial to AppFuse 3.5.0.

mraible · mraible · commit f9fc06be724e · 2015-02-18T09:07:56.000-07:00
diff --git a/plugins/appfuse-maven-plugin/src/main/resources/appfuse/web/ApplicationResources.ftl b/plugins/appfuse-maven-plugin/src/main/resources/appfuse/web/ApplicationResources.ftl
@@ -10,7 +10,7 @@
 ${pojoNameLower}.added=${pojo.shortName} has been added successfully.
 ${pojoNameLower}.updated=${pojo.shortName} has been updated successfully.
 ${pojoNameLower}.deleted=${pojo.shortName} has been deleted successfully.
-${pojoNameLower}.missing=${pojo.shortName} has been deleted successfully.
+${pojoNameLower}.missing=${pojo.shortName} cannot be found with specified id.
 
 # -- ${pojoNameLower} list page --
 ${pojoNameLower}List.title=${pojo.shortName} List
diff --git a/plugins/appfuse-maven-plugin/src/main/resources/appfuse/web/tapestry/form-view.ftl b/plugins/appfuse-maven-plugin/src/main/resources/appfuse/web/tapestry/form-view.ftl
@@ -1,6 +1,5 @@
 <#assign pojoNameLower = pojo.shortName.substring(0,1).toLowerCase()+pojo.shortName.substring(1)>
-<html t:type="layout" title="message:${pojoNameLower}Detail.title"
-          heading="message:${pojoNameLower}Detail.heading" menu="${pojo.shortName}Menu"
+<html t:type="layout" title="message:${pojoNameLower}Detail.title" menu="${pojo.shortName}Menu"
           xmlns:t="http://tapestry.apache.org/schema/tapestry_5_4.xsd">
 
 <div class="col-sm-3">
diff --git a/plugins/appfuse-maven-plugin/src/main/resources/appfuse/web/tapestry/form.ftl b/plugins/appfuse-maven-plugin/src/main/resources/appfuse/web/tapestry/form.ftl
@@ -14,9 +14,7 @@ import org.apache.tapestry5.annotations.InjectPage;
 import org.apache.tapestry5.annotations.Property;
 import org.apache.tapestry5.annotations.Persist;
 import org.apache.tapestry5.annotations.Service;
-import org.apache.tapestry5.corelib.components.EventLink;
 import org.apache.tapestry5.corelib.components.Form;
-import org.apache.tapestry5.PersistenceConstants;
 import org.apache.tapestry5.EventContext;
 
 <#if genericcore>
@@ -28,8 +26,6 @@ import ${pojo.packageName}.${pojo.shortName};
 
 import org.slf4j.Logger;
 
-import java.util.List;
-
 public class ${pojo.shortName}Form {
     @Inject
     private Logger log;
@@ -145,4 +141,4 @@ public class ${pojo.shortName}Form {
     Object onCancel() {
         return ${pojoNameLower}List;
     }
-}
+}
diff --git a/web/tapestry/src/main/java/org/appfuse/webapp/components/UserForm.java b/web/tapestry/src/main/java/org/appfuse/webapp/components/UserForm.java
@@ -11,7 +11,6 @@
 import org.appfuse.model.User;
 import org.appfuse.service.RoleManager;
 import org.appfuse.webapp.AppFuseEventConstants;
-import org.appfuse.webapp.pages.PasswordUpdate;
 import org.appfuse.webapp.services.CountryService;
 import org.appfuse.webapp.services.impl.RoleEncoder;
 import org.slf4j.Logger;
diff --git a/web/tapestry/src/main/java/org/appfuse/webapp/pages/UserEdit.java b/web/tapestry/src/main/java/org/appfuse/webapp/pages/UserEdit.java
@@ -28,7 +28,6 @@
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 
 /**
@@ -286,6 +285,4 @@ Object onUpdatePassword() {
     public void setFrom(String from) {
         this.from = from;
     }
-
-
 }
diff --git a/web/tapestry/src/main/resources/org/appfuse/webapp/components/Layout.tml b/web/tapestry/src/main/resources/org/appfuse/webapp/components/Layout.tml
@@ -49,8 +49,6 @@
         </t:menu>
     </div>
     <t:header/>
-
-
 </nav>
 
 <div class="container">
diff --git a/web/tapestry/src/main/resources/org/appfuse/webapp/components/UserForm.tml b/web/tapestry/src/main/resources/org/appfuse/webapp/components/UserForm.tml
@@ -196,12 +196,8 @@
 
                 <a t:type="eventlink" id="cancel" event="canceled" class="btn btn-default">${message:button.cancel}
                 </a>
-
             </div>
-
         </fieldset>
-
     </form>
-
 </div>
 </t:container>
diff --git a/web/tapestry/src/main/webapp/Login.tml b/web/tapestry/src/main/webapp/Login.tml
@@ -10,7 +10,7 @@
         </h2>
 
         <t:if test="${errorMessage}">
-            <div class="alert alert-danger fade in">
+            <div class="alert alert-danger alert-dismissable">
                 ${message:errors.password.mismatch}
             </div>
         </t:if>
diff --git a/web/tapestry/src/main/webapp/PasswordUpdate.tml b/web/tapestry/src/main/webapp/PasswordUpdate.tml
@@ -19,7 +19,7 @@
     <form t:type="form" t:id="passwordUpdate" class="well form-horizontal">
 
         <input t:type="textfield" t:id="username" value="username"   validate="required"
-              t:mixins="formgroup" t:label="${message:user.username}"/>
+               t:mixins="formgroup" t:label="${message:user.username}"/>
 
         <t:if test="token">
             <input t:type="hidden" t:id="token" value="token"/>
diff --git a/web/tapestry/src/main/webapp/WEB-INF/web.xml b/web/tapestry/src/main/webapp/WEB-INF/web.xml
@@ -98,13 +98,7 @@
             <param-value>springSecurityFilterChain</param-value>
         </init-param>
     </filter>
-<!--
-    <filter>
-        <filter-name>sitemesh</filter-name>
-        <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
-    </filter>
--->
-
+    
     <!-- T5/Spring Filter -->
     <filter>
         <filter-name>app</filter-name>
@@ -131,14 +125,6 @@
         <filter-name>rewriteFilter</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
-<!--
-    <filter-mapping>
-        <filter-name>sitemesh</filter-name>
-        <url-pattern>/*</url-pattern>
-        <dispatcher>REQUEST</dispatcher>
-        <dispatcher>FORWARD</dispatcher>
-    </filter-mapping>
--->
     <!-- T5 Filter Mapping -->
     <filter-mapping>
         <filter-name>app</filter-name>
diff --git a/web/tapestry/src/main/webapp/admin/UserList.tml b/web/tapestry/src/main/webapp/admin/UserList.tml
@@ -3,7 +3,7 @@
       xmlns:t="http://tapestry.apache.org/schema/tapestry_5_4.xsd" xmlns:p="tapestry:parameter">
 
 <t:if test="errorMessage">
-    <div class="alert alert-error fade in">
+    <div class="alert alert-error alert-dismissable">
         <a href="#" data-dismiss="alert" class="close">&times;</a>
         ${errorMessage}
     </div>
@@ -17,9 +17,9 @@
             <div id="search" class="input-group">
                 <input t:type="textfield" size="20" name="q" t:id="q" placeholder="${message:search.enterTerms}"
                        class="form-control"/>
-        <span class="input-group-btn">
-        <button type="submit" class="btn btn-default">${message:button.search}</button>
-        </span>
+                <span class="input-group-btn">
+                    <button type="submit" class="btn btn-default">${message:button.search}</button>
+                </span>
             </div>
         </form>
     </div>
diff --git a/web/tapestry/src/main/webapp/images/403.jpg b/web/tapestry/src/main/webapp/images/403.jpg
diff --git a/web/tapestry/src/main/webapp/images/404.jpg b/web/tapestry/src/main/webapp/images/404.jpg
diff --git a/web/tapestry/src/main/webapp/images/iconInformation.gif b/web/tapestry/src/main/webapp/images/iconInformation.gif
diff --git a/web/tapestry/src/main/webapp/images/iconWarning.gif b/web/tapestry/src/main/webapp/images/iconWarning.gif

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@`
`28`	`28`	`import javax.servlet.http.HttpServletRequest;`
`29`	`29`	`import java.io.IOException;`
`30`	`30`	`import java.util.ArrayList;`
`31`		`-import java.util.HashSet;`
`32`	`31`	`import java.util.List;`
`33`	`32`
`34`	`33`	`/**`
`@@ -286,6 +285,4 @@ Object onUpdatePassword() {`
`286`	`285`	`public void setFrom(String from) {`
`287`	`286`	`this.from = from;`
`288`	`287`	`}`
`289`		`-`
`290`		`-`
`291`	`288`	`}`