vraptor-scaffold 1.0.0 → 1.1.0.pre

data/spec/{lib → vraptor-scaffold}/generators/app_generator/app_generator_spec.rb

@@ -122,12 +122,6 @@ describe AppGenerator do
         File.exist?(@web_inf).should be_true 
       end
 
-      it "should create web.xml" do
-        source = "#{AppGenerator.source_root}/webapp/WEB-INF/web.xml"
-        destination = "#{@web_inf}/web.xml"
-        exists_and_identical?(source, destination)
-      end
-
       it "should create scaffold css" do
         source = "#{AppGenerator.source_root}/webapp/stylesheets/scaffold.css"
         destination = "#{@webapp}/stylesheets/scaffold.css"
@@ -254,6 +248,12 @@ describe AppGenerator do
       destination = "#{@project_path}/ivy.xml"
       exists_and_identical?(source, destination)
     end
+    
+    it "should create ivysettings.xml" do
+      source = File.join AppGenerator.source_root, "ivysettings.xml"
+      destination = "#{@project_path}/ivysettings.xml"
+      exists_and_identical?(source, destination)
+    end
 
     it "should copy ivy.jar" do
       ivy = File.join @project_path, AppGenerator::IVY_JAR

data/spec/{lib → vraptor-scaffold}/generators/app_generator/freemarker_template_engine_spec.rb

@@ -25,10 +25,10 @@ describe FreemarkerTemplateEngine do
       exists_and_identical?(source, destination)
     end
 
-    it "should append freemarker servlet in web.xml" do
-      source = File.join FreemarkerTemplateEngine.source_root, "freemarker-web.xml"
-      web_xml = "#{@web_inf}/web.xml"
-      File.read(web_xml).should include(File.read(source))
+    it "should create web.xml" do
+      source = File.join File.dirname(__FILE__), "templates", "freemarker-web.xml"
+      destination = "#{@web_inf}/web.xml"
+      exists_and_identical?(source, destination)
     end
 
     it "should create views folder" do

data/spec/{lib → vraptor-scaffold}/generators/app_generator/jsp_template_engine_spec.rb

@@ -39,6 +39,17 @@ describe JspTemplateEngine do
       to = "#{@app}/infrastructure/FreemarkerPathResolver.java"
       File.exist?(to).should be_false
     end
-
+    
+    it "should create web.xml" do
+      source = File.join File.dirname(__FILE__), "templates", "jsp-web.xml"
+      destination = "#{@web_inf}/web.xml"
+      exists_and_identical?(source, destination)
+    end
+    
+    it "should create prelude.jspf" do
+      source = "#{JspTemplateEngine.source_root}/prelude.jspf"
+      destination = "#{@web_inf}/jsp/prelude.jspf"
+      exists_and_identical?(source, destination)
+    end
   end
 end

data/spec/{lib → vraptor-scaffold}/generators/app_generator/templates/Repository.java

@@ -5,13 +5,20 @@ import java.lang.reflect.ParameterizedType;
 import java.util.List;
 
 import javax.persistence.EntityManager;
+import javax.persistence.Query;
 
 public abstract class Repository<T, I extends Serializable> {
 	
 	protected final EntityManager entityManager;
-	
-	public Repository(EntityManager entityManager) {
+	protected final Class<T> clazz;
+
+	protected Repository(EntityManager entityManager) {
 		this.entityManager = entityManager;
+		
+		@SuppressWarnings("unchecked")
+		Class<T> clazz = (Class<T>) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0];
+
+		this.clazz = clazz;
 	}
 	
 	public void create(T entity) {
@@ -27,17 +34,15 @@ public abstract class Repository<T, I extends Serializable> {
 	}
 	
 	public T find(I id) {
-		return entityManager.find(getParameterizedClass(), id);
+		return entityManager.find(clazz, id);
 	}
 	
-	@SuppressWarnings("unchecked")
 	public List<T> findAll() {
-		return entityManager.createQuery("From " + getParameterizedClass().getName()).getResultList();
-	}
-	
-	@SuppressWarnings("unchecked")
-	private Class<T> getParameterizedClass() {
-		ParameterizedType parameterizedType = (ParameterizedType) getClass().getGenericSuperclass();
-		return (Class<T>) parameterizedType.getActualTypeArguments()[0];
+		Query query = entityManager.createQuery("from " + clazz.getName());
+
+		@SuppressWarnings("unchecked")
+		List<T> resultList = query.getResultList();
+
+		return resultList;
 	}
-}
+}

