vraptor-scaffold 1.1.0 → 1.2.0

data/spec/vraptor-scaffold/generators/{app_generator → app}/dependency_manager_spec.rb

@@ -12,7 +12,7 @@ describe DependencyManager do
   context "compile scope" do
     it "should include freemarker dependency when template is freemarker" do
       options = {:template_engine => "ftl"}
-      Dependency.stub!(:new).with("org.freemarker", "freemarker", "2.3.16").and_return(@dependency)
+      Dependency.stub!(:new).with("org.freemarker", "freemarker", "2.3.18").and_return(@dependency)
       DependencyManager.new(options).compile_scope.include?(@dependency).should be_true
     end
   end

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

@@ -12,7 +12,7 @@ describe FreemarkerTemplateEngine do
 
   context "configuring" do
     before(:all) do
-      AppGenerator.new(@project_path, ["--template-engine=ftl", "-p=br.com.caelum"]).invoke_all
+      AppGenerator.new(@project_path, ["--template-engine=ftl", "-p=br.com.caelum", "--orm=hibernate"]).invoke_all
     end
 
     after(:all) do

data/spec/vraptor-scaffold/generators/{app_generator → app}/templates/Entity.java

@@ -1,4 +1,4 @@
-package app.models;
+package app.domain;
 
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;

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

@@ -1,4 +1,4 @@
-package app.repositories;
+package app.repository;
 
 import java.io.Serializable;
 import java.lang.reflect.ParameterizedType;
@@ -25,8 +25,8 @@ public abstract class Repository<T, I extends Serializable> {
 		entityManager.persist(entity);
 	}
 	
