vraptor-scaffold 1.0.0 → 1.1.0.pre

data/Gemfile

@@ -1,17 +1,2 @@
-source :rubygems
-
-gem "thor", "0.14.6"
-gem "rake", "0.8.7"
-gem "activesupport", "3.0.1"
-
-gem "ruby-debug", :group => [:development, :test]
-
-group :development do
-  gem "jeweler", "1.4.0"
-end
-
-group :test do
-  gem "ZenTest", "4.4.0"
-  gem "rspec", "1.3.1", :require => "spec"
-  gem "rcov", "0.9.9"
-end
+source "http://rubygems.org"
+gemspec

data/Gemfile.lock

@@ -1,16 +1,16 @@
+PATH
+  remote: .
+  specs:
+    vraptor-scaffold (0.0.1)
+      activesupport (= 3.0.1)
+      thor (= 0.14.6)
+
 GEM
   remote: http://rubygems.org/
   specs:
     ZenTest (4.4.0)
     activesupport (3.0.1)
     columnize (0.3.2)
-    gemcutter (0.6.1)
-    git (1.2.5)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
-      git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
-    json_pure (1.4.6)
     linecache (0.43)
     rake (0.8.7)
     rcov (0.9.9)
@@ -20,8 +20,6 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
     thor (0.14.6)
 
 PLATFORMS
@@ -30,9 +28,9 @@ PLATFORMS
 DEPENDENCIES
   ZenTest (= 4.4.0)
   activesupport (= 3.0.1)
-  jeweler (= 1.4.0)
   rake (= 0.8.7)
   rcov (= 0.9.9)
   rspec (= 1.3.1)
   ruby-debug
   thor (= 0.14.6)
+  vraptor-scaffold!

data/History.txt

@@ -1,9 +1,26 @@
+=== 1.1.0 / 2011-??-??
+
+== New Features
+* JPA 2 support using hibernate 3.6.1.Final. (Issue 13)
+* ant task to minify js and css. (Issue 27)
+* created prelude to automatic import taglibs in jsp.
+* added css reset to reduce browsers inconsistencies.
+
+== Improvements
+* updated hibernate validator to 4.1.0.Final.
+* changed html DTD to XHTML.
+* declared css encoding.
+* better repository and controller encapsulation.
+* added head with title tag for sitemesh capture it in jsp views.
+* updated vraptor to 3.3.1.
+* updated jquery to 1.5.1.
+
 === 1.0.0 / 2011-02-04
 
 == Improvements
 * updated vraptor to 3.3.0
 * updated jquery to 1.5
-* decorators folder inside WEB-INF
+* decorators folder inside WEB-INF (Issue 24)
 * removed spring 3 option.
 
 === 0.0.4 / 2010-11-20

data/Rakefile

@@ -1,24 +1,5 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "vraptor-scaffold"
-    gem.summary = "VRaptor Scaffold."
-    gem.description = "VRaptor scaffold extension to make it easier configuring new projects and plugins."
-    gem.email = "rodolfoliviero@gmail.com"
-    gem.homepage = "http://github.com/caelum/vraptor-scaffold"
-    gem.authors = ["Rodolfo Liviero"]
-    gem.add_dependency "thor", "0.14.6"
-    gem.add_dependency "rake", "0.8.7"
-    gem.add_dependency "activesupport", "3.0.1"
-    gem.post_install_message = "Thank you for installing vraptor-scaffold. Please read http://github.com/caelum/vraptor-scaffold/blob/master/README.textile for more information."
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|
@@ -34,7 +15,7 @@ end
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  version = VraptorScaffold::VERSION
 
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "vraptor-scaffold #{version}"
@@ -42,5 +23,4 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-task :spec => :check_dependencies
 task :default => [:spec]

data/bin/vraptor

@@ -3,5 +3,5 @@
 require File.dirname(__FILE__) + '/../lib/vraptor-scaffold'
 
 begin
-  VraptorScaffold::Main.execute(ARGV.dup)
+  VraptorScaffold.execute(ARGV.dup)
 end

data/lib/vraptor-scaffold.rb