data/spec/{lib → vraptor-scaffold}/generators/app_generator/templates/build.gradle

@@ -1,5 +1,6 @@
 repositories {
     mavenCentral()
+    mavenRepo urls: "https://repository.jboss.org/nexus/content/groups/public-jboss"
 }
 
 apply plugin: 'java'
@@ -20,15 +21,12 @@ jettyRun.contextPath = '/'
 [jettyRunWar,jettyStop]*.stopKey = 'stopKey'
 
 dependencies {
-    compile group: 'br.com.caelum', name: 'vraptor', version: '3.3.0'
-    compile group: 'net.sf.scannotation', name: 'scannotation', version: '1.0.2'
+    compile group: 'br.com.caelum', name: 'vraptor', version: '3.3.1'
     compile group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0'
     compile group: 'opensymphony', name: 'sitemesh', version: '2.4.2'
     compile group: 'javax.servlet', name: 'jstl', version: '1.2'
-    compile group: 'javax.persistence', name: 'persistence-api', version: '1.0'
-    compile group: 'org.hibernate', name: 'hibernate-entitymanager', version: '3.4.0.GA'
-    compile group: 'org.hibernate', name: 'hibernate-core', version: '3.3.2.GA'
-    compile group: 'org.hibernate', name: 'hibernate-validator', version: '3.1.0.GA'
+    compile group: 'org.hibernate', name: 'hibernate-entitymanager', version: '3.6.1.Final'
+    compile group: 'org.hibernate', name: 'hibernate-validator', version: '4.1.0.Final'
     compile group: 'joda-time', name: 'joda-time', version: '1.6.2'
 
     //Provided dependencies

data/spec/{lib → vraptor-scaffold}/generators/app_generator/templates/build.properties

@@ -4,6 +4,8 @@ output.dir=target
 test.build.dir=target/test-classes
 
 webapp.dir=src/main/webapp
+js.dir=src/main/webapp/javascripts
+css.dir=src/main/webapp/stylesheets
 lib.dir=src/main/webapp/WEB-INF/lib
 build.dir=src/main/webapp/WEB-INF/classes
 

data/spec/vraptor-scaffold/generators/app_generator/templates/freemarker-web.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee"
+	xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+	id="WebApp_ID" version="2.5">
+
+	<display-name>vraptor-scaffold-project</display-name>
+
+	<context-param>
+		<param-name>br.com.caelum.vraptor.packages</param-name>
+		<param-value>br.com.caelum.vraptor.util.jpa</param-value>
+	</context-param>
+
+	<context-param>
+		<param-name>br.com.caelum.vraptor.encoding</param-name>
+		<param-value>UTF-8</param-value>
+	</context-param>
+
+	<filter>
+		<filter-name>sitemesh</filter-name>
+		<filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class>
+	</filter>
+
+	<filter>
+		<filter-name>vraptor</filter-name>
+		<filter-class>br.com.caelum.vraptor.VRaptor</filter-class>
+	</filter>
+
+	<filter-mapping>
+		<filter-name>sitemesh</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+	<filter-mapping>
+		<filter-name>vraptor</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+	
+	<servlet>
+		<servlet-name>sitemesh-freemarker</servlet-name>
+		<servlet-class>com.opensymphony.module.sitemesh.freemarker.FreemarkerDecoratorServlet</servlet-class>
+		<init-param>
+			<param-name>TemplatePath</param-name>
+			<param-value>/</param-value>
+		</init-param>
+		<init-param>
+			<param-name>default_encoding</param-name>
+			<param-value>UTF-8</param-value>
+		</init-param>
+		<init-param>
+			<param-name>auto_import</param-name>
+			<param-value>macros/html.ftl as html</param-value>
+		</init-param>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	
+	<servlet-mapping>
+		<servlet-name>sitemesh-freemarker</servlet-name>
+		<url-pattern>*.ftl</url-pattern>
+	</servlet-mapping>
+</web-app>

data/spec/{lib → vraptor-scaffold}/generators/app_generator/templates/ivy.xml

@@ -3,21 +3,19 @@
 
 	<configurations>
 		<conf name="default" description="dependencies used for compile" />
+		<conf name="provided" description="dependencies used for compile but is not packaged" visibility="public" />
 		<conf name="test" description="dependencies used for tests" visibility="public" />
 		<conf name="jetty" description="dependencies used for jetty" visibility="public" />
-		<conf name="provided" description="dependencies used for compile but is not packaged" visibility="public" />
+		<conf name="minify" description="dependencies used to minify js and css" visibility="public" />
 	</configurations>
 
 	<dependencies>
-		<dependency org="br.com.caelum" name="vraptor" rev="3.3.0" conf="default" />
-		<dependency org="net.sf.scannotation" name="scannotation" rev="1.0.2" conf="default" />
+		<dependency org="br.com.caelum" name="vraptor" rev="3.3.1" conf="default" />
 		<dependency org="org.hsqldb" name="hsqldb" rev="2.0.0" conf="default" />
 		<dependency org="opensymphony" name="sitemesh" rev="2.4.2" conf="default" />
 		<dependency org="javax.servlet" name="jstl" rev="1.2" conf="default" />
-		<dependency org="javax.persistence" name="persistence-api" rev="1.0" conf="default" />
-		<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.4.0.GA" conf="default" />
-		<dependency org="org.hibernate" name="hibernate-core" rev="3.3.2.GA" conf="default" />
-		<dependency org="org.hibernate" name="hibernate-validator" rev="3.1.0.GA" conf="default" />
+		<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.6.1.Final" conf="default" />
+		<dependency org="org.hibernate" name="hibernate-validator" rev="4.1.0.Final" conf="default" />
 		<dependency org="joda-time" name="joda-time" rev="1.6.2" conf="default" />
 
 		<!-- Provided dependencies -->
@@ -33,5 +31,8 @@
 		<dependency org="org.mortbay.jetty" name="jsp-api-2.1" rev="6.1.14" conf="jetty->default" />
 		<dependency org="org.mortbay.jetty" name="jsp-2.1" rev="6.1.14" conf="jetty->default" />
 		<dependency org="org.mortbay.jetty" name="jetty-ant" rev="6.1.14" conf="jetty->default" />
+		
+		<!-- Minify dependencies -->
+		<dependency org="com.yahoo.platform.yui" name="yuicompressor" rev="2.3.6" conf="minify->default" />
 	</dependencies>
 </ivy-module>

data/spec/vraptor-scaffold/generators/app_generator/templates/jsp-web.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee"
+	xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+	id="WebApp_ID" version="2.5">
+
+	<display-name>vraptor-scaffold-project</display-name>
+
+	<context-param>
+		<param-name>br.com.caelum.vraptor.packages</param-name>
+		<param-value>br.com.caelum.vraptor.util.jpa</param-value>
+	</context-param>
+
+	<context-param>
+		<param-name>br.com.caelum.vraptor.encoding</param-name>
+		<param-value>UTF-8</param-value>
+	</context-param>
+
+	<filter>
+		<filter-name>sitemesh</filter-name>
+		<filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class>
+	</filter>
+
+	<filter>
+		<filter-name>vraptor</filter-name>
+		<filter-class>br.com.caelum.vraptor.VRaptor</filter-class>
+	</filter>
+
+	<filter-mapping>
+		<filter-name>sitemesh</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+	<filter-mapping>
+		<filter-name>vraptor</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+	
+	<jsp-config>
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<include-prelude>/WEB-INF/jsp/prelude.jspf</include-prelude>
+		</jsp-property-group>
+	</jsp-config>
+</web-app>

data/spec/{lib → vraptor-scaffold}/generators/app_generator/templates/pom.xml

@@ -7,6 +7,14 @@
 	<version>0.0.1-SNAPSHOT</version>
 	<name>vraptor-scaffold</name>
 
+	<repositories>
+		<repository>
+			<id>JBoss</id>
+			<name>JBoss repository</name>
+			<url>https://repository.jboss.org/nexus/content/groups/public-jboss</url>
+		</repository>
+	</repositories>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
@@ -57,12 +65,7 @@
 		<dependency>
 			<groupId>br.com.caelum</groupId>
 			<artifactId>vraptor</artifactId>
-			<version>3.3.0</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.scannotation</groupId>
-			<artifactId>scannotation</artifactId>
-			<version>1.0.2</version>
+			<version>3.3.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hsqldb</groupId>
@@ -79,25 +82,15 @@
 			<artifactId>jstl</artifactId>
 			<version>1.2</version>
 		</dependency>
-		<dependency>
-			<groupId>javax.persistence</groupId>
-			<artifactId>persistence-api</artifactId>
-			<version>1.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-entitymanager</artifactId>
-			<version>3.4.0.GA</version>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core</artifactId>
-			<version>3.3.2.GA</version>
+			<version>3.6.1.Final</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-validator</artifactId>
-			<version>3.1.0.GA</version>
+			<version>4.1.0.Final</version>
 		</dependency>
 		<dependency>
 			<groupId>joda-time</groupId>

data/spec/{lib → vraptor-scaffold}/generators/scaffold_generator/controller_generator/templates/ProductController.java

@@ -6,7 +6,6 @@ import app.models.Product;
 import app.repositories.ProductRepository;
 import br.com.caelum.vraptor.Delete;
 import br.com.caelum.vraptor.Get;
-import br.com.caelum.vraptor.Path;
 import br.com.caelum.vraptor.Post;
 import br.com.caelum.vraptor.Put;
 import br.com.caelum.vraptor.Resource;
@@ -20,20 +19,18 @@ public class ProductController {
 	private final ProductRepository repository;
 	private final Validator validator;
 	
-	public ProductController(Result result, ProductRepository repository, Validator validator) {
+	ProductController(Result result, ProductRepository repository, Validator validator) {
 		this.result = result;
 		this.repository = repository;
 		this.validator = validator;
 	}
 	
-	@Get
-	@Path("/products")
+	@Get("/products")
 	public List<Product> index() {
 		return repository.findAll();
 	}
 	
-	@Post
-	@Path("/products")
+	@Post("/products")
 	public void create(Product product) {
 		validator.validate(product);
 		validator.onErrorUsePageOf(this).newProduct();
@@ -41,14 +38,12 @@ public class ProductController {
 		result.redirectTo(this).index();
 	}
 	
-	@Get
-	@Path("/products/new")
+	@Get("/products/new")
 	public Product newProduct() {
 		return new Product();
 	}
 	
-	@Put
-	@Path("/products")
+	@Put("/products")
 	public void update(Product product) {
 		validator.validate(product);
 		validator.onErrorUsePageOf(this).edit(product);
@@ -56,23 +51,19 @@ public class ProductController {
 		result.redirectTo(this).index();
 	}
 	
-	@Get
-	@Path("/products/{product.id}/edit")
+	@Get("/products/{product.id}/edit")
 	public Product edit(Product product) {
 		return repository.find(product.getId());
 	}
 
-	@Get
-	@Path("/products/{product.id}")
+	@Get("/products/{product.id}")
 	public Product show(Product product) {
 		return repository.find(product.getId());
 	}
 
-	@Delete
-	@Path("/products/{product.id}")
+	@Delete("/products/{product.id}")
 	public void destroy(Product product) {
 		repository.destroy(repository.find(product.getId()));
 		result.redirectTo(this).index();  
 	}
-	
-}
+}