-	public void update(T entity) {
-		entityManager.merge(entity);
+	public T update(T entity) {
+		return entityManager.merge(entity);
 	}
 	
 	public void destroy(T entity) {

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

@@ -1,6 +1,5 @@
 repositories {
     mavenCentral()
-    mavenRepo urls: "https://repository.jboss.org/nexus/content/groups/public-jboss"
 }
 
 apply plugin: 'java'
@@ -13,6 +12,25 @@ sourceCompatibility = 1.6
 targetCompatibility = 1.6
 version = '1.0'
 
+sourceSets {
+    main {
+        java {
+            srcDir 'src/main/java'
+        }
+        resources {
+            srcDir 'src/main/resources'
+        }
+    }
+    test {
+        java {
+            srcDir 'src/test/java'
+        }
+        resources {
+            srcDir 'src/test/resources'
+        }
+    }
+}
+
 sourceSets.main.classesDir = new File('src/main/webapp/WEB-INF/classes')
 
 jettyRun.scanIntervalSeconds=3
@@ -22,12 +40,13 @@ jettyRun.contextPath = '/'
 
 dependencies {
     compile group: 'br.com.caelum', name: 'vraptor', version: '3.3.1'
-    compile group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0'
+    compile group: 'org.hsqldb', name: 'hsqldb', version: '2.2.4'
     compile group: 'opensymphony', name: 'sitemesh', version: '2.4.2'
     compile group: 'javax.servlet', name: 'jstl', version: '1.2'
-    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'
+    compile group: 'org.hibernate', name: 'hibernate-entitymanager', version: '3.6.7.Final'
+    compile group: 'org.hibernate', name: 'hibernate-c3p0', version: '3.6.7.Final'
+    compile group: 'org.hibernate', name: 'hibernate-validator', version: '4.2.0.Final'
+    compile group: 'joda-time', name: 'joda-time', version: '2.0'
 
     //Provided dependencies
     providedCompile group: 'javax.servlet', name: 'servlet-api', version: '2.5'

data/spec/vraptor-scaffold/generators/{app_generator → app}/templates/freemarker-web.xml

@@ -3,11 +3,11 @@
 	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>
+	<display-name>vraptor-scaffold</display-name>
 
 	<context-param>
 		<param-name>br.com.caelum.vraptor.packages</param-name>
-		<param-value>br.com.caelum.vraptor.util.jpa</param-value>
+		<param-value>br.com.caelum.vraptor.util.hibernate</param-value>
 	</context-param>
 
 	<context-param>

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

@@ -11,12 +11,13 @@
 
 	<dependencies>
 		<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="org.hsqldb" name="hsqldb" rev="2.2.4" 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="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" />
+		<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.6.7.Final" conf="default" />
+		<dependency org="org.hibernate" name="hibernate-c3p0" rev="3.6.7.Final" conf="default" />
+		<dependency org="org.hibernate" name="hibernate-validator" rev="4.2.0.Final" conf="default" />
+		<dependency org="joda-time" name="joda-time" rev="2.0" conf="default" />
 
 		<!-- Provided dependencies -->
 		<dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="provided->default" />
@@ -31,7 +32,7 @@
 		<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>

data/spec/vraptor-scaffold/generators/{app_generator → app}/templates/jsp-web.xml

@@ -3,7 +3,7 @@
 	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>
+	<display-name>vraptor-scaffold</display-name>
 
 	<context-param>
 		<param-name>br.com.caelum.vraptor.packages</param-name>

data/spec/vraptor-scaffold/generators/app/templates/pom-heroku.xml

@@ -0,0 +1,168 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>heroku</groupId>
+	<artifactId>heroku</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<name>heroku</name>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<build>
+		<outputDirectory>${basedir}/src/main/webapp/WEB-INF/classes</outputDirectory>
+		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
+				<configuration>
+					<source>1.6</source>
+					<target>1.6</target>
+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-eclipse-plugin</artifactId>
+				<version>2.8</version>
+				<configuration>
+					<downloadSources>true</downloadSources>
+					<downloadJavadocs>true</downloadJavadocs>
+					<wtpversion>2.0</wtpversion>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>2.1.1</version>
+			</plugin>
+			<plugin>
+				<groupId>org.mortbay.jetty</groupId>
+				<artifactId>maven-jetty-plugin</artifactId>
+				<version>6.1.14</version>
+				<configuration>
+					<scanIntervalSeconds>3</scanIntervalSeconds>
+					<stopKey>foo</stopKey>
+					<stopPort>9999</stopPort>
+					<webAppConfig>
+						<contextPath>/</contextPath>
+					</webAppConfig>
+				</configuration>
+			</plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>appassembler-maven-plugin</artifactId>
+                <version>1.1.1</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>assemble</goal>
+                        </goals>
+                        <configuration>
+                            <assembleDirectory>target</assembleDirectory>
+                            <generateRepository>false</generateRepository>
+                            <extraJvmArguments>-Xmx512m</extraJvmArguments>
+                            <programs>
+                                <program>
+                                    <mainClass>Main</mainClass>
+                                    <name>webapp</name>
+                                </program>
+                            </programs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>br.com.caelum</groupId>
+			<artifactId>vraptor</artifactId>
+			<version>3.3.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+			<version>2.2.4</version>
+		</dependency>
+		<dependency>
+			<groupId>opensymphony</groupId>
+			<artifactId>sitemesh</artifactId>
+			<version>2.4.2</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jstl</artifactId>
+			<version>1.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-entitymanager</artifactId>
+			<version>3.6.7.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-c3p0</artifactId>
+			<version>3.6.7.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>4.2.0.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+			<version>2.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-webapp</artifactId>
+			<version>7.4.4.v20110707</version>
+		</dependency>
+		<dependency>
+			<groupId>org.mortbay.jetty</groupId>
+			<artifactId>jsp-2.1-glassfish</artifactId>
+			<version>2.1.v20100127</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.5</version>
+		</dependency>
+
+		<!-- Test dependencies -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.8.2</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-all</artifactId>
+			<version>1.1</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<version>1.8.5</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- Provided dependencies -->
+	</dependencies>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>cobertura-maven-plugin</artifactId>
+				<version>2.5.1</version>
+			</plugin>
+		</plugins>
+	</reporting>
+</project>

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

@@ -7,14 +7,6 @@
 	<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>
@@ -43,7 +35,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
-				<version>2.1</version>
+				<version>2.1.1</version>
 			</plugin>
 			<plugin>
 				<groupId>org.mortbay.jetty</groupId>
@@ -70,7 +62,7 @@
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>2.0.0</version>
+			<version>2.2.4</version>
 		</dependency>
 		<dependency>
 			<groupId>opensymphony</groupId>
@@ -85,17 +77,22 @@
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-entitymanager</artifactId>
-			<version>3.6.1.Final</version>
+			<version>3.6.7.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-c3p0</artifactId>
+			<version>3.6.7.Final</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-validator</artifactId>
-			<version>4.1.0.Final</version>
+			<version>4.2.0.Final</version>
 		</dependency>
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
-			<version>1.6.2</version>
+			<version>2.0</version>
 		</dependency>
 
 		<!-- Test dependencies -->
@@ -138,7 +135,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.4</version>
+				<version>2.5.1</version>
 			</plugin>
 		</plugins>
 	</reporting>

data/spec/vraptor-scaffold/generators/app/templates/vraptor-scaffold.properties

@@ -0,0 +1,7 @@
+build_tool: mvn
+package: app
+template_engine: jsp
+orm: jpa
+models_package: domain
+controllers_package: control
+repositories_package: repository

data/spec/vraptor-scaffold/generators/plugin/expected_configs/build.gradle

@@ -0,0 +1,61 @@
+repositories {
+    mavenCentral()
+}
+
+apply plugin: 'java'
+apply plugin: 'war'
+apply plugin: 'jetty'
+apply plugin: 'eclipse'
+apply plugin: 'project-report'
+
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
+version = '1.0'
+
+sourceSets {
+    main {
+        java {
+            srcDir 'src/main/java'
+        }
+        resources {
+            srcDir 'src/main/resources'
+        }
+    }
+    test {
+        java {
+            srcDir 'src/test/java'
+        }
+        resources {
+            srcDir 'src/test/resources'
+        }
+    }
+}
+
+sourceSets.main.classesDir = new File('src/main/webapp/WEB-INF/classes')
+
+jettyRun.scanIntervalSeconds=3
+jettyRun.contextPath = '/' 
+[jettyRunWar,jettyStop]*.stopPort = 8081
+[jettyRunWar,jettyStop]*.stopKey = 'stopKey'
+
+dependencies {
+    compile group: 'br.com.caelum.vraptor.plugin', name: 'vraptor-environment', version: '0.0.8'
+
+    compile group: 'br.com.caelum', name: 'vraptor', version: '3.3.1'
+    compile group: 'org.hsqldb', name: 'hsqldb', version: '2.2.4'
+    compile group: 'opensymphony', name: 'sitemesh', version: '2.4.2'
+    compile group: 'javax.servlet', name: 'jstl', version: '1.2'
+    compile group: 'org.hibernate', name: 'hibernate-entitymanager', version: '3.6.7.Final'
+    compile group: 'org.hibernate', name: 'hibernate-c3p0', version: '3.6.7.Final'
+    compile group: 'org.hibernate', name: 'hibernate-validator', version: '4.2.0.Final'
+    compile group: 'joda-time', name: 'joda-time', version: '2.0'
+
+    //Provided dependencies
+    providedCompile group: 'javax.servlet', name: 'servlet-api', version: '2.5'
+    providedCompile group: 'javax.servlet.jsp', name: 'jsp-api', version: '2.1'
+
+    //Test dependencies
+    testCompile group: 'junit', name: 'junit', version: '4.8.2'
+    testCompile group: 'org.hamcrest', name: 'hamcrest-all', version: '1.1'
+    testCompile group: 'org.mockito', name: 'mockito-all', version: '1.8.5'
+}