vraptor-scaffold 1.2.3 → 1.3.0.rc

data/spec/vraptor-scaffold/generators/app/templates/build.gradle

@@ -40,9 +40,9 @@ jettyRun.contextPath = '/'
 
 dependencies {
     compile group: 'br.com.caelum', name: 'vraptor', version: '3.4.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.hsqldb', name: 'hsqldb', version: '2.2.4'
     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'

data/spec/vraptor-scaffold/generators/app/templates/build.xml

@@ -0,0 +1,146 @@
+<project name="vraptor-scaffold" default="war" xmlns:ivy="antlib:org.apache.ivy.ant">
+
+	<property file="build.properties" />
+
+	<!-- paths -->
+	<path id="lib.path.id">
+		<fileset dir="${lib.dir}" />
+		<fileset dir="lib/provided" />
+	</path>
+	<path id="test.path.id">
+		<fileset dir="lib/test" />
+		<path refid="lib.path.id" />
+		<pathelement location="${test.build.dir}" />
+		<pathelement location="${build.dir}" />
+	</path>
+
+	<!-- ================================= 
+          target: resolve              
+         ================================= -->
+	<target name="resolve" description="--> retrieve dependencies with ivy">
+		<path id="ivy.lib.path">
+			<pathelement location="${ivy.jar.file}" />
+		</path>
+		<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path" />
+
+		<ivy:retrieve pattern="lib/[conf]/[artifact]-[revision].[ext]" sync="true" />
+		<delete dir="${lib.dir}" includes="**/*.*" />
+		<copy todir="${lib.dir}">
+			<fileset dir="lib/default">
+				<include name="*.jar" />
+			</fileset>
+		</copy>
+	</target>
+
+	<!-- ================================= 
+          target: compile
+         ================================= -->
+	<target name="compile" depends="resolve" description="--> compile">
+		<mkdir dir="${build.dir}" />
+		<delete dir="${build.dir}" includes="**/*.*" />
+		<javac srcdir="${src.dir}" destdir="${build.dir}" classpathref="lib.path.id" debug="on" />
+		<copy todir="${build.dir}">
+			<fileset dir="${resources.dir}">
+				<include name="**/*.*" />
+			</fileset>
+		</copy>
+	</target>
+
+	<!-- ================================= 
+	      target: compile test
+	     ================================= -->
+	<target name="compile-test" depends="compile" description="--> compile test">
+		<mkdir dir="${test.build.dir}" />
+		<delete dir="${test.build.dir}" includes="**/*.*" />
+		<javac srcdir="${test.src.dir}" destdir="${test.build.dir}" classpathref="test.path.id" debug="on" />
+		<copy todir="${test.build.dir}">
+			<fileset dir="${test.resources.dir}">
+				<include name="**/*.*" />
+			</fileset>
+		</copy>
+	</target>
+
+	<!-- ================================= 
+          target: run tests
+         ================================= -->
+	<target name="test" depends="compile-test" description="--> run all tests">
+		<mkdir dir="${output.dir}/test-results" />
+		<junit haltonfailure="yes">
+			<batchtest fork="yes" todir="${output.dir}/test-results">
+				<fileset dir="${test.src.dir}">
+					<include name="**/*Test.java" />
+				</fileset>
+			</batchtest>
+			<formatter type="brief" usefile="false" />
+			<formatter type="xml" />
+			<classpath refid="test.path.id" />
+		</junit>
+	</target>
+
+	<!-- ================================= 
+          target: war
+         ================================= -->
+	<target name="war" description="--> generate war file" depends="test">
+		<war destfile="${output.dir}/${project.name}.war">
+			<zipfileset dir="${webapp.dir}" />
+		</war>
+	</target>
+
+	<!-- ================================= 
+          target: jetty.run              
+         ================================= -->
+	<target name="jetty.run" description="--> run jetty server" depends="compile">
+		<path id="jetty.path.id">
+		    <fileset dir="lib/jetty" />
+		</path>
+		<taskdef classpathref="jetty.path.id" resource="tasks.properties" loaderref="jetty.loader" />
+		<jetty tempDirectory="${output.dir}/jetty-temp">
+            <webApp name="${project.name}" warfile="${webapp.dir}" contextpath="/" scanIntervalSeconds="3">
+                <scanTargets dir="${build.dir}">
+                    <include name="**/*"/>
+                </scanTargets>
+            </webApp>
+		</jetty>
+	</target>
+
+	<!-- ================================= 
+          target: minify              
+         ================================= -->
+	<target name="minify" depends="resolve" description="minify js and css">
+		<property name="yuicompressor.jar" value="lib/minify/yuicompressor-2.3.6.jar" />
+
+		<fileset dir="${js.dir}" includes="*.js" excludes="all.min.js" id="alljs" />
+		<fileset dir="${css.dir}" includes="*.css" excludes="*.min.css" id="allcss" />
+
+		<delete file="${css.dir}/all.css" />
+		<concat destfile="${css.dir}/all.css" fixlastline="true">
+			<fileset refid="allcss" />
+		</concat>
+
+		<java jar="${yuicompressor.jar}" fork="true">
+			<arg value="${css.dir}/all.css" />
+			<arg value="-o" />
+			<arg value="${css.dir}/all.min.css" />
+		</java>
+
+		<delete file="${js.dir}/all.js" />
+		<concat destfile="${js.dir}/all.js" fixlastline="true">
+			<fileset refid="alljs" />
+		</concat>
+
+		<java jar="${yuicompressor.jar}" fork="true">
+			<arg value="${js.dir}/all.js" />
+			<arg value="-o" />
+			<arg value="${js.dir}/all.min.js" />
+		</java>
+	</target>
+
+	<!-- ================================= 
+          target: report              
+         ================================= -->
+	<target name="report" depends="resolve" description="--> generates a report of dependencies">
+		<mkdir dir="${output.dir}/reports" />
+		<ivy:report todir="${output.dir}/reports" />
+	</target>
+
+</project>

data/spec/vraptor-scaffold/generators/app/templates/classpath-gae

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	
+	  <classpathentry kind="lib" path="lib/test/junit-4.10.jar"/>
+        
+	  <classpathentry kind="lib" path="lib/test/hamcrest-all-1.1.jar"/>
+        
+	  <classpathentry kind="lib" path="lib/test/mockito-all-1.8.5.jar"/>
+        	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="com.google.appengine.eclipse.core.GAE_CONTAINER"/>
+	<classpathentry kind="output" path="src/main/webapp/WEB-INF/classes"/>
+</classpath>

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

@@ -57,4 +57,4 @@
 		<servlet-name>sitemesh-freemarker</servlet-name>
 		<url-pattern>*.ftl</url-pattern>
 	</servlet-mapping>
-</web-app>
+</web-app>

data/spec/vraptor-scaffold/generators/app/templates/gae-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>gae</display-name>
+
+	<context-param>
+		<param-name>br.com.caelum.vraptor.packages</param-name>
+		<param-value>br.com.caelum.vraptor.util.gae</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/vraptor-scaffold/generators/app/templates/ivy-gae.xml

@@ -0,0 +1,45 @@
+<ivy-module version="2.0">
+	<info organisation="gae" module="gae" />
+
+	<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="minify" description="dependencies used to minify js and css" visibility="public" />
+	</configurations>
+
+	<dependencies>
+		<dependency org="br.com.caelum" name="vraptor" rev="3.3.1" 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-validator" rev="4.2.0.Final" conf="default" />
+		<dependency org="joda-time" name="joda-time" rev="2.0" conf="default" />
+		<dependency org="com.thoughtworks.xstream" name="xstream" rev="1.4.1" conf="default" />
+		<dependency org="com.googlecode.objectify" name="objectify" rev="3.1" conf="default" />
+		<dependency org="br.com.caelum" name="vraptor-gae" rev="1.0" conf="default" />
+		<dependency org="commons-fileupload" name="commons-fileupload" rev="1.2.2" conf="default" />
+		<dependency org="com.google.appengine" name="appengine-api-1.0-sdk" rev="1.6.0" conf="default" />
+		<dependency org="com.google.appengine" name="appengine-api-labs" rev="1.6.0" conf="default" />
+		<dependency org="com.google.appengine" name="appengine-jsr107cache" rev="1.6.0" conf="default" />
+		<dependency org="net.sf.jsr107cache" name="jsr107cache" rev="1.1" conf="default" />
+		<dependency org="org.apache.geronimo.specs" name="geronimo-jpa_3.0_spec" rev="1.1.1" conf="default" />
+
+		<!-- Provided dependencies -->
+		<dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="provided->default" />
+		<dependency org="javax.servlet.jsp" name="jsp-api" rev="2.1" conf="provided->default" />
+
+		<!-- Test dependencies -->
+		<dependency org="junit" name="junit" rev="4.10" conf="test->default" />
+		<dependency org="org.hamcrest" name="hamcrest-all" rev="1.1" conf="test->default" />
+		<dependency org="org.mockito" name="mockito-all" rev="1.8.5" conf="test->default" />
+
+		<!-- Jetty dependencies -->
+		<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/templates/ivy.xml

@@ -11,9 +11,9 @@
 
 	<dependencies>
 		<dependency org="br.com.caelum" name="vraptor" rev="3.4.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.hsqldb" name="hsqldb" rev="2.2.4" 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" />

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

@@ -42,4 +42,4 @@
 			<include-prelude>/WEB-INF/jsp/prelude.jspf</include-prelude>
 		</jsp-property-group>
 	</jsp-config>
-</web-app>
+</web-app>

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

@@ -81,11 +81,6 @@
 			<artifactId>vraptor</artifactId>
 			<version>3.4.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
-			<version>2.2.4</version>
-		</dependency>
 		<dependency>
 			<groupId>opensymphony</groupId>
 			<artifactId>sitemesh</artifactId>
@@ -96,6 +91,11 @@
 			<artifactId>jstl</artifactId>
 			<version>1.2</version>
 		</dependency>
+		<dependency>
+			<groupId>org.hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+			<version>2.2.4</version>
+		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-entitymanager</artifactId>

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

@@ -59,11 +59,6 @@
 			<artifactId>vraptor</artifactId>
 			<version>3.4.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
-			<version>2.2.4</version>
-		</dependency>
 		<dependency>
 			<groupId>opensymphony</groupId>
 			<artifactId>sitemesh</artifactId>
@@ -74,6 +69,11 @@
 			<artifactId>jstl</artifactId>
 			<version>1.2</version>
 		</dependency>
+		<dependency>
+			<groupId>org.hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+			<version>2.2.4</version>
+		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-entitymanager</artifactId>

data/spec/vraptor-scaffold/generators/app/templates/project-gae

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>gae</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.google.gdt.eclipse.core.webAppProjectValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.google.appengine.eclipse.core.enhancerbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.google.appengine.eclipse.core.projectValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+		<nature>com.google.appengine.eclipse.core.gaeNature</nature>
+	</natures>
+</projectDescription>

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

@@ -42,9 +42,9 @@ dependencies {
     compile group: 'br.com.caelum.vraptor.plugin', name: 'vraptor-environment', version: '0.0.8'
 
     compile group: 'br.com.caelum', name: 'vraptor', version: '3.4.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.hsqldb', name: 'hsqldb', version: '2.2.4'
     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'

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

@@ -42,9 +42,9 @@ dependencies {
     compile group: 'br.com.caelum.vraptor', name: 'vraptor-environment', version: '0.0.8'
 
     compile group: 'br.com.caelum', name: 'vraptor', version: '3.4.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.hsqldb', name: 'hsqldb', version: '2.2.4'
     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'

data/spec/vraptor-scaffold/generators/plugin/expected_configs/default_org_ivy.xml

@@ -12,9 +12,9 @@
 	<dependencies>
 		<dependency org="br.com.caelum.vraptor" name="vraptor-environment" rev="0.0.8" conf="default" />
 		<dependency org="br.com.caelum" name="vraptor" rev="3.4.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.hsqldb" name="hsqldb" rev="2.2.4" 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" />

data/spec/vraptor-scaffold/generators/plugin/expected_configs/default_org_pom.xml

@@ -64,11 +64,6 @@
 			<artifactId>vraptor</artifactId>
 			<version>3.4.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
-			<version>2.2.4</version>
-		</dependency>
 		<dependency>
 			<groupId>opensymphony</groupId>
 			<artifactId>sitemesh</artifactId>
@@ -79,6 +74,11 @@
 			<artifactId>jstl</artifactId>
 			<version>1.2</version>
 		</dependency>
+		<dependency>
+			<groupId>org.hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+			<version>2.2.4</version>
+		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-entitymanager</artifactId>