vraptor-scaffold 0.0.4 → 1.0.0

data/spec/lib/generators/app_generator/jsp_template_engine_spec.rb

@@ -6,7 +6,7 @@ describe JspTemplateEngine do
     before(:all) do
       @project_path = "src/vraptor-scaffold"
       @web_inf = "#{@project_path}/#{Configuration::WEB_INF}"
-      @decorators = "#{@web_inf}/decorators"
+      @decorators = "#{@web_inf}/jsp/decorators"
       @app = "#{@project_path}/#{Configuration::MAIN_SRC}/app"
       AppGenerator.new(@project_path).invoke_all
     end

data/spec/lib/generators/app_generator/templates/build.gradle

@@ -20,7 +20,8 @@ jettyRun.contextPath = '/'
 [jettyRunWar,jettyStop]*.stopKey = 'stopKey'
 
 dependencies {
-    compile group: 'br.com.caelum', name: 'vraptor', version: '3.2.0'
+    compile group: 'br.com.caelum', name: 'vraptor', version: '3.3.0'
+    compile group: 'net.sf.scannotation', name: 'scannotation', version: '1.0.2'
     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'

data/spec/lib/generators/app_generator/templates/decorators-jsp.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<decorators defaultdir="/WEB-INF/decorators">
+<decorators defaultdir="/WEB-INF/jsp/decorators">
     <decorator name="main" page="main.jsp">
         <pattern>/*</pattern>
     </decorator>

data/spec/lib/generators/app_generator/templates/decorators.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<decorators defaultdir="/WEB-INF/decorators">
+<decorators defaultdir="/WEB-INF/views/decorators">
     <decorator name="main" page="main.ftl">
         <pattern>/*</pattern>
     </decorator>

data/spec/lib/generators/app_generator/templates/ivy.xml

@@ -9,7 +9,8 @@
 	</configurations>
 
 	<dependencies>
-		<dependency org="br.com.caelum" name="vraptor" rev="3.2.0" conf="default" />
+		<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="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" />

data/spec/lib/generators/app_generator/templates/pom.xml

@@ -57,7 +57,12 @@
 		<dependency>
 			<groupId>br.com.caelum</groupId>
 			<artifactId>vraptor</artifactId>
-			<version>3.2.0</version>
+			<version>3.3.0</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sf.scannotation</groupId>
+			<artifactId>scannotation</artifactId>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hsqldb</groupId>

data/vraptor-scaffold.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vraptor-scaffold}
-  s.version = "0.0.4"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rodolfo Liviero"]
-  s.date = %q{2010-11-20}
+  s.date = %q{2011-02-04}
   s.default_executable = %q{vraptor}
   s.description = %q{VRaptor scaffold extension to make it easier configuring new projects and plugins.}
   s.email = %q{rodolfoliviero@gmail.com}
@@ -109,13 +109,10 @@ Gem::Specification.new do |s|
      "spec/lib/generators/app_generator/templates/Repository.java",
      "spec/lib/generators/app_generator/templates/build.gradle",
      "spec/lib/generators/app_generator/templates/build.properties",
-     "spec/lib/generators/app_generator/templates/build_spring3.gradle",
      "spec/lib/generators/app_generator/templates/decorators-jsp.xml",
      "spec/lib/generators/app_generator/templates/decorators.xml",
      "spec/lib/generators/app_generator/templates/ivy.xml",
-     "spec/lib/generators/app_generator/templates/ivy_spring3.xml",
      "spec/lib/generators/app_generator/templates/pom.xml",
-     "spec/lib/generators/app_generator/templates/pom_spring3.xml",
      "spec/lib/generators/scaffold_generator/attribute_spec.rb",
      "spec/lib/generators/scaffold_generator/base_scaffold_spec.rb",
      "spec/lib/generators/scaffold_generator/controller_generator/controller_generator_spec.rb",
@@ -141,22 +138,22 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{VRaptor Scaffold.}
   s.test_files = [
-    "spec/lib/configuration_spec.rb",
+    "spec/spec_helper.rb",
+     "spec/lib/vraptor-scaffold_spec.rb",
      "spec/lib/generators/app_generator/app_generator_spec.rb",
      "spec/lib/generators/app_generator/dependency_manager_spec.rb",
-     "spec/lib/generators/app_generator/dependency_spec.rb",
      "spec/lib/generators/app_generator/freemarker_template_engine_spec.rb",
      "spec/lib/generators/app_generator/jsp_template_engine_spec.rb",
+     "spec/lib/generators/app_generator/dependency_spec.rb",
+     "spec/lib/generators/scaffold_generator/model_generator/model_generator_spec.rb",
+     "spec/lib/generators/scaffold_generator/freemarker_generator/freemarker_generator_spec.rb",
+     "spec/lib/generators/scaffold_generator/repository_generator/repository_generator_spec.rb",
      "spec/lib/generators/scaffold_generator/attribute_spec.rb",
      "spec/lib/generators/scaffold_generator/base_scaffold_spec.rb",
-     "spec/lib/generators/scaffold_generator/controller_generator/controller_generator_spec.rb",
-     "spec/lib/generators/scaffold_generator/freemarker_generator/freemarker_generator_spec.rb",
      "spec/lib/generators/scaffold_generator/jsp_generator/jsp_generator_spec.rb",
-     "spec/lib/generators/scaffold_generator/model_generator/model_generator_spec.rb",
-     "spec/lib/generators/scaffold_generator/repository_generator/repository_generator_spec.rb",
      "spec/lib/generators/scaffold_generator/scaffold_generator_spec.rb",
-     "spec/lib/vraptor-scaffold_spec.rb",
-     "spec/spec_helper.rb"
+     "spec/lib/generators/scaffold_generator/controller_generator/controller_generator_spec.rb",
+     "spec/lib/configuration_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -164,16 +161,16 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thor>, ["= 0.14.4"])
+      s.add_runtime_dependency(%q<thor>, ["= 0.14.6"])
       s.add_runtime_dependency(%q<rake>, ["= 0.8.7"])
       s.add_runtime_dependency(%q<activesupport>, ["= 3.0.1"])
     else
-      s.add_dependency(%q<thor>, ["= 0.14.4"])
+      s.add_dependency(%q<thor>, ["= 0.14.6"])
       s.add_dependency(%q<rake>, ["= 0.8.7"])
       s.add_dependency(%q<activesupport>, ["= 3.0.1"])
     end
   else
-    s.add_dependency(%q<thor>, ["= 0.14.4"])
+    s.add_dependency(%q<thor>, ["= 0.14.6"])
     s.add_dependency(%q<rake>, ["= 0.8.7"])
     s.add_dependency(%q<activesupport>, ["= 3.0.1"])
   end

metadata

@@ -4,10 +4,10 @@ version: !ruby/object:Gem::Version
   hash: 23
   prerelease: false
   segments: 
+  - 1
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  version: 1.0.0
 platform: ruby
 authors: 
 - Rodolfo Liviero
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-20 00:00:00 -02:00
+date: 2011-02-04 00:00:00 -02:00
 default_executable: vraptor
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 43
         segments: 
         - 0
         - 14
-        - 4
-        version: 0.14.4
+        - 6
+        version: 0.14.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -166,13 +166,10 @@ files:
 - spec/lib/generators/app_generator/templates/Repository.java
 - spec/lib/generators/app_generator/templates/build.gradle
 - spec/lib/generators/app_generator/templates/build.properties
-- spec/lib/generators/app_generator/templates/build_spring3.gradle
 - spec/lib/generators/app_generator/templates/decorators-jsp.xml
 - spec/lib/generators/app_generator/templates/decorators.xml
 - spec/lib/generators/app_generator/templates/ivy.xml
-- spec/lib/generators/app_generator/templates/ivy_spring3.xml
 - spec/lib/generators/app_generator/templates/pom.xml
-- spec/lib/generators/app_generator/templates/pom_spring3.xml
 - spec/lib/generators/scaffold_generator/attribute_spec.rb
 - spec/lib/generators/scaffold_generator/base_scaffold_spec.rb
 - spec/lib/generators/scaffold_generator/controller_generator/controller_generator_spec.rb
@@ -225,19 +222,19 @@ signing_key:
 specification_version: 3
 summary: VRaptor Scaffold.
 test_files: 
-- spec/lib/configuration_spec.rb
+- spec/spec_helper.rb
+- spec/lib/vraptor-scaffold_spec.rb
 - spec/lib/generators/app_generator/app_generator_spec.rb
 - spec/lib/generators/app_generator/dependency_manager_spec.rb
-- spec/lib/generators/app_generator/dependency_spec.rb
 - spec/lib/generators/app_generator/freemarker_template_engine_spec.rb
 - spec/lib/generators/app_generator/jsp_template_engine_spec.rb
+- spec/lib/generators/app_generator/dependency_spec.rb
+- spec/lib/generators/scaffold_generator/model_generator/model_generator_spec.rb
+- spec/lib/generators/scaffold_generator/freemarker_generator/freemarker_generator_spec.rb
+- spec/lib/generators/scaffold_generator/repository_generator/repository_generator_spec.rb
 - spec/lib/generators/scaffold_generator/attribute_spec.rb
 - spec/lib/generators/scaffold_generator/base_scaffold_spec.rb
-- spec/lib/generators/scaffold_generator/controller_generator/controller_generator_spec.rb
-- spec/lib/generators/scaffold_generator/freemarker_generator/freemarker_generator_spec.rb
 - spec/lib/generators/scaffold_generator/jsp_generator/jsp_generator_spec.rb
-- spec/lib/generators/scaffold_generator/model_generator/model_generator_spec.rb
-- spec/lib/generators/scaffold_generator/repository_generator/repository_generator_spec.rb
 - spec/lib/generators/scaffold_generator/scaffold_generator_spec.rb
-- spec/lib/vraptor-scaffold_spec.rb
-- spec/spec_helper.rb
+- spec/lib/generators/scaffold_generator/controller_generator/controller_generator_spec.rb
+- spec/lib/configuration_spec.rb

data/spec/lib/generators/app_generator/templates/build_spring3.gradle

@@ -1,45 +0,0 @@
-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.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', name: 'vraptor', version: '3.2.0', {
-        exclude group: 'org.springframework', name: 'spring'
-    }
-    compile group: 'org.springframework', name: 'spring-web', version: '3.0.4.RELEASE'
-    compile group: 'com.thoughtworks.xstream', name: 'xstream', version: '1.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: 'joda-time', name: 'joda-time', version: '1.6.2'
-
-    //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'
-}

data/spec/lib/generators/app_generator/templates/ivy_spring3.xml

@@ -1,40 +0,0 @@
-<ivy-module version="2.0">
-	<info organisation="vraptor-scaffold" module="vraptor-scaffold" />
-
-	<configurations>
-		<conf name="default" description="dependencies used for compile" />
-		<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" />
-	</configurations>
-
-	<dependencies>
-		<dependency org="br.com.caelum" name="vraptor" rev="3.2.0" conf="default">
-			<exclude org="org.springframework" name="spring" />
-		</dependency>
-		<dependency org="org.springframework" name="spring-web" rev="3.0.4.RELEASE" conf="default" />
-		<dependency org="com.thoughtworks.xstream" name="xstream" rev="1.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="joda-time" name="joda-time" rev="1.6.2" 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.8.2" 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" />
-	</dependencies>
-</ivy-module>

data/spec/lib/generators/app_generator/templates/pom_spring3.xml

@@ -1,163 +0,0 @@
-<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>vraptor-scaffold</groupId>
-	<artifactId>vraptor-scaffold</artifactId>
-	<packaging>war</packaging>
-	<version>0.0.1-SNAPSHOT</version>
-	<name>vraptor-scaffold</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</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>
-		</plugins>
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>br.com.caelum</groupId>
-			<artifactId>vraptor</artifactId>
-			<version>3.2.0</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-			<version>3.0.4.RELEASE</version>
-		</dependency>
-		<dependency>
-			<groupId>com.thoughtworks.xstream</groupId>
-			<artifactId>xstream</artifactId>
-			<version>1.3.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
-			<version>2.0.0</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>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>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-validator</artifactId>
-			<version>3.1.0.GA</version>
-		</dependency>
-		<dependency>
-			<groupId>joda-time</groupId>
-			<artifactId>joda-time</artifactId>
-			<version>1.6.2</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 -->
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet.jsp</groupId>
-			<artifactId>jsp-api</artifactId>
-			<version>2.1</version>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
-
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.4</version>
-			</plugin>
-		</plugins>
-	</reporting>
-</project>