vraptor-scaffold 1.2.0 → 1.2.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (24) hide show
  1. data/.travis.yml +0 -1
  2. data/CHANGELOG.rdoc +4 -1
  3. data/Gemfile.lock +1 -1
  4. data/README.textile +4 -0
  5. data/lib/vraptor-scaffold/generators/app/app_generator.rb +1 -1
  6. data/lib/vraptor-scaffold/generators/app/dependency_manager.rb +4 -3
  7. data/lib/vraptor-scaffold/generators/app/templates/freemarker/main.ftl +1 -1
  8. data/lib/vraptor-scaffold/generators/app/templates/jsp/main.jsp +1 -1
  9. data/lib/vraptor-scaffold/generators/app/templates/webapp/stylesheets/application.css +3 -0
  10. data/lib/vraptor-scaffold/version.rb +1 -1
  11. data/spec/vraptor-scaffold/generators/app/app_generator_spec.rb +2 -8
  12. data/spec/vraptor-scaffold/generators/app/templates/build.gradle +3 -2
  13. data/spec/vraptor-scaffold/generators/app/templates/ivy.xml +3 -2
  14. data/spec/vraptor-scaffold/generators/app/templates/pom-heroku.xml +7 -2
  15. data/spec/vraptor-scaffold/generators/app/templates/pom.xml +7 -2
  16. data/spec/vraptor-scaffold/generators/plugin/expected_configs/build.gradle +3 -2
  17. data/spec/vraptor-scaffold/generators/plugin/expected_configs/default_org_build.gradle +3 -2
  18. data/spec/vraptor-scaffold/generators/plugin/expected_configs/default_org_ivy.xml +3 -2
  19. data/spec/vraptor-scaffold/generators/plugin/expected_configs/default_org_pom.xml +7 -2
  20. data/spec/vraptor-scaffold/generators/plugin/expected_configs/ivy.xml +3 -2
  21. data/spec/vraptor-scaffold/generators/plugin/expected_configs/pom.xml +7 -2
  22. metadata +67 -73
  23. data/lib/vraptor-scaffold/generators/app/templates/webapp/stylesheets/common.css +0 -0
  24. data/lib/vraptor-scaffold/generators/app/templates/webapp/stylesheets/stylesheets.css +0 -4
data/.travis.yml CHANGED
@@ -3,5 +3,4 @@ notifications:
3
3
  - rodolfo.liviero@gmail.com
4
4
 
5
5
  rvm:
6
- - 1.8.7
7
6
  - 1.9.2
data/CHANGELOG.rdoc CHANGED
@@ -1,4 +1,4 @@
1
- == 1.2.0 / 2011-09-10
1
+ == 1.2.1 / 2011-10-18
2
2
 
3
3
  * New Features
4
4
  * heroku support (vraptor new app --heroku).
@@ -8,6 +8,7 @@
8
8
  * option to override repositories package (Use -r).
9
9
  * get always latest jquery version (Use - j to choose another one).
10
10
  * added c3p0 pool configurations.
11
+ * plugin install. (vraptor plugin install simple-mail -v 1.0.0)
11
12
 
12
13
  * Improvements
13
14
  * removed unnecessary EJB provider configuration.
@@ -17,6 +18,8 @@
17
18
  * removing the hibernate configuration repositories from build tools.
18
19
  * better helps commands.
19
20
  * removing jre classpath entry making eclipse use default.
21
+ * updated vraptor to 3.4.0.
22
+ * updated junit to 4.10.
20
23
  * updated hsqldb to 2.2.4.
21
24
  * updated freemarker to 2.3.18.
22
25
  * updated hibernate to 3.6.7.Final.
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- vraptor-scaffold (1.2.0)
4
+ vraptor-scaffold (1.2.1)
5
5
  activesupport (= 3.0.1)
6
6
  rake (= 0.9.2)
7
7
  thor (= 0.14.6)
data/README.textile CHANGED
@@ -1,3 +1,7 @@
1
+ h1. VRaptor Scaffold "!https://secure.travis-ci.org/caelum/vraptor-scaffold.png!":http://travis-ci.org/caelum/vraptor-scaffold
2
+
3
+ VRaptor Scaffold extension to make it easier configuring new projects and plugins.
4
+
1
5
  h1. Documentation