@@ -1,36 +1,33 @@
-require File.dirname(__FILE__) + '/load_paths'
+require File.dirname(__FILE__) + '/vraptor-scaffold/load_paths'
 
 module VraptorScaffold
-  class Main
-
-    def self.execute(args)
-      action = args.shift
-      print_help(AppGenerator) if help? action
-      run_app_generator(args.shift, args) if action == "new"
-      run_scaffold_generator(args) if action == "scaffold"
-    end
-
-    def self.run_app_generator(project_path, args)
-      print_help(AppGenerator) if help? project_path
-      AppGenerator.new(project_path, args).invoke_all
-    end
+  def self.execute(args)
+    action = args.shift
+    print_help(AppGenerator) if help? action
+    run_app_generator(args.shift, args) if action == "new"
+    run_scaffold_generator(args) if action == "scaffold"
+  end
 
-    def self.run_scaffold_generator(args)
-      print_help(ScaffoldGenerator) if help? args.first
-      unless File.exist?("src")
-        puts "To run vraptor scaffold please go to the project root folder."
-        Kernel::exit
-      end
-      ScaffoldGenerator.new(args).invoke_all 
-    end
+  def self.run_app_generator(project_path, args)
+    print_help(AppGenerator) if help? project_path
+    AppGenerator.new(project_path, args).invoke_all
+  end
 
-    def self.print_help(generator)
-      generator.start(["-h"])
+  def self.run_scaffold_generator(args)
+    print_help(ScaffoldGenerator) if help? args.first
+    unless File.exist?("src")
+      puts "To run vraptor scaffold please go to the project root folder."
       Kernel::exit
     end
+    ScaffoldGenerator.new(args).invoke_all
+  end
+
+  def self.print_help(generator)
+    generator.start(["-h"])
+    Kernel::exit
+  end
 
-    def self.help?(command)
-      [nil, "-h", "--help"].include?(command)
-    end    
+  def self.help?(command)
+    [nil, "-h", "--help"].include?(command)
   end
-end
+end

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

@@ -47,7 +47,8 @@ class AppGenerator < VraptorScaffold::Base
       create_eclipse_files unless options[:skip_eclipse]
       copy_file("build.xml")
       template("build.properties.erb", "build.properties") 
-      template("ivy.erb", "ivy.xml") 
+      template("ivy.erb", "ivy.xml")
+      copy_file("ivysettings.xml") 
       copy_file(IVY_JAR)
     end
   end

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

@@ -22,13 +22,11 @@ class DependencyManager
   
   private
   def default_dependencies
