diff --git a/README.md b/README.md index a3d7eb7..d02aa9e 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,8 @@ -# Spring MVC and Hibernate template application +# Groovy, Spring MVC and Hibernate sample application -This is a template for a web application that uses Spring MVC and Hibernate. The sample code is a simple CRUD page that manipulates records for a single model object. +This is a sample web application that uses Groovy, Spring MVC, Sitemesh and Hibernate. +The sample code is a simple CRUD page that manipulates records for a single model object. ## Running the application locally -First build with: - - $mvn clean install - -Then run it with: - - $java -jar target/dependency/webapp-runner.jar target/*.war - + $mvn jetty:run diff --git a/pom.xml b/pom.xml index bd65396..fc92f90 100755 --- a/pom.xml +++ b/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - com.example - spring-hibernate-template + com.github.kdabir + groovy-springmvc-sample war 0.0.1-SNAPSHOT @@ -18,6 +18,12 @@ 3.0.1 provided + + + org.codehaus.groovy + groovy-all + 2.0.5 + org.springframework spring-webmvc @@ -28,6 +34,11 @@ spring-orm ${org.springframework.version} + + org.springframework + spring-jdbc + ${org.springframework.version} + taglibs standard @@ -64,6 +75,12 @@ 7.0.27.1 provided + + + org.sitemesh + sitemesh + 3.0-alpha-1 + @@ -73,12 +90,32 @@ 1.6 1.6 + groovy-eclipse-compiler + + + org.codehaus.groovy + groovy-eclipse-compiler + 2.7.0-01 + + maven-war-plugin 2.2 + + + org.mortbay.jetty + jetty-maven-plugin + 8.1.7.v20120910 + + 3 + groovy-rocks + 8123 + + + org.apache.maven.plugins maven-dependency-plugin diff --git a/src/main/java/com/example/controller/PersonController.groovy b/src/main/java/com/example/controller/PersonController.groovy new file mode 100755 index 0000000..1dba414 --- /dev/null +++ b/src/main/java/com/example/controller/PersonController.groovy @@ -0,0 +1,106 @@ +package com.example.controller; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +import com.example.model.Person; +import com.example.service.PersonService +import org.springframework.web.bind.annotation.ResponseBody +import groovy.json.JsonBuilder +import groovy.xml.MarkupBuilder; + +@Controller +@RequestMapping("/people") +class PersonController { + + @Qualifier("personServiceImpl") + @Autowired + PersonService personService; + + @RequestMapping("/") + String listPeople(Map map) { + + map.person = new Person() + map.peopleList = personService.listPeople() + + "people" + } + + @RequestMapping(value = "/add", method = RequestMethod.POST) + String addPerson(@ModelAttribute("person") Person person, BindingResult result) { + + personService.addPerson(person) + + "redirect:/people/" + } + + @RequestMapping("/delete/{personId}") + String deletePerson(@PathVariable("personId") Integer personId) { + + personService.removePerson(personId) + + "redirect:/people/" + } + + @RequestMapping(value = "/status/json", method = RequestMethod.GET, produces="application/json") + @ResponseBody + public String getJson() { + def json = new JsonBuilder() + json.status { + date new Date() + peopleCount personService.listPeople().size() + } + json.toPrettyString() + } + + @RequestMapping(value = "/xml", method = RequestMethod.GET, produces="application/xml") + @ResponseBody + public String getXml() { + StringWriter writer = new StringWriter() + def xml = new MarkupBuilder(writer) + + xml.people { + personService.listPeople().each { Person p -> + person { + id p.id + firstName p.firstName + lastName p.lastName + } + } + } + writer.toString() + } + + @RequestMapping(value = "/firstNames", method = RequestMethod.GET) + @ResponseBody + public String getFirstNamesHtml() { + StringWriter writer = new StringWriter() + def out = new MarkupBuilder(writer) + + out.html { + head { + title "List of First Names" + } + body { + h1 "List of First Names" + + ul { + personService.listPeople().each { Person p -> + li { + h3 p.firstName + } + } + + } + } + } + writer.toString() + } + +} diff --git a/src/main/java/com/example/controller/PersonController.java b/src/main/java/com/example/controller/PersonController.java deleted file mode 100755 index 82ee420..0000000 --- a/src/main/java/com/example/controller/PersonController.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.example.controller; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; - -import com.example.model.Person; -import com.example.service.PersonService; - -import java.util.Map; - -@Controller -public class PersonController { - - @Autowired - private PersonService personService; - - @RequestMapping("/") - public String listPeople(Map map) { - - map.put("person", new Person()); - map.put("peopleList", personService.listPeople()); - - return "people"; - } - - @RequestMapping(value = "/add", method = RequestMethod.POST) - public String addPerson(@ModelAttribute("person") Person person, BindingResult result) { - - personService.addPerson(person); - - return "redirect:/people/"; - } - - @RequestMapping("/delete/{personId}") - public String deletePerson(@PathVariable("personId") Integer personId) { - - personService.removePerson(personId); - - return "redirect:/people/"; - } -} diff --git a/src/main/java/com/example/model/Person.groovy b/src/main/java/com/example/model/Person.groovy new file mode 100755 index 0000000..649bd07 --- /dev/null +++ b/src/main/java/com/example/model/Person.groovy @@ -0,0 +1,18 @@ +package com.example.model; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +@Entity +public class Person { + + @Id + @GeneratedValue + Integer id + + String firstName + + String lastName + +} diff --git a/src/main/java/com/example/model/Person.java b/src/main/java/com/example/model/Person.java deleted file mode 100755 index ce297eb..0000000 --- a/src/main/java/com/example/model/Person.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.example.model; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -@Entity -public class Person { - - @Id - @GeneratedValue - private Integer id; - - private String firstName; - - private String lastName; - - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getFirstName() { - return firstName; - } - - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public String getLastName() { - return lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } - -} diff --git a/src/main/java/com/example/service/PersonServiceGroovyJdbcImpl.groovy b/src/main/java/com/example/service/PersonServiceGroovyJdbcImpl.groovy new file mode 100644 index 0000000..f7cf7f2 --- /dev/null +++ b/src/main/java/com/example/service/PersonServiceGroovyJdbcImpl.groovy @@ -0,0 +1,38 @@ +package com.example.service; + + +import com.example.model.Person +import groovy.sql.Sql +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.stereotype.Service + +import javax.sql.DataSource + +@Service +public class PersonServiceGroovyJdbcImpl implements PersonService { + + @Autowired + DataSource dataSource; + + @Override + public void addPerson(Person person) { + new Sql(dataSource).execute('INSERT INTO PERSON(FIRSTNAME,LASTNAME) VALUES (?,?)', + [person.firstName, person.lastName]) + } + + @Override + public List listPeople() { + List people = [] + + new Sql(dataSource).eachRow("SELECT * FROM PERSON") { + people << new Person(id: it.id, firstName: it.firstName, lastName: it.lastName) + } + + return people; + } + + @Override + public void removePerson(Integer id) { + new Sql(dataSource).execute("DELETE FROM PERSON WHERE PERSON.ID=$id"); + } +} diff --git a/src/main/java/com/example/service/PersonServiceJdbcImpl.java b/src/main/java/com/example/service/PersonServiceJdbcImpl.java new file mode 100644 index 0000000..5f6e94f --- /dev/null +++ b/src/main/java/com/example/service/PersonServiceJdbcImpl.java @@ -0,0 +1,96 @@ +package com.example.service; + +import com.example.model.Person; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.sql.DataSource; +import java.sql.*; +import java.util.ArrayList; +import java.util.List; + +@Service +public class PersonServiceJdbcImpl implements PersonService { + + @Autowired + DataSource dataSource; + + @Override + public void addPerson(Person person) { + Connection connection = null; + + try { + connection = dataSource.getConnection(); + + PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO PERSON(FIRSTNAME,LASTNAME) VALUES (?,?)"); + preparedStatement.setString(1, person.getFirstName()); + preparedStatement.setString(2, person.getLastName()); + + preparedStatement.execute(); + + } catch (SQLException e) { + e.printStackTrace(); + } finally { + if (connection != null) { + try { + connection.close(); + } catch (SQLException e) {} + } + } + + } + + @Override + public List listPeople() { + Connection connection = null; + List people = new ArrayList(); + + try { + connection = dataSource.getConnection(); + Statement statement = connection.createStatement(); + + ResultSet resultSet = statement.executeQuery("SELECT * FROM PERSON"); + while (resultSet.next()) { + Person person = new Person(); + person.setId(resultSet.getInt("ID")); + person.setFirstName(resultSet.getString("FIRSTNAME")); + person.setLastName(resultSet.getString("LASTNAME")); + + people.add(person); + } + + } catch (SQLException e) { + e.printStackTrace(); + } finally { + if (connection != null) { + try { + connection.close(); + } catch (SQLException e) {} + } + } + + return people; + } + + @Override + public void removePerson(Integer id) { + Connection connection = null; + + try { + connection = dataSource.getConnection(); + PreparedStatement preparedStatement = connection.prepareStatement("DELETE FROM PERSON WHERE PERSON.ID=?"); + preparedStatement.setInt(1, id); + + preparedStatement.execute(); + } catch (SQLException e) { + e.printStackTrace(); + } finally { + if (connection != null) { + try { + connection.close(); + } catch (SQLException e) {} + } + } + + } +} diff --git a/src/main/java/com/example/service/PersonServiceSpringJdbcImpl.java b/src/main/java/com/example/service/PersonServiceSpringJdbcImpl.java new file mode 100644 index 0000000..c2f827e --- /dev/null +++ b/src/main/java/com/example/service/PersonServiceSpringJdbcImpl.java @@ -0,0 +1,49 @@ +package com.example.service; + +import com.example.model.Person; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.core.RowMapper; +import org.springframework.jdbc.core.support.JdbcDaoSupport; +import org.springframework.stereotype.Service; + +import javax.sql.DataSource; +import java.sql.*; +import java.util.ArrayList; +import java.util.List; + +@Service +public class PersonServiceSpringJdbcImpl extends JdbcDaoSupport implements PersonService { + + @Autowired + PersonServiceSpringJdbcImpl(DataSource dataSource) { + this.setDataSource(dataSource); + } + + @Override + public void addPerson(Person person) { + getJdbcTemplate().update( + "INSERT INTO PERSON (FIRSTNAME,LASTNAME) VALUES (?, ?)", + new Object[]{person.getFirstName(), person.getLastName()} + ); + } + + @Override + public List listPeople() { + return getJdbcTemplate().query( + "SELECT * FROM PERSON", + new RowMapper() { + public Person mapRow(ResultSet rs, int rowNum) throws SQLException { + Person person = new Person(); + person.setId(rs.getInt("ID")); + person.setFirstName(rs.getString("FIRSTNAME")); + person.setLastName(rs.getString("LASTNAME")); + return person; + } + }); + } + + @Override + public void removePerson(Integer id) { + getJdbcTemplate().update("DELETE FROM PERSON WHERE ID = ?", id); + } +} diff --git a/src/main/webapp/WEB-INF/jsp/people.jsp b/src/main/webapp/WEB-INF/jsp/people.jsp index fd05abf..975bb7d 100755 --- a/src/main/webapp/WEB-INF/jsp/people.jsp +++ b/src/main/webapp/WEB-INF/jsp/people.jsp @@ -1,76 +1,52 @@ -<%@taglib uri="http://www.springframework.org/tags" prefix="spring"%> -<%@taglib uri="http://www.springframework.org/tags/form" prefix="form"%> -<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<%@taglib uri="http://www.springframework.org/tags" prefix="spring" %> +<%@taglib uri="http://www.springframework.org/tags/form" prefix="form" %> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> - - Spring MVC and Hibernate Template - - - - - - - - - - - + Simple CRUD Page -
-
-
- Spring MVC and Hibernate Template - by heroku -
+
+

