diff --git a/spring-integration-samples/loanshark/.settings/org.eclipse.jdt.core.prefs b/spring-integration-samples/loanshark/.settings/org.eclipse.jdt.core.prefs index ed662b07b8..6d90c2c344 100644 --- a/spring-integration-samples/loanshark/.settings/org.eclipse.jdt.core.prefs +++ b/spring-integration-samples/loanshark/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,5 @@ -#Fri May 28 19:48:06 CEST 2010 -eclipse.preferences.version=1 +#Tue Sep 07 17:11:57 EDT 2010 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 diff --git a/spring-integration-samples/loanshark/.settings/org.eclipse.wst.common.component b/spring-integration-samples/loanshark/.settings/org.eclipse.wst.common.component index abb2f42b94..40187a0f1c 100644 --- a/spring-integration-samples/loanshark/.settings/org.eclipse.wst.common.component +++ b/spring-integration-samples/loanshark/.settings/org.eclipse.wst.common.component @@ -1,22 +1,166 @@ - - uses - - - uses - - - uses - + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + - - - diff --git a/spring-integration-samples/loanshark/.settings/org.eclipse.wst.common.project.facet.core.xml b/spring-integration-samples/loanshark/.settings/org.eclipse.wst.common.project.facet.core.xml index b54cb2a146..bc40bcf886 100644 --- a/spring-integration-samples/loanshark/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/spring-integration-samples/loanshark/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/spring-integration-samples/loanshark/pom.xml b/spring-integration-samples/loanshark/pom.xml index 4472161a69..55ca1945c7 100644 --- a/spring-integration-samples/loanshark/pom.xml +++ b/spring-integration-samples/loanshark/pom.xml @@ -1,6 +1,5 @@ - - + + 4.0.0 org.springframework.integration.samples @@ -10,19 +9,84 @@ loanshark Spring Integration Loan Shark Sample war + + 1.1.0.M3 + 3.0.4.RELEASE + 1.6.10.M1 + 1.6.1 + UTF-8 + + + + spring-maven-release + Spring Maven Release Repository + http://maven.springframework.org/release + + + spring-maven-milestone + Spring Maven Milestone Repository + http://maven.springframework.org/milestone + + + spring-roo-repository + Spring Roo Repository + http://spring-roo-repository.springsource.org/release + + + JBoss Repo + https://repository.jboss.org/nexus/content/repositories/releases + JBoss Repo + + + + + spring-maven-release + Spring Maven Release Repository + http://maven.springframework.org/release + + + spring-maven-milestone + Spring Maven Milestone Repository + http://maven.springframework.org/milestone + + + spring-roo-repository + Spring Roo Repository + http://spring-roo-repository.springsource.org/release + + + - org.hibernate - hibernate-entitymanager - 3.3.2.GA + junit + junit + 4.8.1 + test - commons-logging - commons-logging + log4j + log4j + 1.2.16 + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + + + org.slf4j + slf4j-log4j12 + ${slf4j.version} org.aspectj aspectjrt + ${aspectj.version} javax.servlet @@ -31,215 +95,292 @@ provided - + net.sf.flexjson + flexjson + 2.0 + + + org.springframework.roo org.springframework.roo.annotations - 1.0.2.RELEASE + ${roo.version} provided - - org.springframework.integration - spring-integration-ip - + org.springframework spring-core - - - org.springframework - spring-aspects - - - org.springframework - spring-context - - - org.springframework - spring-aop - - - org.springframework - spring-tx - - - org.springframework - spring-jdbc - - - org.springframework - spring-orm - - - org.springframework - spring-web - - - org.springframework - spring-webmvc - - - hsqldb - hsqldb - - - - junit - junit + ${spring.version} + + + commons-logging + commons-logging + + org.springframework spring-test - - - org.hibernate - hibernate-annotations - 3.3.1.GA - - - net.sf.ehcache - ehcache - 1.4.1 - - - backport-util-concurrent - backport-util-concurrent - 3.1 - - - org.slf4j - slf4j-api - 1.5.6 - - - org.slf4j - slf4j-log4j12 - 1.5.6 - - - javax.persistence - persistence-api - 1.0 - - - - org.hibernate - hibernate-validator - 4.0.0.GA + ${spring.version} + test - org.slf4j - slf4j-api + commons-logging + commons-logging - - javax.validation - validation-api - 1.0.0.GA - - - javax.transaction - transaction-api - 1.1 - - - commons-dbcp - commons-dbcp - 1.2.2 - - - org.springframework.webflow - org.springframework.js - 2.0.8.RELEASE - - - org.springframework - org.springframework.core - - - org.springframework - org.springframework.beans - - - org.springframework - org.springframework.context - - - org.springframework - org.springframework.web - - - org.springframework - org.springframework.web.servlet - - - org.apache.commons - com.springsource.org.apache.commons.logging - - - - - commons-fileupload - commons-fileupload - 1.2 - - - org.tuckey - urlrewritefilter - 3.1.0 - - - - javax.servlet.jsp.jstl - jstl-api - 1.2 - - - org.apache.tomcat - el-api - 6.0.20 - - - joda-time - joda-time - 1.6 - - - org.apache.tiles - tiles-api - 2.1.3 - - - org.apache.tiles - tiles-jsp - 2.1.3 - - - org.apache.tiles - tiles-core - 2.1.3 - org.springframework - spring-expression + spring-context + ${spring.version} - + + org.springframework + spring-aop + ${spring.version} + + + org.springframework + spring-aspects + ${spring.version} + + + org.springframework + spring-tx + ${spring.version} + + + org.hsqldb + hsqldb + 2.0.0 + + + org.hibernate + hibernate-core + 3.5.5-Final + + + org.hibernate + hibernate-entitymanager + 3.5.5-Final + + + cglib + cglib + + + dom4j + dom4j + + + + + org.hibernate.javax.persistence + hibernate-jpa-2.0-api + 1.0.0.Final + + + org.hibernate + hibernate-validator + 4.1.0.Final + + + javax.xml.bind + jaxb-api + + + com.sun.xml.bind + jaxb-impl + + + + + javax.validation + validation-api + 1.0.0.GA + + + cglib + cglib-nodep + 2.2 + + + javax.transaction + jta + 1.1 + + + org.springframework + spring-jdbc + ${spring.version} + + + org.springframework + spring-orm + ${spring.version} + + + commons-pool + commons-pool + 1.5.4 + + + commons-logging + commons-logging + + + + + commons-dbcp + commons-dbcp + 1.3 + + + commons-logging + commons-logging + + + commons-pool + commons-pool + + + xerces + xerces + + + xerces + xercesImpl + + + xml-apis + xml-apis + + + + + org.apache.tiles + tiles-core + 2.2.1 + + + commons-logging + commons-logging + + + + + org.apache.tiles + tiles-jsp + 2.2.1 + + + org.springframework + spring-web + ${spring.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-webmvc + ${spring.version} + + + commons-logging + commons-logging + + + + + org.springframework.webflow + spring-js + 2.1.1.RELEASE + + + org.springframework + spring-beans + + + org.springframework + spring-context + + + org.springframework + spring-core + + + org.springframework + spring-context-support + + + commons-logging + commons-logging + + + + + commons-digester + commons-digester + 2.0 + + + commons-logging + commons-logging + + + + + commons-fileupload + commons-fileupload + 1.2.1 + + + commons-logging + commons-logging + + + + + javax.servlet + jstl + 1.2 + + + javax.el + el-api + 1.0 + provided + + + joda-time + joda-time + 1.6 + + + org.springframework.integration + spring-integration-ip + 2.0.0.M7 + + org.apache.maven.plugins maven-war-plugin - 2.0.2 + 2.1-beta-1 + org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + 2.1 1.6 1.6 @@ -250,19 +391,16 @@ aspectj-maven-plugin 1.0 - + org.aspectj aspectjrt - ${org.aspectj.version} + ${aspectj.version} org.aspectj aspectjtools - ${org.aspectj.version} + ${aspectj.version} @@ -285,10 +423,18 @@ 1.6 + + org.apache.maven.plugins + maven-resources-plugin + 2.4.2 + + UTF-8 + + org.apache.maven.plugins maven-surefire-plugin - 2.4.3 + 2.5 **/*_Roo_* @@ -298,25 +444,23 @@ org.apache.maven.plugins maven-assembly-plugin - 2.1 + 2.2-beta-5 - - jar-with-dependencies - + jar-with-dependencies org.apache.maven.plugins maven-deploy-plugin - 2.4 + 2.5 org.apache.maven.plugins maven-eclipse-plugin - 2.7 + 2.7 true false @@ -351,57 +495,18 @@ org.codehaus.mojo tomcat-maven-plugin - 1.0-beta-1 + 1.0 org.mortbay.jetty - maven-jetty-plugin - 6.1.10 + jetty-maven-plugin + 7.1.2.v20100523 + + + /${project.name} + + - - - - repository.springsource.release - SpringSource EBR - http://repository.springsource.com/maven/bundles/release - - - - repository.jboss - JBoss Repository - http://repository.jboss.org/maven2 - - true - - - false - - - - - repository.glassfish - Glassfish Repository - http://download.java.net/maven/glassfish - - false - - - - repository.springframework.maven.release - Spring Framework Maven Release Repository - http://maven.springframework.org/release - - - repository.springframework.maven.milestone - Spring Framework Maven Milestone Repository - http://maven.springframework.org/milestone - - - repository.springframework.maven.snapshot - Spring Framework Maven Snapshot Repository - http://maven.springframework.org/snapshot - - diff --git a/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark.java b/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark.java index 31f5d0c445..470cffa856 100644 --- a/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark.java +++ b/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark.java @@ -1,9 +1,9 @@ package org.springframework.integration.samples.loanbroker.loanshark.domain; import javax.persistence.Entity; -import org.springframework.roo.addon.entity.RooEntity; import org.springframework.roo.addon.javabean.RooJavaBean; import org.springframework.roo.addon.tostring.RooToString; +import org.springframework.roo.addon.entity.RooEntity; @Entity @RooJavaBean diff --git a/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Configurable.aj b/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Configurable.aj index 12567df0da..779eb2a8e2 100644 --- a/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Configurable.aj +++ b/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Configurable.aj @@ -1,3 +1,6 @@ +// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO. +// You may push code into the target .java compilation unit if you wish to edit any member(s). + package org.springframework.integration.samples.loanbroker.loanshark.domain; import org.springframework.beans.factory.annotation.Configurable; diff --git a/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Entity.aj b/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Entity.aj index 18dc3654fb..2be0c7b670 100644 --- a/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Entity.aj +++ b/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Entity.aj @@ -1,8 +1,11 @@ -package org.springframework.integration.samples.loanbroker.loanshark.domain; +// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO. +// You may push code into the target .java compilation unit if you wish to edit any member(s). +package org.springframework.integration.samples.loanbroker.loanshark.domain; import java.lang.Integer; import java.lang.Long; +import java.lang.SuppressWarnings; import java.util.List; import javax.persistence.Column; import javax.persistence.EntityManager; @@ -11,7 +14,6 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.PersistenceContext; import javax.persistence.Version; - import org.springframework.integration.samples.loanbroker.loanshark.domain.LoanShark; import org.springframework.transaction.annotation.Transactional; @@ -57,7 +59,7 @@ privileged aspect LoanShark_Roo_Entity { if (this.entityManager.contains(this)) { this.entityManager.remove(this); } else { - LoanShark attached = this.entityManager.find(LoanShark.class, this.id); + LoanShark attached = this.entityManager.find(this.getClass(), this.id); this.entityManager.remove(attached); } } @@ -69,11 +71,11 @@ privileged aspect LoanShark_Roo_Entity { } @Transactional - public void LoanShark.merge() { + public LoanShark LoanShark.merge() { if (this.entityManager == null) this.entityManager = entityManager(); LoanShark merged = this.entityManager.merge(this); this.entityManager.flush(); - this.id = merged.getId(); + return merged; } public static final EntityManager LoanShark.entityManager() { @@ -83,9 +85,10 @@ privileged aspect LoanShark_Roo_Entity { } public static long LoanShark.countLoanSharks() { - return (Long) entityManager().createQuery("select count(o) from LoanShark o").getSingleResult(); + return ((Number) entityManager().createQuery("select count(o) from LoanShark o").getSingleResult()).longValue(); } + @SuppressWarnings("unchecked") public static List LoanShark.findAllLoanSharks() { return entityManager().createQuery("select o from LoanShark o").getResultList(); } @@ -95,6 +98,7 @@ privileged aspect LoanShark_Roo_Entity { return entityManager().find(LoanShark.class, id); } + @SuppressWarnings("unchecked") public static List LoanShark.findLoanSharkEntries(int firstResult, int maxResults) { return entityManager().createQuery("select o from LoanShark o").setFirstResult(firstResult).setMaxResults(maxResults).getResultList(); } diff --git a/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Finder.aj b/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Finder.aj index 1979f51b45..f22360c286 100644 --- a/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Finder.aj +++ b/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Finder.aj @@ -1,13 +1,14 @@ +// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO. +// You may push code into the target .java compilation unit if you wish to edit any member(s). + package org.springframework.integration.samples.loanbroker.loanshark.domain; import java.lang.String; -import java.lang.SuppressWarnings; import javax.persistence.EntityManager; import javax.persistence.Query; privileged aspect LoanShark_Roo_Finder { - @SuppressWarnings("unchecked") public static Query LoanShark.findLoanSharksByName(String name) { if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required"); EntityManager em = LoanShark.entityManager(); diff --git a/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_JavaBean.aj b/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_JavaBean.aj index d4d5ab60d6..39c983edb2 100644 --- a/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_JavaBean.aj +++ b/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_JavaBean.aj @@ -1,3 +1,6 @@ +// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO. +// You may push code into the target .java compilation unit if you wish to edit any member(s). + package org.springframework.integration.samples.loanbroker.loanshark.domain; import java.lang.Double; diff --git a/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Json.aj b/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Json.aj new file mode 100644 index 0000000000..0c9539221b --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Json.aj @@ -0,0 +1,32 @@ +// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO. +// You may push code into the target .java compilation unit if you wish to edit any member(s). + +package org.springframework.integration.samples.loanbroker.loanshark.domain; + +import flexjson.JSONDeserializer; +import flexjson.JSONSerializer; +import java.lang.String; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import org.springframework.integration.samples.loanbroker.loanshark.domain.LoanShark; + +privileged aspect LoanShark_Roo_Json { + + public String LoanShark.toJson() { + return new JSONSerializer().exclude("*.class").serialize(this); + } + + public static LoanShark LoanShark.fromJsonToLoanShark(String json) { + return new JSONDeserializer().use(null, LoanShark.class).deserialize(json); + } + + public static String LoanShark.toJsonArray(Collection collection) { + return new JSONSerializer().exclude("*.class").serialize(collection); + } + + public static Collection LoanShark.fromJsonArrayToLoanSharks(String json) { + return new JSONDeserializer>().use(null, ArrayList.class).use("values", LoanShark.class).deserialize(json); + } + +} diff --git a/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_ToString.aj b/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_ToString.aj index f54940cdcc..9b612b811a 100644 --- a/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_ToString.aj +++ b/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_ToString.aj @@ -1,3 +1,6 @@ +// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO. +// You may push code into the target .java compilation unit if you wish to edit any member(s). + package org.springframework.integration.samples.loanbroker.loanshark.domain; import java.lang.String; diff --git a/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/web/SharkController.java b/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/web/SharkController.java index 359e3bfacd..8d391916d0 100644 --- a/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/web/SharkController.java +++ b/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/web/SharkController.java @@ -1,14 +1,12 @@ package org.springframework.integration.samples.loanbroker.loanshark.web; -import org.springframework.integration.samples.loanbroker.loanshark.domain.LoanShark; import org.springframework.roo.addon.web.mvc.controller.RooWebScaffold; - - +import org.springframework.integration.samples.loanbroker.loanshark.domain.LoanShark; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.stereotype.Controller; -@RooWebScaffold(path = "loanshark", automaticallyMaintainView = true, formBackingObject = LoanShark.class) -@RequestMapping("/loanshark/**") +@RooWebScaffold(path = "loansharks", formBackingObject = LoanShark.class) +@RequestMapping("/loansharks") @Controller public class SharkController { } diff --git a/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/web/SharkController_Roo_Controller.aj b/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/web/SharkController_Roo_Controller.aj index 494733902f..85a65ad11c 100644 --- a/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/web/SharkController_Roo_Controller.aj +++ b/spring-integration-samples/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/web/SharkController_Roo_Controller.aj @@ -1,92 +1,140 @@ -package org.springframework.integration.samples.loanbroker.loanshark.web; +// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO. +// You may push code into the target .java compilation unit if you wish to edit any member(s). +package org.springframework.integration.samples.loanbroker.loanshark.web; import java.lang.Long; import java.lang.String; import javax.validation.Valid; - +import org.springframework.core.convert.converter.Converter; +import org.springframework.core.convert.support.GenericConversionService; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.integration.samples.loanbroker.loanshark.domain.LoanShark; -import org.springframework.ui.ModelMap; +import org.springframework.ui.Model; import org.springframework.validation.BindingResult; +import org.springframework.web.bind.WebDataBinder; +import org.springframework.web.bind.annotation.InitBinder; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; privileged aspect SharkController_Roo_Controller { - @RequestMapping(value = "/loanshark", method = RequestMethod.POST) - public String SharkController.create(@Valid LoanShark loanShark, BindingResult result, ModelMap modelMap) { - if (loanShark == null) throw new IllegalArgumentException("A loanShark is required"); + @RequestMapping(method = RequestMethod.POST) + public String SharkController.create(@Valid LoanShark loanShark, BindingResult result, Model model) { if (result.hasErrors()) { - modelMap.addAttribute("loanShark", loanShark); - return "loanshark/create"; + model.addAttribute("loanShark", loanShark); + return "loansharks/create"; } loanShark.persist(); - return "redirect:/loanshark/" + loanShark.getId(); + return "redirect:/loansharks/" + loanShark.getId(); } - @RequestMapping(value = "/loanshark/form", method = RequestMethod.GET) - public String SharkController.createForm(ModelMap modelMap) { - modelMap.addAttribute("loanShark", new LoanShark()); - return "loanshark/create"; + @RequestMapping(params = "form", method = RequestMethod.GET) + public String SharkController.createForm(Model model) { + model.addAttribute("loanShark", new LoanShark()); + return "loansharks/create"; } - @RequestMapping(value = "/loanshark/{id}", method = RequestMethod.GET) - public String SharkController.show(@PathVariable("id") Long id, ModelMap modelMap) { - if (id == null) throw new IllegalArgumentException("An Identifier is required"); - modelMap.addAttribute("loanShark", LoanShark.findLoanShark(id)); - return "loanshark/show"; + @RequestMapping(value = "/{id}", method = RequestMethod.GET) + public String SharkController.show(@PathVariable("id") Long id, Model model) { + model.addAttribute("loanshark", LoanShark.findLoanShark(id)); + model.addAttribute("itemId", id); + return "loansharks/show"; } - @RequestMapping(value = "/loanshark", method = RequestMethod.GET) - public String SharkController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, ModelMap modelMap) { + @RequestMapping(method = RequestMethod.GET) + public String SharkController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model model) { if (page != null || size != null) { int sizeNo = size == null ? 10 : size.intValue(); - modelMap.addAttribute("loansharks", LoanShark.findLoanSharkEntries(page == null ? 0 : (page.intValue() - 1) * sizeNo, sizeNo)); + model.addAttribute("loansharks", LoanShark.findLoanSharkEntries(page == null ? 0 : (page.intValue() - 1) * sizeNo, sizeNo)); float nrOfPages = (float) LoanShark.countLoanSharks() / sizeNo; - modelMap.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages)); + model.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages)); } else { - modelMap.addAttribute("loansharks", LoanShark.findAllLoanSharks()); + model.addAttribute("loansharks", LoanShark.findAllLoanSharks()); } - return "loanshark/list"; + return "loansharks/list"; } @RequestMapping(method = RequestMethod.PUT) - public String SharkController.update(@Valid LoanShark loanShark, BindingResult result, ModelMap modelMap) { - if (loanShark == null) throw new IllegalArgumentException("A loanShark is required"); + public String SharkController.update(@Valid LoanShark loanShark, BindingResult result, Model model) { if (result.hasErrors()) { - modelMap.addAttribute("loanShark", loanShark); - return "loanshark/update"; + model.addAttribute("loanShark", loanShark); + return "loansharks/update"; } loanShark.merge(); - return "redirect:/loanshark/" + loanShark.getId(); + return "redirect:/loansharks/" + loanShark.getId(); } - @RequestMapping(value = "/loanshark/{id}/form", method = RequestMethod.GET) - public String SharkController.updateForm(@PathVariable("id") Long id, ModelMap modelMap) { - if (id == null) throw new IllegalArgumentException("An Identifier is required"); - modelMap.addAttribute("loanShark", LoanShark.findLoanShark(id)); - return "loanshark/update"; + @RequestMapping(value = "/{id}", params = "form", method = RequestMethod.GET) + public String SharkController.updateForm(@PathVariable("id") Long id, Model model) { + model.addAttribute("loanShark", LoanShark.findLoanShark(id)); + return "loansharks/update"; } - @RequestMapping(value = "/loanshark/{id}", method = RequestMethod.DELETE) - public String SharkController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size) { - if (id == null) throw new IllegalArgumentException("An Identifier is required"); + @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) + public String SharkController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model model) { LoanShark.findLoanShark(id).remove(); - return "redirect:/loanshark?page=" + ((page == null) ? "1" : page.toString()) + "&size=" + ((size == null) ? "10" : size.toString()); + model.addAttribute("page", (page == null) ? "1" : page.toString()); + model.addAttribute("size", (size == null) ? "10" : size.toString()); + return "redirect:/loansharks?page=" + ((page == null) ? "1" : page.toString()) + "&size=" + ((size == null) ? "10" : size.toString()); } - @RequestMapping(value = "find/ByName/form", method = RequestMethod.GET) - public String SharkController.findLoanSharksByNameForm(ModelMap modelMap) { - return "loanshark/findLoanSharksByName"; + @RequestMapping(params = { "find=ByName", "form" }, method = RequestMethod.GET) + public String SharkController.findLoanSharksByNameForm(Model model) { + return "loansharks/findLoanSharksByName"; } - @RequestMapping(value = "find/ByName", method = RequestMethod.GET) - public String SharkController.findLoanSharksByName(@RequestParam("name") String name, ModelMap modelMap) { - if (name == null || name.length() == 0) throw new IllegalArgumentException("A Name is required."); - modelMap.addAttribute("loansharks", LoanShark.findLoanSharksByName(name).getResultList()); - return "loanshark/list"; + @RequestMapping(params = "find=ByName", method = RequestMethod.GET) + public String SharkController.findLoanSharksByName(@RequestParam("name") String name, Model model) { + model.addAttribute("loansharks", LoanShark.findLoanSharksByName(name).getResultList()); + return "loansharks/list"; + } + + Converter SharkController.getLoanSharkConverter() { + return new Converter() { + public String convert(LoanShark loanShark) { + return new StringBuilder().append(loanShark.getName()).append(" ").append(loanShark.getCounter()).append(" ").append(loanShark.getAverageRate()).toString(); + } + }; + } + + @InitBinder + void SharkController.registerConverters(WebDataBinder binder) { + if (binder.getConversionService() instanceof GenericConversionService) { + GenericConversionService conversionService = (GenericConversionService) binder.getConversionService(); + conversionService.addConverter(getLoanSharkConverter()); + } + } + + @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json") + @ResponseBody + public String SharkController.showJson(@PathVariable("id") Long id) { + return LoanShark.findLoanShark(id).toJson(); + } + + @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json") + public ResponseEntity SharkController.createFromJson(@RequestBody String json) { + LoanShark.fromJsonToLoanShark(json).persist(); + return new ResponseEntity("LoanShark created", HttpStatus.CREATED); + } + + @RequestMapping(headers = "Accept=application/json") + @ResponseBody + public String SharkController.listJson() { + return LoanShark.toJsonArray(LoanShark.findAllLoanSharks()); + } + + @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json") + public ResponseEntity SharkController.createFromJsonArray(@RequestBody String json) { + for (LoanShark loanshark: LoanShark.fromJsonArrayToLoanSharks(json)) { + loanshark.persist(); + } + return new ResponseEntity("LoanShark created", HttpStatus.CREATED); } } diff --git a/spring-integration-samples/loanshark/src/main/resources/META-INF/persistence.xml b/spring-integration-samples/loanshark/src/main/resources/META-INF/persistence.xml index 0e13ebb1f8..4eed4a170b 100644 --- a/spring-integration-samples/loanshark/src/main/resources/META-INF/persistence.xml +++ b/spring-integration-samples/loanshark/src/main/resources/META-INF/persistence.xml @@ -1,7 +1,6 @@ - - - + + org.hibernate.ejb.HibernatePersistence diff --git a/spring-integration-samples/loanshark/src/main/resources/META-INF/spring/applicationContext.xml b/spring-integration-samples/loanshark/src/main/resources/META-INF/spring/applicationContext.xml index 3bb7c7afbe..df3a201d50 100644 --- a/spring-integration-samples/loanshark/src/main/resources/META-INF/spring/applicationContext.xml +++ b/spring-integration-samples/loanshark/src/main/resources/META-INF/spring/applicationContext.xml @@ -1,16 +1,15 @@ - - - - - - - - - - - - - - + + + + + diff --git a/spring-integration-samples/loanshark/src/main/resources/META-INF/spring/database.properties b/spring-integration-samples/loanshark/src/main/resources/META-INF/spring/database.properties index 3781784f08..7f9adf6994 100644 --- a/spring-integration-samples/loanshark/src/main/resources/META-INF/spring/database.properties +++ b/spring-integration-samples/loanshark/src/main/resources/META-INF/spring/database.properties @@ -1,5 +1,5 @@ -#Updated at Wed Mar 24 10:09:33 PDT 2010 -#Wed Mar 24 10:09:33 PDT 2010 +#Updated at Tue Sep 07 17:11:44 EDT 2010 +#Tue Sep 07 17:11:44 EDT 2010 database.password= database.url=jdbc\:hsqldb\:mem\:loanshark database.username=sa diff --git a/spring-integration-samples/loanshark/src/main/resources/META-INF/spring/log4j.properties b/spring-integration-samples/loanshark/src/main/resources/log4j.properties similarity index 81% rename from spring-integration-samples/loanshark/src/main/resources/META-INF/spring/log4j.properties rename to spring-integration-samples/loanshark/src/main/resources/log4j.properties index d9877f3ff5..dcbdb02715 100644 --- a/spring-integration-samples/loanshark/src/main/resources/META-INF/spring/log4j.properties +++ b/spring-integration-samples/loanshark/src/main/resources/log4j.properties @@ -1,7 +1,7 @@ -#Updated at Wed Mar 24 10:09:35 PDT 2010 -#Wed Mar 24 10:09:35 PDT 2010 +#Updated at Tue Sep 07 17:11:52 EDT 2010 +#Tue Sep 07 17:11:52 EDT 2010 log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.rootLogger=DEBUG, stdout, R +log4j.rootLogger=DEBUG, stdout log4j.appender.R.File=application.log log4j.appender.R.MaxFileSize=100KB log4j.appender.R.layout=org.apache.log4j.PatternLayout diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/classes/alt.properties b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/classes/alt.properties index 5280c238f6..48df87ff70 100644 --- a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/classes/alt.properties +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/classes/alt.properties @@ -1 +1 @@ -styleSheet=static/styles/alt.css +styleSheet=resources/styles/alt.css diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/classes/standard.properties b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/classes/standard.properties index 9aea1e64d4..d8dc0164dd 100644 --- a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/classes/standard.properties +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/classes/standard.properties @@ -1 +1 @@ -styleSheet=static/styles/standard.css +styleSheet=resources/styles/standard.css diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/i18n/application.properties b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/i18n/application.properties index 664f129a4f..aadb31fbeb 100644 --- a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/i18n/application.properties +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/i18n/application.properties @@ -1,7 +1,14 @@ -#Updated at test Wed Mar 24 10:09:34 PDT 2010 -#Wed Mar 24 10:09:34 PDT 2010 -application.name=Loanshark -label.loanshark=Loan Shark -label.loansharks=Loan Sharks -label.name=Name -menu.category.web_mvc_jsp_loanshark_category.label=Loan Shark +#Updated at Tue Sep 07 17:11:50 EDT 2010 +#Tue Sep 07 17:11:50 EDT 2010 +label_org_springframework_integration_samples_loanbroker_loanshark_domain_loanshark_averagerate=Average Rate +menu_item_loanshark_new_label=Loan Shark +menu_item_loanshark_name_label=Name +label_org_springframework_integration_samples_loanbroker_loanshark_domain_loanshark_version=Version +application_name=Loanshark +label_org_springframework_integration_samples_loanbroker_loanshark_domain_loanshark_name=Name +label_org_springframework_integration_samples_loanbroker_loanshark_domain_loanshark_plural=Loan Sharks +label_org_springframework_integration_samples_loanbroker_loanshark_domain_loanshark=Loan Shark +menu_category_loanshark_label=Loan Shark +label_org_springframework_integration_samples_loanbroker_loanshark_domain_loanshark_id=Id +menu_item_loanshark_list_label=Loan Sharks +label_org_springframework_integration_samples_loanbroker_loanshark_domain_loanshark_counter=Counter diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/i18n/messages.properties b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/i18n/messages.properties index c9286f52b2..41cca5419a 100644 --- a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/i18n/messages.properties +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/i18n/messages.properties @@ -1,95 +1,98 @@ #menu -global.menu.new=Create new {0} -global.menu.list=List all {0} -global.menu.find=Find by {0} -global.language.switch=Switch language to {0} -global.language=Language -global.sponsored=Sponsored by SpringSource -global.theme=Theme -global.theme.alt=alt -global.theme.standard=standard +global_menu_new=Create new {0} +global_menu_list=List all {0} +global_menu_find=Find by {0} +global_language_switch=Switch language to {0} +global_language=Language +global_sponsored=Sponsored by SpringSource +global_theme=Theme +global_theme_alt=alt +global_theme_standard=standard +global_generic={0} #welcome page -welcome.titlepane=Welcome to {0} -welcome.h3=Welcome to {0} -welcome.text=Spring Roo provides interactive, lightweight and user customizable tooling that enables rapid delivery of high performance enterprise Java applications. +welcome_titlepane=Welcome to {0} +welcome_h3=Welcome to {0} +welcome_text=Spring Roo provides interactive, lightweight and user customizable tooling that enables rapid delivery of high performance enterprise Java applications. #entity labels -entity.list.all=List all {0} -entity.show=Show {0} -entity.create=Create new {0} -entity.update=Update {0} -entity.delete=Delete {0} -entity.find=Find by {0} -entity.not.found=No {0} found. -entity.not.found.single=No {0} found with this id. +entity_list_all=List all {0} +entity_show=Show {0} +entity_create=Create new {0} +entity_update=Update {0} +entity_delete=Delete {0} +entity_find=Find by {0} +entity_not_found=No {0} found. +entity_not_found_single=No {0} found with this id. +entity_dependency_required=The following dependencies need to be created first: +entity_reference_not_managed=This relationship is managed from the {0} side. #button labels -button.home=Home -button.save=Save -button.update=Update -button.find=Find -button.cancel=Cancel -button.proceed=Proceed -button.submit=Submit -button.reset=Reset -button.end=End -button.showmessage=Show Message -button.showstacktrace=Show Stack Trace -button.showcookie=Show Cookie +button_home=Home +button_save=Save +button_update=Update +button_find=Find +button_cancel=Cancel +button_proceed=Proceed +button_submit=Submit +button_reset=Reset +button_end=End +button_showmessage=Show Message +button_showstacktrace=Show Stack Trace +button_showcookie=Show Cookie #field labels -field.simple.validation=Enter {0} {1} -field.invalid.email=Please enter a valid email -field.invalid.number=Number with \\'-\\' or \\'.\\' allowed -field.invalid.integer=Integer numbers only -field.invalid=Please enter valid {0} -field.required=required +field_simple_validation=Enter {0} {1} +field_invalid_email=Please enter a valid email +field_invalid_number=Number with \\'-\\' or \\'.\\' allowed +field_invalid_integer=Integer numbers only +field_invalid=Please enter valid {0} +field_required=required #list labels -list.first=First Page -list.next=Next Page -list.previous=Previous Page -list.last=Last Page -list.page=Page {0} of {1} -list.size=List results per page: +list_first=First Page +list_next=Next Page +list_previous=Previous Page +list_last=Last Page +list_page=Page {0} of {1} +list_size=List results per page: #selenium -selenium.menu.test.suite=Test Suite +selenium_menu_test_suite=Test Suite #exception -exception.message=Exception Message -exception.stacktrace=Exception Stack Trace -exception.cookie=Cookies -exception.details=Details +exception_message=Exception Message +exception_stacktrace=Exception Stack Trace +exception_cookie=Cookies +exception_details=Details -#dataAccessFailure.jspx -error.dataaccessfailure.title=Data access failure -error.dataaccessfailure.problemdescription=Sorry, a problem occurred while accessing the database. +#dataAccessFailure_jspx +error_dataaccessfailure_title=Data access failure +error_dataaccessfailure_problemdescription=Sorry, a problem occurred while accessing the database. -#resourceNotFound.jspx -error.resourcenotfound.title=Requested Resource Not Found -error.resourcenotfound.problemdescription=Sorry, we did not find the resource you were looking for. +#resourceNotFound_jspx +error_resourcenotfound_title=Requested Resource Not Found +error_resourcenotfound_problemdescription=Sorry, we did not find the resource you were looking for. -#uncaughtException.jspx -error.uncaughtexception.title=Internal Error -error.uncaughtexception.problemdescription=Sorry, we encountered an internal error. +#uncaughtException_jspx +error_uncaughtexception_title=Internal Error +error_uncaughtexception_problemdescription=Sorry, we encountered an internal error. #webflow -webflow.menu.enter=Enter {0} WebFlow -webflow.state1.title=Spring WebFlow - View State One -webflow.state1.message=This is a simple example to get started with Spring Web Flow. The buttons below lead you to another view state (Proceed) or to an end state. -webflow.state2.title=Spring WebFlow - View State Two -webflow.state2.message=This is a simple example to get started with Spring Web Flow. The buttons below lead you to another view state (Proceed) or to an end state. -webflow.endstate.title=Spring WebFlow - End State -webflow.endstate.message=You have now reached the end of this flow. +webflow_menu_enter=Enter {0} WebFlow +webflow_state1_title=Spring WebFlow - View State One +webflow_state1_message=This is a simple example to get started with Spring Web Flow. The buttons below lead you to another view state (Proceed) or to an end state. +webflow_state2_title=Spring WebFlow - View State Two +webflow_state2_message=This is a simple example to get started with Spring Web Flow. The buttons below lead you to another view state (Proceed) or to an end state. +webflow_endstate_title=Spring WebFlow - End State +webflow_endstate_message=You have now reached the end of this flow. #security -security.login.title=Spring Security Login -security.login.message=You have tried to access a protected area of this application. By default you can login as "admin", with a password of "admin". -security.login.form.name=Name -security.login.form.name.message=Enter your name -security.login.form.password=Password -security.login.form.password.message=Enter your password -security.login.unsuccessful=Your login attempt was not successful, try again. Reason: -security.logout=Logout \ No newline at end of file +security_login_title=Spring Security Login +security_login_message=You have tried to access a protected area of this application. By default you can login as "admin", with a password of "admin". +security_login_form_name=Name +security_login_form_name_message=Enter your name +security_login_form_password=Password +security_login_form_password_message=Enter your password +security_login_unsuccessful=Your login attempt was not successful, try again. Reason: +security_logout=Logout \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/i18n/messages_de.properties b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/i18n/messages_de.properties deleted file mode 100644 index ca8582d5e0..0000000000 --- a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/i18n/messages_de.properties +++ /dev/null @@ -1,96 +0,0 @@ -#menu -global.menu.new={0} erstellen -global.menu.list=Alle {0} finden -global.menu.find=Suchen: {0} -global.language.switch=Sprache nach {0} ändern -global.language=Sprache -global.sponsored=Gesponsert von SpringSource -global.theme=Thema -global.theme.alt=alt -global.theme.standard=standard - -#welcome page -welcome.titlepane=Willkommen zu {0} -welcome.h3=Willkommen zu {0} -welcome.text=Spring Roo bietet ein interaktives, leichtgewichtiges und vom Anwender anpassbares Tool, welches die schnelle Erstellung von performanten Enterprise Java Applikationen ermöglicht. - -#entity labels -entity.list.all=Liste alle {0} -entity.show=Zeige {0} -entity.create={0} erstellen -entity.update={0} aktualisieren -entity.delete={0} löschen -entity.find=Finde {0} -entity.not.found={0} konnte nicht gefunden werden. -entity.not.found.single={0} konnte nicht gefunden werden mit dieser ID. - -#button labels -button.home=Home -button.save=Speichern -button.update=Aktualisieren -button.find=Finde -button.cancel=Abbrechen -button.proceed=Fortfahren -button.submit=Absenden -button.reset=Zurücksetzen -button.end=Ende -button.showmessage=Meldung Anzeigen -button.showstacktrace=Stack Trace Anzeigen -button.showcookie=Cookie Anzeigen - -#field labels -field.simple.validation=Bitte {0} eingeben {1} -field.invalid.email=E-Mail Adresse muss korrekt sein -field.invalid.number=Nummern mit \\'-\\' oder \\'.\\' erlaubt -field.invalid.integer=Nur Integer-Zahlen erlaubt -field.required=Pflichtfeld - -#list labels -list.first=Erste Seite -list.next=Nächste Seite -list.previous=Vorhergehende Seite -list.last=Letzte Seite -list.page=Seite {0} von {1} -list.size=Ergebnisse pro Seite: - -#webflow -webflow.menu.enter= {0} WebFlow starten - -#selenium -selenium.menu.test.suite=Testfälle - -#exception -exception.message=Exception Meldung -exception.stacktrace=Exception Stack Trace -exception.details=Details - -#dataAccessFailure.jspx -error.dataaccessfailure.title=Datenzugriff fehlgeschlagen -error.dataaccessfailure.problemdescription=Ein Problem ist aufgetreten während des Datenzugriffs. - -#resourceNotFound.jspx -error.resourcenotfound.title=Angeforderte Ressource nicht gefunden -error.resourcenotfound.problemdescription=Die angeforderte Ressource konnte leider nicht gefunden werden. - -#uncaughtException.jspx -error.uncaughtexception.title=Interner Fehler -error.uncaughtexception.problemdescription=Leider ist ein interner Fehler aufgetreten. - -#webflow -webflow.menu.enter=WebFlow {0} starten -webflow.state1.title=Spring WebFlow - Seite (View State) Eins -webflow.state1.message=Dies ist ein einfaches Beispiel um Spring Webflow zu demonstrieren. Die Buttons unten führen Sie zum nächsten Schritt (Fortfahren) oder zum Ende (Ende). -webflow.state2.title=Spring WebFlow - Seite (View State) Zwei -webflow.state2.message=Dies ist ein einfaches Beispiel um Spring Webflow zu demonstrieren. Der Button unten führt Sie zum Ende (Ende) des Flows. -webflow.endstate.title=Spring WebFlow - Letzte Seite (End State) -webflow.endstate.message=Sie haben das Ende des Flows erreicht. - -#security -security.login.title=Spring Security Login -security.login.message=Sie haben versucht eine gesicherte Seite aufzurufen. Standardmäßig können Sie als "admin", mit "admin" als Passwort einloggen. -security.login.form.name=Name -security.login.form.name.message=Geben Sie Ihren Namen ein -security.login.form.password=Passwort -security.login.form.password.message=Geben Sie Ihr Passwort ein -security.login.unsuccessful=Ihre Anmeldung war nicht erfolgreich, bitte versuchen Sie es noch einmal. Grund: -security.logout=Ausloggen \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/i18n/messages_es.properties b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/i18n/messages_es.properties deleted file mode 100644 index 9ad5facb3c..0000000000 --- a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/i18n/messages_es.properties +++ /dev/null @@ -1,95 +0,0 @@ -#menu -global.menu.new=Crear nuevo {0} -global.menu.list=Listar {0} -global.menu.find=Buscar por {0} -global.language.switch=Cambiar idioma a {0} -global.language=Idioma -global.sponsored=Sponsored by SpringSource -global.theme=Tema -global.theme.alt=alt -global.theme.standard=estandarte - -#welcome page -welcome.titlepane=Bienvenido a {0} -welcome.h3=Bienvenido a {0} -welcome.text=Spring Roo proporciona herramientas interactivas, ligeras y adaptables al usuario que permiten la rápida entrega de aplicaciones empresariales Java de alto rendimiento. - -#entity labels -entity.list.all=Listar {0} -entity.show=Mostrar {0} -entity.create=Crear nuevo {0} -entity.update=Actualizar {0} -entity.delete=Borrar {0} -entity.find={0} -entity.not.found=No se han encontrado {0}. -entity.not.found.single=No se han encontrado {0} con este id. - -#button labels -button.home=Inicio -button.save=Guardar -button.update=Actualizar -button.find=Buscar -button.cancel=Cancelar -button.proceed=Proceder -button.submit=Enviar -button.reset=Reiniciar -button.end=Fin -button.showmessage=Mostrar Mensaje -button.showstacktrace=Mostar Stack Trace -button.showcookie=Mostrar Cookie - -#field labels -field.simple.validation=Introduzca {0} {1} -field.invalid.email=Por favor, introduzca un email válido -field.invalid.number=Números con \\'-\\' o \\'.\\' permitidos -field.invalid.integer=Sólo números enteros -field.invalid=Por favor, introduzca un {0} válido -field.required=requerido - -#list labels -list.first=Primera Página -list.next=Página Siguiente -list.previous=Página Anterior -list.last=Última página -list.page=Página {0} de {1} -list.size=Resultados por página: - -#selenium -selenium.menu.test.suite=Batería de pruebas - -#exception -exception.message=Mensaje de la Excepción -exception.stacktrace=Stack Trace de la Excepción -exception.cookie=Cookies -exception.details=Detalles - -#dataAccessFailure.jspx -error.dataaccessfailure.title=Error de acceso a datos -error.dataaccessfailure.problemdescription=Lo sentimos, ha ocurrido un problema al acceder a la base de datos. - -#resourceNotFound.jspx -error.resourcenotfound.title=Recurso Solicitado No Encontrado -error.resourcenotfound.problemdescription=Lo sentimos, no hemos encontrado el recurso que buscaba. - -#uncaughtException.jspx -error.uncaughtexception.title=Error Interno -error.uncaughtexception.problemdescription=Lo sentimos, ha ocurrido un error interno. - -#webflow -webflow.menu.enter=Empezar WebFlow {0} -webflow.state1.title=Spring WebFlow - View State Uno -webflow.state1.message=Este es un simple ejemplo para empezar con Spring Web Flow. Los botones de abajo llevan al siguiente estado (Proceder) o a al estado final. -webflow.state2.title=Spring WebFlow - View State Dos -webflow.state2.message=Este es un simple ejemplo para empezar con Spring Web Flow. El botón de abajo lleva al fin del flujo (end state). -webflow.endstate.title=Spring WebFlow - Estado final (End State) -webflow.endstate.message=Ha llegado al final del flujo. - -#security -security.login.title=Spring Security Login -security.login.message=Ha intentado acceder a una área protegida de esta aplicación. Por defecto, puede iniciar sesión con "admin" y contraseña "admin". -security.login.form.name=Nombre -security.login.form.name.message=Introduzca su nombre -security.login.form.password=Contraseña -security.login.form.password.message=Introduzca su constraseña -security.login.unsuccessful=Su intento de inicio de sesión no ha tenido éxito, inténtelo de nuevo. Razón: -security.logout=Cerrar sesión \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/i18n/messages_it.properties b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/i18n/messages_it.properties deleted file mode 100644 index d02d80852b..0000000000 --- a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/i18n/messages_it.properties +++ /dev/null @@ -1,95 +0,0 @@ -#menu -global.menu.new=Crea nuovo {0} -global.menu.list=Elenca tutti {0} -global.menu.find=Trova per {0} -global.language.switch=Cambia linguaggio in {0} -global.language=Lingua -global.sponsored=Sponsorizzato da SpringSource -global.theme=Tema -global.theme.alt=alt -global.theme.standard=standard - -#welcome page -welcome.titlepane=Benvenuto in {0} -welcome.h3=Benvenuto in {0} -welcome.text=Spring Roo fornisce un tool interattivo, leggero e personalizzabile dall'utente, che abilita lo sviluppo rapido di applicazioni Java enterprise ad alte prestazioni. - -#entity labels -entity.list.all=Elenca tutti {0} -entity.show=Mostra {0} -entity.create=Crea nuovo {0} -entity.update=Aggiorna {0} -entity.delete=Elimina {0} -entity.find={0} -entity.not.found=Nessun {0} trovato. -entity.not.found.single=Nessun {0} trovato con questo id. - -#button labels -button.home=Home -button.save=Salva -button.update=Aggiorna -button.find=Trova -button.cancel=Cancella -button.proceed=Procedi -button.submit=Invia -button.reset=Azzera -button.end=Fine -button.showmessage=Mostra Messaggio -button.showstacktrace=Mostra Stack Trace -button.showcookie=Mostra Cookie - -#field labels -field.simple.validation=Inserisci {0} {1} -field.invalid.email=Si prega di inserire un indirizzo email valido -field.invalid.number=Numero con \\'-\\' o \\'.\\' ammesso -field.invalid.integer=Solo numeri interi -field.invalid=Si prega di inserire dei validi {0} -field.required=richiesto - -#list labels -list.first=Prima pagina -list.next=Prossima Pagina -list.previous=Pagina Precedente -list.last=Ultima Pagina -list.page=Pagina {0} di {1} -list.size=Elenco risultati per pagina: - -#selenium -selenium.menu.test.suite=Test Suite - -#exception -exception.message=Messaggio Eccezione -exception.stacktrace=Stack Trace Eccezione -exception.cookie=Cookies -exception.details=Dettagli - -#dataAccessFailure.jspx -error.dataaccessfailure.title=Fallito l'accesso ai dati -error.dataaccessfailure.problemdescription=Spiacente, si è verificato un problema durante l'accesso al database. - -#resourceNotFound.jspx -error.resourcenotfound.title=Risorsa richiesta non trovata -error.resourcenotfound.problemdescription=Spiacente, non troviamo la risorsa che stai cercando. - -#uncaughtException.jspx -error.uncaughtexception.title=Errore Interno -error.uncaughtexception.problemdescription=Spiacente, abbiamo incontrato un errore interno. - -#webflow -webflow.menu.enter=Inserire {0} WebFlow -webflow.state1.title=Spring WebFlow - Stato View Uno -webflow.state1.message=Questo è un semplice esempio con Spring Web Flow. I pulsanti sotto conducono ad un altro view state (Procedi) o ad uno stato finale. -webflow.state2.title=Spring WebFlow - Stato View Due -webflow.state2.message=Questo è un semplice esempio per iniziare con Spring Web Flow. I pulsanti sotto conducono ad un altro stato view (Procedi) o ad uno stato finale. -webflow.endstate.title=Spring WebFlow - Stato finale -webflow.endstate.message=Hai raggiunto la fine di questo flusso. - -#security -security.login.title=Spring Security Login -security.login.message=Hai provato ad accedere ad un area protetta di questa applicazione. Di default puoi fare il login come "admin", con password "admin". -security.login.form.name=Nome -security.login.form.name.message=Inserisci il tuo nome -security.login.form.password=Password -security.login.form.password.message=Inserisci la password -security.login.unsuccessful=Il tentativo di login non ha avuto successo, prova ancora. Motivo: -security.logout=Logout diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/i18n/messages_nl.properties b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/i18n/messages_nl.properties deleted file mode 100644 index 836a96c3a4..0000000000 --- a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/i18n/messages_nl.properties +++ /dev/null @@ -1,96 +0,0 @@ -#menu -global.menu.new={0} maken -global.menu.list=Toon alle {0} -global.menu.find=Vind op {0} -global.language.switch=Wissel taal naar: {0} -global.language=Taal -global.sponsored=Gesponsord door SpringSource -global.theme=Thema -global.theme.alt=alt -global.theme.standard=standaard - -#welcome page -welcome.titlepane=Welkom bij {0} -welcome.h3=Welkom bij {0} -welcome.text=Spring Roo levert interactieve, lichtgewicht en door de gebruiker aanpasbare tools waarmee snel hoogwaardige Enterprise Java applicaties gemaakt kunnen worden. - -#entity labels -entity.list.all=Toon alle {0} -entity.show=Toon {0} -entity.create={0} maken -entity.update=Bewerk {0} -entity.delete=Verwijder {0} -entity.find=Zoek {0} -entity.not.found=Geen {0} gevonden. -entity.not.found.single=Geen {0} gevonden met dit id. - -#button labels -button.home=Home -button.save=Sla op -button.update=Bewerk -button.find=Zoek -button.cancel=Annuleer -button.proceed=Ga door -button.submit=Verstuur -button.reset=Herstel -button.end=Einde -button.showmessage=Toon bericht -button.showstacktrace=Toon stack trace -button.showcookie=Toon cookie - -#field labels -field.simple.validation=Voer {0} {1} in -field.invalid.email=Voer een geldig email adres in -field.invalid.number=Getal met \\'-\\' or \\',\\' toegestaan -field.invalid.integer=Alleen gehele getallen -field.invalid=Voer een geldige {0} in -field.required=verplicht - -#list labels -list.first=Eerste pagina -list.next=Volgende pagina -list.previous=Vorige pagina -list.last=Laatste pagina -list.page=Pagina {0} van {1} -list.size=Resultaten per pagina: - -#selenium -selenium.menu.test.suite=Test Suite - -#exception -#intentionally left the two exception entries below in English as Dutch translations of technical terms are confusing to Dutch developers -exception.message=Exception Message -exception.stacktrace=Exception Stack Trace -exception.cookie=Cookies -exception.details=Details - -#dataAccessFailure.jspx -error.dataaccessfailure.title=Data toegang gefaald -error.dataaccessfailure.problemdescription=Sorry, er heeft zich een probleem voorgedaan bij het benaderen van de database. - -#resourceNotFound.jspx -error.resourcenotfound.title=Gevraagde bron is niet gevonden -error.resourcenotfound.problemdescription=Sorry, de gevraagde bron is niet gevonden - -#uncaughtException.jspx -error.uncaughtexception.title=Interne fout -error.uncaughtexception.problemdescription=Sorry, het systeem heeft een intern probleem aangetroffen - -#webflow -webflow.menu.enter=Ga webflow {0} in -webflow.state1.title=Spring WebFlow - Bekijk eerste status -webflow.state1.message=Dit is een simpel voorbeeld van hoe met Spring Web Flow te beginnen. De knoppen hieronder leiden je naar een andere view state (Proceed), of naar een eind state. -webflow.state2.title=Spring WebFlow - Bekijk tweede status -webflow.state2.message=Dit is een simpel voorbeeld van hoe met Spring Web Flow te beginnen. De knoppen hieronder leiden je naar een andere view state (Proceed), of naar een eind state. -webflow.endstate.title=Spring WebFlow - status einde -webflow.endstate.message=U heeft het einde van deze flow bereikt. - -#security -security.login.title=Spring Security Login -security.login.message=U hebt geprobeerd een beveiligd gedeelte van de applicatie te benaderen. De standaard login is "admin", met wachtwoord "admin". -security.login.form.name=Naam -security.login.form.name.message=Voer uw naam in -security.login.form.password=Wachtwoord -security.login.form.password.message=Voer uw wachtwoord in -security.login.unsuccessful=Uw login poging was niet succesvoal, probeer het nogmaals. Reden: -security.logout=Afmelden \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/i18n/messages_sv.properties b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/i18n/messages_sv.properties deleted file mode 100644 index 92d50da86d..0000000000 --- a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/i18n/messages_sv.properties +++ /dev/null @@ -1,96 +0,0 @@ -#menu -global.menu.new=Skapa ny {0} -global.menu.list=Visa alla {0} -global.menu.find=Sök på {0} -global.language.switch=Byt språk till {0} -global.language=Språk -global.sponsored=Sponsrad av SpringSource -global.theme=Tema -global.theme.alt=alt -global.theme.standard=standard - -#welcome page -welcome.titlepane=Välkommen till {0} -welcome.h3=Välkommen till {0} -welcome.text=Spring Roo ger interaktiva, lättviktiga verktyg som kan anpassas av användaren och möjliggör snabb leverans av högpresterande enterprise Java applikationer. - -#entity labels -entity.list.all=Visa alla {0} -entity.show=Visa {0} -entity.create=Skapa ny {0} -entity.update=Uppdatera {0} -entity.delete=Ta bort {0} -entity.find=Sök på {0} -entity.not.found=Ingen {0} hittades. -entity.not.found.single=Ingen {0} hittades med detta id. - -#button labels -button.home=Hem -button.save=Spara -button.update=Uppdatera -button.find=Hitta -button.cancel=Avbryt -button.proceed=Fortsätt -button.submit=Skicka -button.reset=Börja om -button.end=Sista -button.showmessage=Visa meddelande -button.showstacktrace=Visa Stack Trace -button.showcookie=Visa Cookie - -#field labels -field.simple.validation=Ange {0} {1} -field.invalid.email=Var vänlig använd en giltig emailadress -field.invalid.number=Siffra med \\'-\\' eller \\'.\\' tillåten -field.invalid.integer=Endast heltal -field.invalid=Var vänlig anväd en giltig {0} -field.required=obligatoriskt - -#list labels -list.first=Första sidan -list.next=Nästa sida -list.previous=Förra sidan -list.last=Sista sidan -list.page=Sida {0} av {1} -list.size=Visa antal resultat per sida: - -#selenium -selenium.menu.test.suite=Test Svit - -#exception -exception.message=Undantagsmeddelande -exception.stacktrace=Undantag Stack Trace -exception.cookie=Cookies -exception.details=Detaljer - -#dataAccessFailure.jspx -error.dataaccessfailure.title=Fel vid dataläsning -error.dataaccessfailure.problemdescription=Beklagar, ett problem uppstod vid läsning av databasen. - -#resourceNotFound.jspx -error.resourcenotfound.title=Efterfrågad tillgång hittades inte -error.resourcenotfound.problemdescription=Beklagar, vi kunde inte hitta tillgången du efterfrågade. - -#uncaughtException.jspx -error.uncaughtexception.title=Internt fel -error.uncaughtexception.problemdescription=Beklagar, ett internt fel inträffade. - -#webflow -webflow.menu.enter=Börja {0} WebFlow -webflow.state1.title=Spring WebFlow - See tillstånd ett -webflow.state1.message=Det här är ett enkelt exempel på hur du kommer igång med Spring Web Flow. Knapparna nedan leder dig till ett annat tillstånd (Fortsätt) eller till sluttillståndet. -webflow.state2.title=Spring WebFlow - See tillstånd två -webflow.state2.message=Det här är ett enkelt exempel på hur du kommer igång med Spring Web Flow. Knapparna nedan leder dig till ett annat tillstånd (Fortsätt) eller till sluttillståndet. -webflow.endstate.title=Spring WebFlow - Sluttillståndet -webflow.endstate.message=Du har nu kommit till slutet på detta flöde - -#security -security.login.title=Spring Security Login -security.login.message=Du har försökt komma in på en skyddad del av den här applikationen. Som standard kan du logga in som "admin", med lösenord "admin". - -security.login.form.name=Namn -security.login.form.name.message=Ange ditt namn -security.login.form.password=Lösenord -security.login.form.password.message=Ange ditt lösenord -security.login.unsuccessful=Ditt försök att logga in misslyckades, försök igen. Anledning: -security.logout=Logga ut \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/layouts/default.jspx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/layouts/default.jspx index 4a8fb09695..d68496e5f1 100644 --- a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/layouts/default.jspx +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/layouts/default.jspx @@ -1,71 +1,27 @@ - + + + - - - - - - - - - - - - - - - - - - <spring:message code="welcome.h3" arguments="${app_name}" /> + + + + + + <spring:message code="welcome_h3" arguments="${app_name}" /> - + +
+ -
- - -
+
+ + +
diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/layouts/layouts.xml b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/layouts/layouts.xml index 322c65a63f..3c9d6d4bb6 100644 --- a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/layouts/layouts.xml +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/layouts/layouts.xml @@ -4,11 +4,16 @@ "http://tiles.apache.org/dtds/tiles-config_2_1.dtd"> - - - - - - - + + + + + + + + + + + + diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/spring/webmvc-config.xml b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/spring/webmvc-config.xml index 1767a0dbc9..63a06953a2 100644 --- a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/spring/webmvc-config.xml +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/spring/webmvc-config.xml @@ -2,7 +2,7 @@ - + @@ -10,6 +10,15 @@ Also registers default Formatters and Validators for use across all @Controllers --> + + + + + + + + + @@ -17,28 +26,11 @@ - + - - - - - - - - - - /WEB-INF/layouts/layouts.xml - - /WEB-INF/views/**/views.xml - - - - @@ -69,4 +61,16 @@ + + + + + + + /WEB-INF/layouts/layouts.xml + + /WEB-INF/views/**/views.xml + + + diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/create.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/create.tagx new file mode 100644 index 0000000000..37e006781d --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/create.tagx @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/dependency.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/dependency.tagx new file mode 100644 index 0000000000..86011b91a0 --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/dependency.tagx @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + +

+ +

+ + + + \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/checkbox.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/checkbox.tagx new file mode 100644 index 0000000000..3e7c0604e7 --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/checkbox.tagx @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + ${field} + + +
+ + + + + + + + + + +
+
+ + \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/column.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/column.tagx new file mode 100644 index 0000000000..11e9c56c48 --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/column.tagx @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/datetime.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/datetime.tagx new file mode 100644 index 0000000000..ec4adbf684 --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/datetime.tagx @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${field} + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + +
+
+ + \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/display.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/display.tagx new file mode 100644 index 0000000000..4e4f86e43e --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/display.tagx @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + +
+
+
+ + \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/editor.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/editor.tagx new file mode 100644 index 0000000000..959a5fb413 --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/editor.tagx @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${field} + + + +
+ + +
+ + +
+
+ + \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/input.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/input.tagx new file mode 100644 index 0000000000..8c24630bc1 --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/input.tagx @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${field} + + +
+ + + + + + + +
+ + + + + + + + + + + + + + +
+
+ + \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/reference.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/reference.tagx new file mode 100644 index 0000000000..89695122a6 --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/reference.tagx @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + +
+ + + + + + + + ${fn:escapeXml(add_message)} + + + + + ( + + ) + +
+
+ + + \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/select.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/select.tagx new file mode 100644 index 0000000000..09122bb0df --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/select.tagx @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${field} + + +
+ + + + + + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + + + + + + + + + +
+
+ + + \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/simple.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/simple.tagx new file mode 100644 index 0000000000..390afa45f6 --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/simple.tagx @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + +
+
+ + \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/table.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/table.tagx new file mode 100644 index 0000000000..364e94afeb --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/table.tagx @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + ${fn:escapeXml(show_label)} + + + + + + + + + ${fn:escapeXml(update_label)} + + + + + + + + + + + + + + +
+ + + + + + + + + ${fn:escapeXml(add_message)} + + + + + + + +
+ + + + \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/textarea.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/textarea.tagx new file mode 100644 index 0000000000..f8f05b67db --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/fields/textarea.tagx @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${field} + + + +
+ + +
+ + +
+
+ + + \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/find.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/find.tagx new file mode 100644 index 0000000000..8644d776c7 --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/find.tagx @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/list.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/list.tagx new file mode 100644 index 0000000000..3202f2bc92 --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/list.tagx @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/show.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/show.tagx new file mode 100644 index 0000000000..7782c058e6 --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/show.tagx @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + ${fn:escapeXml(update_label)} + + + + + + + + + + + + ${fn:escapeXml(create_label)} + + + + + + + + + ${fn:escapeXml(list_label)} + + + +
+ + + + + + + + \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/update.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/update.tagx new file mode 100644 index 0000000000..1dfdf45ebd --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/form/update.tagx @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + + \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/language.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/language.tagx deleted file mode 100644 index cfe0a660b8..0000000000 --- a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/language.tagx +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - ${lang_en} - - - - - - - - - - - - - - ${lang_de} - - - - - - - - - - - - - - ${lang_sv} - - - - - - - - - - - - - - ${lang_es} - - - - - - - - - - - - - - ${lang_it} - - - - - - - - - - - - - - ${lang_nl} - - - - diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/menu/category.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/menu/category.tagx new file mode 100644 index 0000000000..f6383f5134 --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/menu/category.tagx @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + +
  • +

    + +

    +
      + +
    +
    • + +     +     \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/menu/item.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/menu/item.tagx new file mode 100644 index 0000000000..b0c466e65c --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/menu/item.tagx @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + +
  • + + + + +
    • + +     +     \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/menu/menu.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/menu/menu.tagx new file mode 100644 index 0000000000..9c3f2e7c89 --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/menu/menu.tagx @@ -0,0 +1,13 @@ + + + + + + + + +
      + +
    +     +     \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/pagination.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/pagination.tagx deleted file mode 100644 index d5c848a373..0000000000 --- a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/pagination.tagx +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${i} - - - - - - - - - - - - - - - ${first_label} - - - - - - - - - - - ${previous_label} - - - - - - - - - - - - - - ${next_label} - - - - - - - - - - - ${last_label} - - - \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/theme.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/theme.tagx deleted file mode 100644 index d97bbef9d5..0000000000 --- a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/theme.tagx +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - ${theme_standard} - - - - - - - - - - - - ${theme_alt} - - \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/util/language.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/util/language.tagx new file mode 100644 index 0000000000..aa1cd5adbc --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/util/language.tagx @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + ${fn:escapeXml(lang_label)} + + + + diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/util/load-scripts.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/util/load-scripts.tagx new file mode 100644 index 0000000000..a89a63292a --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/util/load-scripts.tagx @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/util/pagination.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/util/pagination.tagx new file mode 100644 index 0000000000..b4d394ce00 --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/util/pagination.tagx @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${i} + + + + + + + + + + + + + + + ${first_label} + + + + + + + + + + + ${previous_label} + + + + + + + + + + + + + + ${next_label} + + + + + + + + + + + ${last_label} + + + + \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/util/panel.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/util/panel.tagx new file mode 100644 index 0000000000..e8a43fc69e --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/util/panel.tagx @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + ${id} + + + + ${openPane} + + + + ${title} + + + +
    + + +
    +     +     diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/util/placeholder.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/util/placeholder.tagx new file mode 100644 index 0000000000..65ee2e4b76 --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/util/placeholder.tagx @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/util/theme.tagx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/util/theme.tagx new file mode 100644 index 0000000000..fe0c628aa7 --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/tags/util/theme.tagx @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + ${theme_standard} + + + + + + + + + + + + ${theme_alt} + + + \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/urlrewrite.xml b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/urlrewrite.xml deleted file mode 100644 index 314c4acd18..0000000000 --- a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/urlrewrite.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - /resources/** - /resources/$1 - - - /static/WEB-INF/** - 403 - /static/WEB-INF/$1 - - - /static/** - /$1 - - - / - /app/index - - - /app/** - /app/$1 - - - /** - /app/$1 - - - /app/** - /$1 - - diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/controller-index.jspx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/controller-index.jspx deleted file mode 100644 index 76e3f3cabf..0000000000 --- a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/controller-index.jspx +++ /dev/null @@ -1,10 +0,0 @@ -
    - - -
    - - - -

    Controller Index Page

    -
    -
    \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/dataAccessFailure.jspx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/dataAccessFailure.jspx index 3fd4aeb625..e815684ea9 100644 --- a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/dataAccessFailure.jspx +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/dataAccessFailure.jspx @@ -1,30 +1,29 @@ -
    - - -
    - - -

    ${title}

    -

    - -

    -

    - - -
    - - -
    - - -
    - - -
    -     -
    -

    -     -
    +
    + + + +

    ${fn:escapeXml(title)}

    +

    + +

    + +

    +

    + +

    + + + + + + + + +
    +     +     +

    +     +
    diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/footer.jspx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/footer.jspx new file mode 100644 index 0000000000..89af49c71a --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/footer.jspx @@ -0,0 +1,36 @@ + + diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/header.jspx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/header.jspx new file mode 100644 index 0000000000..fea8152070 --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/header.jspx @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/index-template.jspx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/index-template.jspx new file mode 100644 index 0000000000..871bc55ca4 --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/index-template.jspx @@ -0,0 +1,10 @@ +
    + + + + +

    + +

    +     +
    \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/index.jspx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/index.jspx index ee8e0a1c98..75ce000a4d 100644 --- a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/index.jspx +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/index.jspx @@ -1,11 +1,13 @@ -
    - - -
    - - - -

    -

    -
    +
    + + + + +

    + +

    +

    + +

    +
    \ No newline at end of file diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loanshark/create.jspx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loanshark/create.jspx deleted file mode 100644 index 3fa6350f09..0000000000 --- a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loanshark/create.jspx +++ /dev/null @@ -1,51 +0,0 @@ -
    - - -
    - - - - - - -
    - - -
    - - - - - -
    -
    -
    - - -
    - - - - - -
    -
    -
    - - -
    - - - - - -
    -
    -
    - - - -
    -     -
    -
    diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loanshark/findLoanSharksByName.jspx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loanshark/findLoanSharksByName.jspx deleted file mode 100644 index 85c6a9c309..0000000000 --- a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loanshark/findLoanSharksByName.jspx +++ /dev/null @@ -1,25 +0,0 @@ -
    - - -
    - - - - - -
    - - - - - -
    -
    -
    - - - -
    -     -
    -
    diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loanshark/list.jspx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loanshark/list.jspx deleted file mode 100644 index 980f74eb71..0000000000 --- a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loanshark/list.jspx +++ /dev/null @@ -1,87 +0,0 @@ -
    - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    IdNameCounterAverage Rate - - -
    ${loanShark.id} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - ${add_message} - - - - - -
    -     - - - -
    -
    diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loanshark/show.jspx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loanshark/show.jspx deleted file mode 100644 index 8720448a8b..0000000000 --- a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loanshark/show.jspx +++ /dev/null @@ -1,35 +0,0 @@ -
    - - -
    - - - - -
    - -
    - -
    -
    -
    -
    - -
    - -
    -
    -
    -
    - -
    - -
    -
    -
    -     - - - -
    -
    diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loanshark/update.jspx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loanshark/update.jspx deleted file mode 100644 index 95e0e82b8c..0000000000 --- a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loanshark/update.jspx +++ /dev/null @@ -1,53 +0,0 @@ -
    - - -
    - - - - - - -
    - - -
    - - - - - -
    -
    -
    - - -
    - - - - - -
    -
    -
    - - -
    - - - - - -
    -
    -
    - - - -
    - - -     -
    -
    diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loansharks/create.jspx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loansharks/create.jspx new file mode 100644 index 0000000000..6b4e04cdb9 --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loansharks/create.jspx @@ -0,0 +1,10 @@ + +
    + + + + + + + +
    diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loansharks/findLoanSharksByName.jspx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loansharks/findLoanSharksByName.jspx new file mode 100644 index 0000000000..acd81fb868 --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loansharks/findLoanSharksByName.jspx @@ -0,0 +1,7 @@ + +
    + + + + +
    diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loansharks/list.jspx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loansharks/list.jspx new file mode 100644 index 0000000000..c79443eae9 --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loansharks/list.jspx @@ -0,0 +1,11 @@ + +
    + + + + + + + + +
    diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loansharks/show.jspx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loansharks/show.jspx new file mode 100644 index 0000000000..cbd4f019a5 --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loansharks/show.jspx @@ -0,0 +1,9 @@ + +
    + + + + + + +
    diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loansharks/update.jspx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loansharks/update.jspx new file mode 100644 index 0000000000..f85da6e800 --- /dev/null +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loansharks/update.jspx @@ -0,0 +1,9 @@ + +
    + + + + + + +
    diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loanshark/views.xml b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loansharks/views.xml similarity index 61% rename from spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loanshark/views.xml rename to spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loansharks/views.xml index eda77f5acc..be6b3d6165 100644 --- a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loanshark/views.xml +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/loansharks/views.xml @@ -1,19 +1,19 @@ - - + + - - + + - - + + - - + + - - + + diff --git a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/menu.jspx b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/menu.jspx index 3701577494..40a8fc0cc4 100644 --- a/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/menu.jspx +++ b/spring-integration-samples/loanshark/src/main/webapp/WEB-INF/views/menu.jspx @@ -1,34 +1,12 @@ -