2
6
 
3
7
  Vraptor Scaffold website can be found at "http://vraptor.org":http://vraptor.org
data/lib/vraptor-scaffold/generators/app/app_generator.rb CHANGED
@@ -185,7 +185,7 @@ class AppGenerator < VraptorScaffold::Base
185
185
 
186
186
  require 'open-uri'
187
187
  begin
188
- Kernel::open(jquery_url)
188
+ Kernel::open(jquery_url) if options[:jquery] != 'latest version'
189
189
  rescue OpenURI::HTTPError => e
190
190
  download_url = "http://docs.jquery.com/Downloading_jQuery"
191
191
  puts "jQuery version #{options[:jquery]} was not found. Please visit the download page to see the versions available #{download_url}."
data/lib/vraptor-scaffold/generators/app/dependency_manager.rb CHANGED
@@ -13,7 +13,7 @@ class DependencyManager
13
13
  end
14
14
 
15
15
  def test_scope
16
- [Dependency.new("junit", "junit", "4.8.2"),
16
+ [Dependency.new("junit", "junit", "4.10"),
17
17
  Dependency.new("org.hamcrest", "hamcrest-all", "1.1"),
18
18
  Dependency.new("org.mockito", "mockito-all", "1.8.5")]
19
19
  end
@@ -28,13 +28,14 @@ class DependencyManager
28
28
  private
29
29
  def default_dependencies
30
30
  hibernate_version = "3.6.7.Final"
31
- [Dependency.new("br.com.caelum", "vraptor", "3.3.1"),
31
+ [Dependency.new("br.com.caelum", "vraptor", "3.4.0"),
32
32
  Dependency.new("org.hsqldb", "hsqldb", "2.2.4"),
33
33
  Dependency.new("opensymphony", "sitemesh", "2.4.2"), Dependency.new("javax.servlet", "jstl", "1.2"),
34
34
  Dependency.new("org.hibernate", "hibernate-entitymanager", hibernate_version),
35
35
  Dependency.new("org.hibernate", "hibernate-c3p0", hibernate_version),
36
36
  Dependency.new("org.hibernate", "hibernate-validator", "4.2.0.Final"),
37
- Dependency.new("joda-time", "joda-time", "2.0")]
37
+ Dependency.new("joda-time", "joda-time", "2.0"),
38
+ Dependency.new("com.thoughtworks.xstream", "xstream", "1.4.1")]
38
39
  end
39
40
 
40
41
  def append_heroku_dependencies_if_necessary dependencies
data/lib/vraptor-scaffold/generators/app/templates/freemarker/main.ftl CHANGED
@@ -2,7 +2,7 @@
2
2
  <html>
3
3
  <head>
4
4
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
5
- <@html.css "stylesheets"/>
5
+ <@html.css "application"/>
6
6
  <title>Vraptor Scaffold</title>
7
7
  ${head}
8
8
  </head>
data/lib/vraptor-scaffold/generators/app/templates/jsp/main.jsp CHANGED
@@ -6,7 +6,7 @@
6
6
  <head>
7
7
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
8
8
  <title><decorator:title default="Vraptor Scaffold"/></title>
9
- <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/stylesheets/stylesheets.css"/>
9
+ <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/stylesheets/application.css"/>
10
10
  <decorator:head/>
11
11
  </head>
12
12
  <body>
data/lib/vraptor-scaffold/generators/app/templates/webapp/stylesheets/application.css ADDED
@@ -0,0 +1,3 @@
1
+ @CHARSET "UTF-8";
2
+
3
+ @IMPORT url("scaffold.css");
data/lib/vraptor-scaffold/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module VraptorScaffold
2
- VERSION = "1.2.0"
2
+ VERSION = "1.2.1"
3
3
  end
data/spec/vraptor-scaffold/generators/app/app_generator_spec.rb CHANGED
@@ -176,15 +176,9 @@ describe AppGenerator do
176
176
  exists_and_identical?(source, destination)
177
177
  end
178
178
 
179
- it "should create common css" do
180
- source = "#{AppGenerator.source_root}/webapp/stylesheets/common.css"
181
- destination = "#{@webapp}/stylesheets/common.css"
182
- exists_and_identical?(source, destination)
183
- end
184
-
185
179
  it "should create stylesheets css" do
186
- source = "#{AppGenerator.source_root}/webapp/stylesheets/stylesheets.css"
187
- destination = "#{@webapp}/stylesheets/stylesheets.css"
180
+ source = "#{AppGenerator.source_root}/webapp/stylesheets/application.css"
181
+ destination = "#{@webapp}/stylesheets/application.css"
188
182
  exists_and_identical?(source, destination)
189
183
  end
190
184
 
data/spec/vraptor-scaffold/generators/app/templates/build.gradle CHANGED
@@ -39,7 +39,7 @@ jettyRun.contextPath = '/'
39
39
  [jettyRunWar,jettyStop]*.stopKey = 'stopKey'
40
40
 
41
41
  dependencies {
42
- compile group: 'br.com.caelum', name: 'vraptor', version: '3.3.1'
42
+ compile group: 'br.com.caelum', name: 'vraptor', version: '3.4.0'
43
43
  compile group: 'org.hsqldb', name: 'hsqldb', version: '2.2.4'
44
44
  compile group: 'opensymphony', name: 'sitemesh', version: '2.4.2'
45
45
  compile group: 'javax.servlet', name: 'jstl', version: '1.2'
@@ -47,13 +47,14 @@ dependencies {
47
47
  compile group: 'org.hibernate', name: 'hibernate-c3p0', version: '3.6.7.Final'
48
48
  compile group: 'org.hibernate', name: 'hibernate-validator', version: '4.2.0.Final'
49
49
  compile group: 'joda-time', name: 'joda-time', version: '2.0'
50
+ compile group: 'com.thoughtworks.xstream', name: 'xstream', version: '1.4.1'
50
51
 
51
52
  //Provided dependencies
52
53
  providedCompile group: 'javax.servlet', name: 'servlet-api', version: '2.5'
53
54
  providedCompile group: 'javax.servlet.jsp', name: 'jsp-api', version: '2.1'
54
55
 
55
56
  //Test dependencies
56
- testCompile group: 'junit', name: 'junit', version: '4.8.2'
57
+ testCompile group: 'junit', name: 'junit', version: '4.10'
57
58
  testCompile group: 'org.hamcrest', name: 'hamcrest-all', version: '1.1'
58
59
  testCompile group: 'org.mockito', name: 'mockito-all', version: '1.8.5'
59
60
  }
data/spec/vraptor-scaffold/generators/app/templates/ivy.xml CHANGED
@@ -10,7 +10,7 @@
10
10
  </configurations>
11
11
 
12
12
  <dependencies>
13
- <dependency org="br.com.caelum" name="vraptor" rev="3.3.1" conf="default" />
13
+ <dependency org="br.com.caelum" name="vraptor" rev="3.4.0" conf="default" />
14
14
  <dependency org="org.hsqldb" name="hsqldb" rev="2.2.4" conf="default" />
15
15
  <dependency org="opensymphony" name="sitemesh" rev="2.4.2" conf="default" />
16
16
  <dependency org="javax.servlet" name="jstl" rev="1.2" conf="default" />
@@ -18,13 +18,14 @@
18
18
  <dependency org="org.hibernate" name="hibernate-c3p0" rev="3.6.7.Final" conf="default" />
19
19
  <dependency org="org.hibernate" name="hibernate-validator" rev="4.2.0.Final" conf="default" />
20
20
  <dependency org="joda-time" name="joda-time" rev="2.0" conf="default" />
21
+ <dependency org="com.thoughtworks.xstream" name="xstream" rev="1.4.1" conf="default" />
21
22
 
22
23
  <!-- Provided dependencies -->
23
24
  <dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="provided->default" />
24
25
  <dependency org="javax.servlet.jsp" name="jsp-api" rev="2.1" conf="provided->default" />
25
26
 
26
27
  <!-- Test dependencies -->
27
- <dependency org="junit" name="junit" rev="4.8.2" conf="test->default" />
28
+ <dependency org="junit" name="junit" rev="4.10" conf="test->default" />
28
29
  <dependency org="org.hamcrest" name="hamcrest-all" rev="1.1" conf="test->default" />
29
30
  <dependency org="org.mockito" name="mockito-all" rev="1.8.5" conf="test->default" />
30
31
 
data/spec/vraptor-scaffold/generators/app/templates/pom-heroku.xml CHANGED
@@ -80,7 +80,7 @@
80
80
  <dependency>
81
81
  <groupId>br.com.caelum</groupId>
82
82
  <artifactId>vraptor</artifactId>
83
- <version>3.3.1</version>
83
+ <version>3.4.0</version>
84
84
  </dependency>
85
85
  <dependency>
86
86
  <groupId>org.hsqldb</groupId>
@@ -117,6 +117,11 @@
117
117
  <artifactId>joda-time</artifactId>
118
118
  <version>2.0</version>
119
119
  </dependency>
120
+ <dependency>
121
+ <groupId>com.thoughtworks.xstream</groupId>
122
+ <artifactId>xstream</artifactId>
123
+ <version>1.4.1</version>
124
+ </dependency>
120
125
  <dependency>
121
126
  <groupId>org.eclipse.jetty</groupId>
122
127
  <artifactId>jetty-webapp</artifactId>
@@ -137,7 +142,7 @@
137
142
  <dependency>
138
143
  <groupId>junit</groupId>
139
144
  <artifactId>junit</artifactId>
140
- <version>4.8.2</version>
145
+ <version>4.10</version>
141
146
  <scope>test</scope>
142
147
  </dependency>
143
148
  <dependency>
data/spec/vraptor-scaffold/generators/app/templates/pom.xml CHANGED
@@ -57,7 +57,7 @@
57
57
  <dependency>
58
58
  <groupId>br.com.caelum</groupId>
59
59
  <artifactId>vraptor</artifactId>
60
- <version>3.3.1</version>
60
+ <version>3.4.0</version>
61
61
  </dependency>
62
62
  <dependency>
63
63
  <groupId>org.hsqldb</groupId>
@@ -94,12 +94,17 @@
94
94
  <artifactId>joda-time</artifactId>
95
95
  <version>2.0</version>
96
96
  </dependency>
97
+ <dependency>
98
+ <groupId>com.thoughtworks.xstream</groupId>
99
+ <artifactId>xstream</artifactId>
100
+ <version>1.4.1</version>
101
+ </dependency>
97
102
 
98
103
  <!-- Test dependencies -->
99
104
  <dependency>
100
105
  <groupId>junit</groupId>
101
106
  <artifactId>junit</artifactId>
102
- <version>4.8.2</version>
107
+ <version>4.10</version>
103
108
  <scope>test</scope>
104
109
  </dependency>
105
110
  <dependency>
data/spec/vraptor-scaffold/generators/plugin/expected_configs/build.gradle CHANGED
@@ -41,7 +41,7 @@ jettyRun.contextPath = '/'
41
41
  dependencies {
42
42
  compile group: 'br.com.caelum.vraptor.plugin', name: 'vraptor-environment', version: '0.0.8'
43
43
 
44
- compile group: 'br.com.caelum', name: 'vraptor', version: '3.3.1'
44
+ compile group: 'br.com.caelum', name: 'vraptor', version: '3.4.0'
45
45
  compile group: 'org.hsqldb', name: 'hsqldb', version: '2.2.4'
46
46
  compile group: 'opensymphony', name: 'sitemesh', version: '2.4.2'
47
47
  compile group: 'javax.servlet', name: 'jstl', version: '1.2'
@@ -49,13 +49,14 @@ dependencies {
49
49
  compile group: 'org.hibernate', name: 'hibernate-c3p0', version: '3.6.7.Final'
50
50
  compile group: 'org.hibernate', name: 'hibernate-validator', version: '4.2.0.Final'
51
51
  compile group: 'joda-time', name: 'joda-time', version: '2.0'
52
+ compile group: 'com.thoughtworks.xstream', name: 'xstream', version: '1.4.1'
52
53
 
53
54
  //Provided dependencies
54
55
  providedCompile group: 'javax.servlet', name: 'servlet-api', version: '2.5'
55
56
  providedCompile group: 'javax.servlet.jsp', name: 'jsp-api', version: '2.1'
56
57
 
57
58
  //Test dependencies
58
- testCompile group: 'junit', name: 'junit', version: '4.8.2'
59
+ testCompile group: 'junit', name: 'junit', version: '4.10'
59
60
  testCompile group: 'org.hamcrest', name: 'hamcrest-all', version: '1.1'
60
61
  testCompile group: 'org.mockito', name: 'mockito-all', version: '1.8.5'
61
62
  }
data/spec/vraptor-scaffold/generators/plugin/expected_configs/default_org_build.gradle CHANGED
@@ -41,7 +41,7 @@ jettyRun.contextPath = '/'
41
41
  dependencies {
42
42
  compile group: 'br.com.caelum.vraptor', name: 'vraptor-environment', version: '0.0.8'
43
43
 
44
- compile group: 'br.com.caelum', name: 'vraptor', version: '3.3.1'
44
+ compile group: 'br.com.caelum', name: 'vraptor', version: '3.4.0'
45
45
  compile group: 'org.hsqldb', name: 'hsqldb', version: '2.2.4'
46
46
  compile group: 'opensymphony', name: 'sitemesh', version: '2.4.2'
47
47
  compile group: 'javax.servlet', name: 'jstl', version: '1.2'
@@ -49,13 +49,14 @@ dependencies {
49
49
  compile group: 'org.hibernate', name: 'hibernate-c3p0', version: '3.6.7.Final'
50
50
  compile group: 'org.hibernate', name: 'hibernate-validator', version: '4.2.0.Final'
51
51
  compile group: 'joda-time', name: 'joda-time', version: '2.0'
52
+ compile group: 'com.thoughtworks.xstream', name: 'xstream', version: '1.4.1'
52
53
 
53
54
  //Provided dependencies
54
55
  providedCompile group: 'javax.servlet', name: 'servlet-api', version: '2.5'
55
56
  providedCompile group: 'javax.servlet.jsp', name: 'jsp-api', version: '2.1'
56
57
 
57
58
  //Test dependencies
58
- testCompile group: 'junit', name: 'junit', version: '4.8.2'
59
+ testCompile group: 'junit', name: 'junit', version: '4.10'
59
60
  testCompile group: 'org.hamcrest', name: 'hamcrest-all', version: '1.1'
60
61
  testCompile group: 'org.mockito', name: 'mockito-all', version: '1.8.5'
61
62
  }
data/spec/vraptor-scaffold/generators/plugin/expected_configs/default_org_ivy.xml CHANGED
@@ -11,7 +11,7 @@
11
11
 
12
12
  <dependencies>
13
13
  <dependency org="br.com.caelum.vraptor" name="vraptor-environment" rev="0.0.8" conf="default" />
14
- <dependency org="br.com.caelum" name="vraptor" rev="3.3.1" conf="default" />
14
+ <dependency org="br.com.caelum" name="vraptor" rev="3.4.0" conf="default" />
15
15
  <dependency org="org.hsqldb" name="hsqldb" rev="2.2.4" conf="default" />
16
16
  <dependency org="opensymphony" name="sitemesh" rev="2.4.2" conf="default" />
17
17
  <dependency org="javax.servlet" name="jstl" rev="1.2" conf="default" />
@@ -19,13 +19,14 @@
19
19
  <dependency org="org.hibernate" name="hibernate-c3p0" rev="3.6.7.Final" conf="default" />
20
20
  <dependency org="org.hibernate" name="hibernate-validator" rev="4.2.0.Final" conf="default" />
21
21
  <dependency org="joda-time" name="joda-time" rev="2.0" conf="default" />
22
+ <dependency org="com.thoughtworks.xstream" name="xstream" rev="1.4.1" conf="default" />
22
23
 
23
24
  <!-- Provided dependencies -->
24
25
  <dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="provided->default" />
25
26
  <dependency org="javax.servlet.jsp" name="jsp-api" rev="2.1" conf="provided->default" />
26
27
 
27
28
  <!-- Test dependencies -->
28
- <dependency org="junit" name="junit" rev="4.8.2" conf="test->default" />
29
+ <dependency org="junit" name="junit" rev="4.10" conf="test->default" />
29
30
  <dependency org="org.hamcrest" name="hamcrest-all" rev="1.1" conf="test->default" />
30
31
  <dependency org="org.mockito" name="mockito-all" rev="1.8.5" conf="test->default" />
31
32
 
data/spec/vraptor-scaffold/generators/plugin/expected_configs/default_org_pom.xml CHANGED
@@ -62,7 +62,7 @@
62
62
  <dependency>
63
63
  <groupId>br.com.caelum</groupId>
64
64
  <artifactId>vraptor</artifactId>
65
- <version>3.3.1</version>
65
+ <version>3.4.0</version>
66
66
  </dependency>
67
67
  <dependency>
68
68
  <groupId>org.hsqldb</groupId>
@@ -99,12 +99,17 @@
99
99
  <artifactId>joda-time</artifactId>
100
100
  <version>2.0</version>
101
101
  </dependency>
102
+ <dependency>
103
+ <groupId>com.thoughtworks.xstream</groupId>
104
+ <artifactId>xstream</artifactId>
105
+ <version>1.4.1</version>
106
+ </dependency>
102
107
 
103
108
  <!-- Test dependencies -->
104
109
  <dependency>
105
110
  <groupId>junit</groupId>
106
111
  <artifactId>junit</artifactId>
107
- <version>4.8.2</version>
112
+ <version>4.10</version>
108
113
  <scope>test</scope>
109
114
  </dependency>
110
115
  <dependency>
data/spec/vraptor-scaffold/generators/plugin/expected_configs/ivy.xml CHANGED
@@ -11,7 +11,7 @@
11
11
 
12
12
  <dependencies>
13
13
  <dependency org="br.com.caelum.vraptor.plugin" name="vraptor-environment" rev="0.0.8" conf="default" />
14
- <dependency org="br.com.caelum" name="vraptor" rev="3.3.1" conf="default" />
14
+ <dependency org="br.com.caelum" name="vraptor" rev="3.4.0" conf="default" />
15
15
  <dependency org="org.hsqldb" name="hsqldb" rev="2.2.4" conf="default" />
16
16
  <dependency org="opensymphony" name="sitemesh" rev="2.4.2" conf="default" />
17
17
  <dependency org="javax.servlet" name="jstl" rev="1.2" conf="default" />
@@ -19,13 +19,14 @@
19
19
  <dependency org="org.hibernate" name="hibernate-c3p0" rev="3.6.7.Final" conf="default" />
20
20
  <dependency org="org.hibernate" name="hibernate-validator" rev="4.2.0.Final" conf="default" />
21
21
  <dependency org="joda-time" name="joda-time" rev="2.0" conf="default" />
22
+ <dependency org="com.thoughtworks.xstream" name="xstream" rev="1.4.1" conf="default" />
22
23
 
23
24
  <!-- Provided dependencies -->
24
25
  <dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="provided->default" />
25
26
  <dependency org="javax.servlet.jsp" name="jsp-api" rev="2.1" conf="provided->default" />
26
27
 
27
28
  <!-- Test dependencies -->
28
- <dependency org="junit" name="junit" rev="4.8.2" conf="test->default" />
29
+ <dependency org="junit" name="junit" rev="4.10" conf="test->default" />
29
30
  <dependency org="org.hamcrest" name="hamcrest-all" rev="1.1" conf="test->default" />
30
31
  <dependency org="org.mockito" name="mockito-all" rev="1.8.5" conf="test->default" />
31
32
 
data/spec/vraptor-scaffold/generators/plugin/expected_configs/pom.xml CHANGED
@@ -62,7 +62,7 @@
62
62
  <dependency>
63
63
  <groupId>br.com.caelum</groupId>
64
64
  <artifactId>vraptor</artifactId>
65
- <version>3.3.1</version>
65
+ <version>3.4.0</version>
66
66
  </dependency>
67
67
  <dependency>
68
68
  <groupId>org.hsqldb</groupId>
@@ -99,12 +99,17 @@
99
99
  <artifactId>joda-time</artifactId>
100
100
  <version>2.0</version>
101
101
  </dependency>
102
+ <dependency>
103
+ <groupId>com.thoughtworks.xstream</groupId>
104
+ <artifactId>xstream</artifactId>
105
+ <version>1.4.1</version>
106
+ </dependency>
102
107
 
103
108
  <!-- Test dependencies -->
104
109
  <dependency>
105
110
  <groupId>junit</groupId>
106
111
  <artifactId>junit</artifactId>
107
- <version>4.8.2</version>
112
+ <version>4.10</version>
108
113
  <scope>test</scope>
109
114
  </dependency>
110
115
  <dependency>
metadata CHANGED
@@ -1,92 +1,90 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: vraptor-scaffold
3
- version: !ruby/object:Gem::Version
3
+ version: !ruby/object:Gem::Version
4
+ version: 1.2.1
4
5
  prerelease:
5
- version: 1.2.0
6
6
  platform: ruby
7
- authors:
7
+ authors:
8
8
  - Rodolfo Liviero
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
-
13
- date: 2011-09-10 00:00:00 Z
14
- dependencies:
15
- - !ruby/object:Gem::Dependency
12
+ date: 2011-10-18 00:00:00.000000000Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
16
15
  name: thor
17
- prerelease: false
18
- requirement: &id001 !ruby/object:Gem::Requirement
16
+ requirement: &70293683728980 !ruby/object:Gem::Requirement
19
17
  none: false
20
- requirements:
21
- - - "="
22
- - !ruby/object:Gem::Version
18
+ requirements:
19
+ - - =
20
+ - !ruby/object:Gem::Version
23
21
  version: 0.14.6
24
22
  type: :runtime
25
- version_requirements: *id001
26
- - !ruby/object:Gem::Dependency
27
- name: activesupport
28
23
  prerelease: false
29
- requirement: &id002 !ruby/object:Gem::Requirement
24
+ version_requirements: *70293683728980
25
+ - !ruby/object:Gem::Dependency
26
+ name: activesupport
27
+ requirement: &70293683728480 !ruby/object:Gem::Requirement
30
28
  none: false
31
- requirements:
32
- - - "="
33
- - !ruby/object:Gem::Version
29
+ requirements:
30
+ - - =
31
+ - !ruby/object:Gem::Version
34
32
  version: 3.0.1
35
33
  type: :runtime
36
- version_requirements: *id002
37
- - !ruby/object:Gem::Dependency
38
- name: rake
39
34
  prerelease: false
40
- requirement: &id003 !ruby/object:Gem::Requirement
35
+ version_requirements: *70293683728480
36
+ - !ruby/object:Gem::Dependency
37
+ name: rake
38
+ requirement: &70293683728020 !ruby/object:Gem::Requirement
41
39
  none: false
42
- requirements:
43
- - - "="
44
- - !ruby/object:Gem::Version
40
+ requirements:
41
+ - - =
42
+ - !ruby/object:Gem::Version
45
43
  version: 0.9.2
46
44
  type: :runtime
47
- version_requirements: *id003
48
- - !ruby/object:Gem::Dependency
49
- name: rspec
50
45
  prerelease: false
51
- requirement: &id004 !ruby/object:Gem::Requirement
46
+ version_requirements: *70293683728020
47
+ - !ruby/object:Gem::Dependency
48
+ name: rspec
49
+ requirement: &70293683727560 !ruby/object:Gem::Requirement
52
50
  none: false
53
- requirements:
54
- - - "="
55
- - !ruby/object:Gem::Version
51
+ requirements:
52
+ - - =
53
+ - !ruby/object:Gem::Version
56
54
  version: 1.3.2
57
55
  type: :development
58
- version_requirements: *id004
59
- - !ruby/object:Gem::Dependency
60
- name: ZenTest
61
56
  prerelease: false
62
- requirement: &id005 !ruby/object:Gem::Requirement
57
+ version_requirements: *70293683727560
58
+ - !ruby/object:Gem::Dependency
59
+ name: ZenTest
60
+ requirement: &70293683727100 !ruby/object:Gem::Requirement
63
61
  none: false
64
- requirements:
65
- - - "="
66
- - !ruby/object:Gem::Version
62
+ requirements:
63
+ - - =
64
+ - !ruby/object:Gem::Version
67
65
  version: 4.4.0
68
66
  type: :development
69
- version_requirements: *id005
70
- - !ruby/object:Gem::Dependency
71
- name: rcov
72
67
  prerelease: false
73
- requirement: &id006 !ruby/object:Gem::Requirement
68
+ version_requirements: *70293683727100
69
+ - !ruby/object:Gem::Dependency
70
+ name: rcov
71
+ requirement: &70293683726640 !ruby/object:Gem::Requirement
74
72
  none: false
75
- requirements:
76
- - - "="
77
- - !ruby/object:Gem::Version
73
+ requirements:
74
+ - - =
75
+ - !ruby/object:Gem::Version
78
76
  version: 0.9.9
79
77
  type: :development
80
- version_requirements: *id006
81
- description: VRaptor scaffold extension to make it easier configuring new projects and plugins.
78
+ prerelease: false
79
+ version_requirements: *70293683726640
80
+ description: VRaptor scaffold extension to make it easier configuring new projects
81
+ and plugins.
82
82
  email: rodolfoliviero@gmail.com
83
- executables:
83
+ executables:
84
84
  - vraptor
85
85
  extensions: []
86
-
87
86
  extra_rdoc_files: []
88
-
89
- files:
87
+ files:
90
88
  - .gitignore
91
89
  - .travis.yml
92
90
  - CHANGELOG.rdoc
@@ -141,9 +139,8 @@ files:
141
139
  - lib/vraptor-scaffold/generators/app/templates/webapp/WEB-INF/web.xml.tt
142
140
  - lib/vraptor-scaffold/generators/app/templates/webapp/images/.empty_directory
143
141
  - lib/vraptor-scaffold/generators/app/templates/webapp/index.jsp
144
- - lib/vraptor-scaffold/generators/app/templates/webapp/stylesheets/common.css
142
+ - lib/vraptor-scaffold/generators/app/templates/webapp/stylesheets/application.css
145
143
  - lib/vraptor-scaffold/generators/app/templates/webapp/stylesheets/scaffold.css
146
- - lib/vraptor-scaffold/generators/app/templates/webapp/stylesheets/stylesheets.css
147
144
  - lib/vraptor-scaffold/generators/base.rb
148
145
  - lib/vraptor-scaffold/generators/plugin/plugin_generator.rb
149
146
  - lib/vraptor-scaffold/generators/plugin/vraptor_gem.rb
@@ -238,30 +235,27 @@ files:
238
235
  - vraptor-scaffold.gemspec
239
236
  homepage: http://github.com/caelum/vraptor-scaffold
240
237
  licenses: []
241
-
242
- post_install_message: Thank you for installing vraptor-scaffold. Please read http://github.com/caelum/vraptor-scaffold/blob/master/README.textile for more information.
238
+ post_install_message: Thank you for installing vraptor-scaffold. Please read http://github.com/caelum/vraptor-scaffold/blob/master/README.textile
239
+ for more information.
243
240
  rdoc_options: []
244
-
245
- require_paths:
241
+ require_paths:
246
242
  - lib
247
- required_ruby_version: !ruby/object:Gem::Requirement
243
+ required_ruby_version: !ruby/object:Gem::Requirement
248
244
  none: false
249
- requirements:
250
- - - ">="
251
- - !ruby/object:Gem::Version
252
- version: "0"
253
- required_rubygems_version: !ruby/object:Gem::Requirement
245
+ requirements:
246
+ - - ! '>='
247
+ - !ruby/object:Gem::Version
248
+ version: '0'
249
+ required_rubygems_version: !ruby/object:Gem::Requirement
254
250
  none: false
255
- requirements:
256
- - - ">="
257
- - !ruby/object:Gem::Version
258
- version: "0"
251
+ requirements:
252
+ - - ! '>='
253
+ - !ruby/object:Gem::Version
254
+ version: '0'
259
255
  requirements: []
260
-
261
256
  rubyforge_project:
262
- rubygems_version: 1.8.8
257
+ rubygems_version: 1.8.11
263
258
  signing_key:
264
259
  specification_version: 3
265
260
  summary: VRaptor Scaffold.
266
261
  test_files: []
267
-
data/lib/vraptor-scaffold/generators/app/templates/webapp/stylesheets/stylesheets.css DELETED
@@ -1,4 +0,0 @@
1
- @CHARSET "UTF-8";
2
-
3
- @IMPORT url("common.css");
4
- @IMPORT url("scaffold.css");