Simple CRUD Page

-
- -
-
-
-
-

Simple CRUD Page

-
- - - First Name - - Last Name - - - +
+ + First Name + + Last Name + + + +
- -

People

- - +
+ +

People

+
+ + + + + + + + - - + + - - - - - - - - - -
Name 
Name ${person.lastName}, ${person.firstName} +
+ +
+
${person.lastName}, ${person.firstName}
- -
+ + + +
-
- diff --git a/src/main/webapp/WEB-INF/layouts/bootstrap_layout.jsp b/src/main/webapp/WEB-INF/layouts/bootstrap_layout.jsp new file mode 100644 index 0000000..fd840ea --- /dev/null +++ b/src/main/webapp/WEB-INF/layouts/bootstrap_layout.jsp @@ -0,0 +1,70 @@ + + + + + + Groovy Spring MVC Hibernate Template - <sitemesh:write property='title'/> + + + + + + + + + + + + + + + + + + + + +
+
+
+ Groovy Spring Hibernate Template + Fork on GitHub +
+
+
+ +
+
+
+ +
+
+
+ + + + + diff --git a/src/main/webapp/WEB-INF/sitemesh3.xml b/src/main/webapp/WEB-INF/sitemesh3.xml new file mode 100644 index 0000000..49326a9 --- /dev/null +++ b/src/main/webapp/WEB-INF/sitemesh3.xml @@ -0,0 +1,3 @@ + + + diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 799bb7a..8f77137 100755 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -10,6 +10,15 @@ index.jsp + + sitemesh3 + org.sitemesh.config.ConfigurableSiteMeshFilter + + + sitemesh3 + /* + + spring @@ -23,6 +32,6 @@ spring - /people/* + / \ No newline at end of file diff --git a/src/main/webapp/favicon.ico b/src/main/webapp/favicon.ico new file mode 100644 index 0000000..2d6425a Binary files /dev/null and b/src/main/webapp/favicon.ico differ diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 1bd1576..89d7a0c 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -2,414 +2,31 @@ - - Spring MVC and Hibernate Template - - - - - - - - - - - - - + Welcome -
-
-
- Spring MVC and Hibernate Template - - by heroku - -
-
-
- -
-
-
-

Your app is ready!

- -
-

Get started with your Spring MVC and Hibernate Application

-
- -
- This is a template for a web application that uses Spring MVC and Hibernate. The sample code is a simple CRUD page - that manipulates records for a single model object. To try it out go to the people page. Then - use Eclipse or the Command Line to deploy some changes. -
- - - -
- - -
- - -
If you already created this app from the Heroku Eclipse Plugin, proceed to Step 3. - The following steps depends on the Heroku Eclipse plugin. If you do not have the Heroku Eclipse plugin installed and - configured, - follow a step-by-step guide - on Dev Center to install the plugin and - configure the plugin in Eclipse. -
- -

Step 1.Configure Heroku Eclipse preferences

-
    -
  1. Open EclipsePreferences
    2. -
  2. Select Heroku
    3. -
  3. Enter your Email and Password
    4. -
  4. Click Login. If your login was successful, your Heroku API key would be populated in the - API Key field.
    - - - - - setup api key - - - -
    5. -
  5. In the SSH Key section, click Generate if you need to generate a new key. - If you have previously generated and saved a SSH key is automatically loaded from the default location. If it is - not - in the default location, click Load SSH Key
    -
    6. -
  6. Click on Add to add your SSH Key to Heroku - - - - Add SSH Key to Heroku - - - -
    7. -
- -

Step 2. Importing this App

-
    -
  1. Open FileImport and expand the Heroku section - - - - Import App - - - - -
    2. -
  2. Select Existing Heroku ApplicationNext
    3. -
  3. Select - - and click Next - - - - Create app from template - - - -
    4. -
  4. Choose Auto detected project - - - - - Project Type selection - - - -
    5. -
  5. Click Finish to complete the import. The plugin will use eGit - and clone the source code repository to a local Git repository. - - - - Local Project and Git Repository - - - -
    6. -
- - -

Step 3. Makes some changes to the app

-
    -
  1. Open PersonServiceImpl.java
    2. -
  2. Query the people in alphabetical order by replacing line 29 with the following two lines: - 
    -Root<Person> from = c.from(Person.class);
-c.orderBy(em.getCriteriaBuilder().asc(from.get("lastName")));
-
    -
    3. -
- -

Step 4. Deploy to Heroku

-
    -
  1. Right-click the project root and choose Team Commit -
    2. -
  2. Enter a commit message and click Commit - - - - - Commit Changes - - - -
    3. -
  3. Right-click the project root and choose Team Push to - Upstream
    4. -
  4. Review the push results. At the bottom, a "... deployed to Heroku" message will appear. - - - - Push Results - - - -
    5. -
- -
-

Done!

- -

You've just cloned, modified, and deployed a brand new app.

- See your changes - -

Learn more at the - Heroku Dev Center

-
-
- - -
- - -

Step 1. Setup your environment

-
    -
  1. Install the Heroku Toolbelt.
    2. -
  2. Install Maven.
    3. -
- -

Step 2. Login to Heroku

- heroku login -
- Be sure to create, or associate an SSH key with your account. -
- 
-$ heroku login
-Enter your Heroku credentials.
-Email: naaman@heroku.com
-Password:
-Could not find an existing public key.
-Would you like to generate one? [Yn] Y
-Generating new SSH public key.
-Uploading SSH public key /Users/Administrator/.ssh/id_rsa.pub
-Authentication successful.
- -

Step 3. Clone the App

- git clone -o heroku git@heroku.com:.git - -

Step 4. Makes some changes to the app

-
    -
  1. Open src/main/java/com/example/PersonServiceImpl.java in your favorite editor
    2. -
  2. Query the people in alphabetical order by replacing line 29 with the following two lines: - 
    -Root<Person> from = c.from(Person.class);
-c.orderBy(em.getCriteriaBuilder().asc(from.get("lastName")));
-
    -
    3. -
- -

Step 5. Make sure the app still compiles

- mvn clean package - -

Step 6. Deploy your changes

-
    -
  1. git commit -am "New changes to deploy"
    2. -
  2. git push heroku master
    3. -
- -
-

Done!

- -

You've just cloned, modified, and deployed a brand new app.

- See your changes +
+

+ Get started with your Groovy Spring MVC and Hibernate Application +

+
-

Learn more at the - Heroku Dev Center

-
-
-
-
-
+
+ This is a demo web application that uses Spring MVC Sitemesh and Hibernate. The sample code is a simple CRUD page + that manipulates records for a single model object. To try it out go to the people page. +
- -
+
+

You've just cloned and deployed a working Groovy Spring Hibernate app.

+ See it in Action - - - +

Learn more at the + GitHub Project Page

+