-    [ Dependency.new("br.com.caelum", "vraptor", "3.3.0"),
-        Dependency.new("net.sf.scannotation", "scannotation", "1.0.2"), Dependency.new("org.hsqldb", "hsqldb", "2.0.0"),
+    [ Dependency.new("br.com.caelum", "vraptor", "3.3.1"),
+        Dependency.new("org.hsqldb", "hsqldb", "2.0.0"),
         Dependency.new("opensymphony", "sitemesh", "2.4.2"), Dependency.new("javax.servlet", "jstl", "1.2"),
-        Dependency.new("javax.persistence", "persistence-api", "1.0"), 
-        Dependency.new("org.hibernate", "hibernate-entitymanager", "3.4.0.GA"),
-        Dependency.new("org.hibernate", "hibernate-core", "3.3.2.GA"),
-        Dependency.new("org.hibernate", "hibernate-validator", "3.1.0.GA"),
+        Dependency.new("org.hibernate", "hibernate-entitymanager", "3.6.1.Final"),
+        Dependency.new("org.hibernate", "hibernate-validator", "4.1.0.Final"),
         Dependency.new("joda-time", "joda-time", "1.6.2")]
   end
   

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

@@ -13,7 +13,7 @@ class FreemarkerTemplateEngine < VraptorScaffold::Base
   def configure
     directory("macros", File.join(Configuration::WEB_APP, "macros"))
     template("../decorators.erb", File.join(Configuration::WEB_INF, "decorators.xml"))
-    copy_file("main.ftl", File.join(Configuration::WEB_INF, view_path, "main.ftl"))
+    copy_file("main.ftl", File.join(Configuration::WEB_INF, decorators_path, "main.ftl"))
     directory("infrastructure", infra_path)
     append_freemarker_servlet
   end
@@ -22,7 +22,7 @@ class FreemarkerTemplateEngine < VraptorScaffold::Base
     "ftl"
   end
   
-  def view_path
+  def decorators_path
     File.join "views", "decorators"
   end
 
@@ -41,5 +41,4 @@ class FreemarkerTemplateEngine < VraptorScaffold::Base
   def infra_path
     File.join Configuration::MAIN_SRC, package.gsub(".", File::Separator), "infrastructure"
   end
-  
-end
+end

data/lib/vraptor-scaffold/generators/app_generator/jsp_template_engine.rb

@@ -0,0 +1,33 @@
+class JspTemplateEngine < VraptorScaffold::Base
+
+  def self.source_root
+    File.join(File.dirname(__FILE__), "templates", "jsp")
+  end
+
+  def initialize(project_path)
+    super
+    self.destination_root=(project_path)
+  end
+
+  def configure
+    template("../decorators.erb", File.join(Configuration::WEB_INF, "decorators.xml"))
+    copy_file("main.jsp", File.join(Configuration::WEB_INF, decorators_path, "main.jsp"))
+    copy_file("prelude.jspf", File.join(Configuration::WEB_INF, "jsp", "prelude.jspf"))
+    append_prelude_config
+  end
+
+  def extension
+    "jsp"
+  end
+  
+  def decorators_path
+    File.join "jsp", "decorators"
+  end
+  
+  private
+  def append_prelude_config
+    file = File.join(Configuration::WEB_INF, "web.xml")
+    template = File.join JspTemplateEngine.source_root, "jsp-web.xml"
+    inject_into_file(file, File.read(template), :before => "</web-app>", :verbose => false)
+  end
+end

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

@@ -1,5 +1,6 @@
 repositories {
     mavenCentral()
+    mavenRepo urls: "https://repository.jboss.org/nexus/content/groups/public-jboss"
 }
 
 apply plugin: 'java'

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

@@ -4,6 +4,8 @@ output.dir=target
 test.build.dir=target/test-classes
 
 webapp.dir=<%= Configuration::WEB_APP %>
+js.dir=<%= Configuration::WEB_APP %>/javascripts
+css.dir=<%= Configuration::WEB_APP %>/stylesheets
 lib.dir=<%= Configuration::WEB_INF %>/lib
 build.dir=<%= Configuration::WEB_INF %>/classes
 

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

@@ -99,6 +99,38 @@
 		</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              
          ================================= -->

data/lib/{generators → vraptor-scaffold/generators}/app_generator/templates/decorators.erb

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

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

@@ -20,4 +20,3 @@
 		<servlet-name>sitemesh-freemarker</servlet-name>
 		<url-pattern>*.ftl</url-pattern>
 	</servlet-mapping>
-

data/lib/{generators → vraptor-scaffold/generators}/app_generator/templates/freemarker/main.ftl

@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

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

@@ -3,9 +3,10 @@
 
 	<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_manager.compile_scope.each do |dependency| -%>
@@ -23,5 +24,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/lib/vraptor-scaffold/generators/app_generator/templates/ivysettings.xml

@@ -0,0 +1,9 @@
+<ivysettings>
+	<settings defaultResolver="chain" />
+	<resolvers>
+		<chain name="chain">
+			<ibiblio name="central" m2compatible="true" />
+			<ibiblio name="jboss" m2compatible="true" root="https://repository.jboss.org/nexus/content/groups/public-jboss" />
+		</chain>
+	</resolvers>
+</ivysettings>

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

@@ -0,0 +1,7 @@
+	<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>

data/lib/vraptor-scaffold/generators/app_generator/templates/jsp/main.jsp

@@ -0,0 +1,16 @@
+<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title><decorator:title default="Vraptor Scaffold"/></title>
+    <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/stylesheets/stylesheets.css"/>  
+    <decorator:head/>
+  </head>
+  <body>
+    <decorator:body/>
+    <script type="text/javascript" src="${pageContext.request.contextPath}/javascripts/jquery.min.js"/></script>
+  </body>
+</html>