vraptor-scaffold 0.0.4 → 1.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -6,7 +6,7 @@ describe JspTemplateEngine do
6
6
  before(:all) do
7
7
  @project_path = "src/vraptor-scaffold"
8
8
  @web_inf = "#{@project_path}/#{Configuration::WEB_INF}"
9
- @decorators = "#{@web_inf}/decorators"
9
+ @decorators = "#{@web_inf}/jsp/decorators"
10
10
  @app = "#{@project_path}/#{Configuration::MAIN_SRC}/app"
11
11
  AppGenerator.new(@project_path).invoke_all
12
12
  end
@@ -20,7 +20,8 @@ jettyRun.contextPath = '/'
20
20
  [jettyRunWar,jettyStop]*.stopKey = 'stopKey'
21
21
 
22
22
  dependencies {
23
- compile group: 'br.com.caelum', name: 'vraptor', version: '3.2.0'
23
+ compile group: 'br.com.caelum', name: 'vraptor', version: '3.3.0'
24
+ compile group: 'net.sf.scannotation', name: 'scannotation', version: '1.0.2'
24
25
  compile group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0'
25
26
  compile group: 'opensymphony', name: 'sitemesh', version: '2.4.2'
26
27
  compile group: 'javax.servlet', name: 'jstl', version: '1.2'
@@ -1,6 +1,6 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
 
3
- <decorators defaultdir="/WEB-INF/decorators">
3
+ <decorators defaultdir="/WEB-INF/jsp/decorators">
4
4
  <decorator name="main" page="main.jsp">
5
5
  <pattern>/*</pattern>
6
6
  </decorator>
@@ -1,6 +1,6 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
 
3
- <decorators defaultdir="/WEB-INF/decorators">
3
+ <decorators defaultdir="/WEB-INF/views/decorators">
4
4
  <decorator name="main" page="main.ftl">
5
5
  <pattern>/*</pattern>
6
6
  </decorator>
@@ -9,7 +9,8 @@
9
9
  </configurations>
10
10
 
11
11
  <dependencies>
12
- <dependency org="br.com.caelum" name="vraptor" rev="3.2.0" conf="default" />
12
+ <dependency org="br.com.caelum" name="vraptor" rev="3.3.0" conf="default" />
13
+ <dependency org="net.sf.scannotation" name="scannotation" rev="1.0.2" conf="default" />
13
14
  <dependency org="org.hsqldb" name="hsqldb" rev="2.0.0" conf="default" />
14
15
  <dependency org="opensymphony" name="sitemesh" rev="2.4.2" conf="default" />
15
16
  <dependency org="javax.servlet" name="jstl" rev="1.2" conf="default" />
@@ -57,7 +57,12 @@
57
57
  <dependency>
58
58
  <groupId>br.com.caelum</groupId>
59
59
  <artifactId>vraptor</artifactId>
60
- <version>3.2.0</version>
60
+ <version>3.3.0</version>
61
+ </dependency>
62
+ <dependency>
63
+ <groupId>net.sf.scannotation</groupId>
64
+ <artifactId>scannotation</artifactId>
65
+ <version>1.0.2</version>
61
66
  </dependency>
62
67
  <dependency>
63
68
  <groupId>org.hsqldb</groupId>
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{vraptor-scaffold}
8
- s.version = "0.0.4"
8
+ s.version = "1.0.0"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Rodolfo Liviero"]
12
- s.date = %q{2010-11-20}
12
+ s.date = %q{2011-02-04}
13
13
  s.default_executable = %q{vraptor}
14
14
  s.description = %q{VRaptor scaffold extension to make it easier configuring new projects and plugins.}
15
15
  s.email = %q{rodolfoliviero@gmail.com}
@@ -109,13 +109,10 @@ Gem::Specification.new do |s|
109
109
  "spec/lib/generators/app_generator/templates/Repository.java",
110
110
  "spec/lib/generators/app_generator/templates/build.gradle",
111
111
  "spec/lib/generators/app_generator/templates/build.properties",
112
- "spec/lib/generators/app_generator/templates/build_spring3.gradle",
113
112
  "spec/lib/generators/app_generator/templates/decorators-jsp.xml",
114
113
  "spec/lib/generators/app_generator/templates/decorators.xml",
115
114
  "spec/lib/generators/app_generator/templates/ivy.xml",
116
- "spec/lib/generators/app_generator/templates/ivy_spring3.xml",
117
115
  "spec/lib/generators/app_generator/templates/pom.xml",
118
- "spec/lib/generators/app_generator/templates/pom_spring3.xml",
119
116
  "spec/lib/generators/scaffold_generator/attribute_spec.rb",
120
117
  "spec/lib/generators/scaffold_generator/base_scaffold_spec.rb",
121
118
  "spec/lib/generators/scaffold_generator/controller_generator/controller_generator_spec.rb",
@@ -141,22 +138,22 @@ Gem::Specification.new do |s|
141
138
  s.rubygems_version = %q{1.3.7}
142
139
  s.summary = %q{VRaptor Scaffold.}
143
140
  s.test_files = [
144
- "spec/lib/configuration_spec.rb",
141
+ "spec/spec_helper.rb",
142
+ "spec/lib/vraptor-scaffold_spec.rb",
145
143
  "spec/lib/generators/app_generator/app_generator_spec.rb",
146
144
  "spec/lib/generators/app_generator/dependency_manager_spec.rb",
147
- "spec/lib/generators/app_generator/dependency_spec.rb",
148
145
  "spec/lib/generators/app_generator/freemarker_template_engine_spec.rb",
149
146
  "spec/lib/generators/app_generator/jsp_template_engine_spec.rb",
147
+ "spec/lib/generators/app_generator/dependency_spec.rb",
148
+ "spec/lib/generators/scaffold_generator/model_generator/model_generator_spec.rb",
149
+ "spec/lib/generators/scaffold_generator/freemarker_generator/freemarker_generator_spec.rb",
150
+ "spec/lib/generators/scaffold_generator/repository_generator/repository_generator_spec.rb",
150
151
  "spec/lib/generators/scaffold_generator/attribute_spec.rb",
151
152
  "spec/lib/generators/scaffold_generator/base_scaffold_spec.rb",
152
- "spec/lib/generators/scaffold_generator/controller_generator/controller_generator_spec.rb",
153
- "spec/lib/generators/scaffold_generator/freemarker_generator/freemarker_generator_spec.rb",
154
153
  "spec/lib/generators/scaffold_generator/jsp_generator/jsp_generator_spec.rb",
155
- "spec/lib/generators/scaffold_generator/model_generator/model_generator_spec.rb",
156
- "spec/lib/generators/scaffold_generator/repository_generator/repository_generator_spec.rb",
157
154
  "spec/lib/generators/scaffold_generator/scaffold_generator_spec.rb",
158
- "spec/lib/vraptor-scaffold_spec.rb",
159
- "spec/spec_helper.rb"
155
+ "spec/lib/generators/scaffold_generator/controller_generator/controller_generator_spec.rb",
156
+ "spec/lib/configuration_spec.rb"
160
157
  ]
161
158
 
162
159
  if s.respond_to? :specification_version then
@@ -164,16 +161,16 @@ Gem::Specification.new do |s|
164
161
  s.specification_version = 3
165
162
 
166
163
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
167
- s.add_runtime_dependency(%q<thor>, ["= 0.14.4"])
164
+ s.add_runtime_dependency(%q<thor>, ["= 0.14.6"])
168
165
  s.add_runtime_dependency(%q<rake>, ["= 0.8.7"])
169
166
  s.add_runtime_dependency(%q<activesupport>, ["= 3.0.1"])
170
167
  else
171
- s.add_dependency(%q<thor>, ["= 0.14.4"])
168
+ s.add_dependency(%q<thor>, ["= 0.14.6"])
172
169
  s.add_dependency(%q<rake>, ["= 0.8.7"])
173
170
  s.add_dependency(%q<activesupport>, ["= 3.0.1"])
174
171
  end
175
172
  else
176
- s.add_dependency(%q<thor>, ["= 0.14.4"])
173
+ s.add_dependency(%q<thor>, ["= 0.14.6"])
177
174
  s.add_dependency(%q<rake>, ["= 0.8.7"])
178
175
  s.add_dependency(%q<activesupport>, ["= 3.0.1"])
179
176
  end
metadata CHANGED
@@ -4,10 +4,10 @@ version: !ruby/object:Gem::Version
4
4
  hash: 23
5
5
  prerelease: false
6
6
  segments:
7
+ - 1
7
8
  - 0
8
9
  - 0
9
- - 4
10
- version: 0.0.4
10
+ version: 1.0.0
11
11
  platform: ruby
12
12
  authors:
13
13
  - Rodolfo Liviero
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2010-11-20 00:00:00 -02:00
18
+ date: 2011-02-04 00:00:00 -02:00
19
19
  default_executable: vraptor
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
@@ -26,12 +26,12 @@ dependencies:
26
26
  requirements:
27
27
  - - "="
28
28
  - !ruby/object:Gem::Version
29
- hash: 47
29
+ hash: 43
30
30
  segments:
31
31
  - 0
32
32
  - 14
33
- - 4
34
- version: 0.14.4
33
+ - 6
34
+ version: 0.14.6
35
35
  type: :runtime
36
36
  version_requirements: *id001
37
37
  - !ruby/object:Gem::Dependency
@@ -166,13 +166,10 @@ files:
166
166
  - spec/lib/generators/app_generator/templates/Repository.java
167
167
  - spec/lib/generators/app_generator/templates/build.gradle
168
168
  - spec/lib/generators/app_generator/templates/build.properties
169
- - spec/lib/generators/app_generator/templates/build_spring3.gradle
170
169
  - spec/lib/generators/app_generator/templates/decorators-jsp.xml
171
170
  - spec/lib/generators/app_generator/templates/decorators.xml
172
171
  - spec/lib/generators/app_generator/templates/ivy.xml
173
- - spec/lib/generators/app_generator/templates/ivy_spring3.xml
174
172
  - spec/lib/generators/app_generator/templates/pom.xml
175
- - spec/lib/generators/app_generator/templates/pom_spring3.xml
176
173
  - spec/lib/generators/scaffold_generator/attribute_spec.rb
177
174
  - spec/lib/generators/scaffold_generator/base_scaffold_spec.rb
178
175
  - spec/lib/generators/scaffold_generator/controller_generator/controller_generator_spec.rb
@@ -225,19 +222,19 @@ signing_key:
225
222
  specification_version: 3
226
223
  summary: VRaptor Scaffold.
227
224
  test_files:
228
- - spec/lib/configuration_spec.rb
225
+ - spec/spec_helper.rb
226
+ - spec/lib/vraptor-scaffold_spec.rb
229
227
  - spec/lib/generators/app_generator/app_generator_spec.rb
230
228
  - spec/lib/generators/app_generator/dependency_manager_spec.rb
231
- - spec/lib/generators/app_generator/dependency_spec.rb
232
229
  - spec/lib/generators/app_generator/freemarker_template_engine_spec.rb
233
230
  - spec/lib/generators/app_generator/jsp_template_engine_spec.rb
231
+ - spec/lib/generators/app_generator/dependency_spec.rb
232
+ - spec/lib/generators/scaffold_generator/model_generator/model_generator_spec.rb
233
+ - spec/lib/generators/scaffold_generator/freemarker_generator/freemarker_generator_spec.rb
234
+ - spec/lib/generators/scaffold_generator/repository_generator/repository_generator_spec.rb
234
235
  - spec/lib/generators/scaffold_generator/attribute_spec.rb
235
236
  - spec/lib/generators/scaffold_generator/base_scaffold_spec.rb
236
- - spec/lib/generators/scaffold_generator/controller_generator/controller_generator_spec.rb
237
- - spec/lib/generators/scaffold_generator/freemarker_generator/freemarker_generator_spec.rb
238
237
  - spec/lib/generators/scaffold_generator/jsp_generator/jsp_generator_spec.rb
239
- - spec/lib/generators/scaffold_generator/model_generator/model_generator_spec.rb
240
- - spec/lib/generators/scaffold_generator/repository_generator/repository_generator_spec.rb
241
238
  - spec/lib/generators/scaffold_generator/scaffold_generator_spec.rb
242
- - spec/lib/vraptor-scaffold_spec.rb
243
- - spec/spec_helper.rb
239
+ - spec/lib/generators/scaffold_generator/controller_generator/controller_generator_spec.rb
240
+ - spec/lib/configuration_spec.rb
@@ -1,45 +0,0 @@
1
- repositories {
2
- mavenCentral()
3
- }
4
-
5
- apply plugin: 'java'
6
- apply plugin: 'war'
7
- apply plugin: 'jetty'
8
- apply plugin: 'eclipse'
9
- apply plugin: 'project-report'
10
-
11
- sourceCompatibility = 1.6
12
- targetCompatibility = 1.6
13
- version = '1.0'
14
-
15
- sourceSets.main.classesDir = new File('src/main/webapp/WEB-INF/classes')
16
-
17
- jettyRun.scanIntervalSeconds=3
18
- jettyRun.contextPath = '/'
19
- [jettyRunWar,jettyStop]*.stopPort = 8081
20
- [jettyRunWar,jettyStop]*.stopKey = 'stopKey'
21
-
22
- dependencies {
23
- compile group: 'br.com.caelum', name: 'vraptor', version: '3.2.0', {
24
- exclude group: 'org.springframework', name: 'spring'
25
- }
26
- compile group: 'org.springframework', name: 'spring-web', version: '3.0.4.RELEASE'
27
- compile group: 'com.thoughtworks.xstream', name: 'xstream', version: '1.3.1'
28
- compile group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0'
29
- compile group: 'opensymphony', name: 'sitemesh', version: '2.4.2'
30
- compile group: 'javax.servlet', name: 'jstl', version: '1.2'
31
- compile group: 'javax.persistence', name: 'persistence-api', version: '1.0'
32
- compile group: 'org.hibernate', name: 'hibernate-entitymanager', version: '3.4.0.GA'
33
- compile group: 'org.hibernate', name: 'hibernate-core', version: '3.3.2.GA'
34
- compile group: 'org.hibernate', name: 'hibernate-validator', version: '3.1.0.GA'
35
- compile group: 'joda-time', name: 'joda-time', version: '1.6.2'
36
-
37
- //Provided dependencies
38
- providedCompile group: 'javax.servlet', name: 'servlet-api', version: '2.5'
39
- providedCompile group: 'javax.servlet.jsp', name: 'jsp-api', version: '2.1'
40
-
41
- //Test dependencies
42
- testCompile group: 'junit', name: 'junit', version: '4.8.2'
43
- testCompile group: 'org.hamcrest', name: 'hamcrest-all', version: '1.1'
44
- testCompile group: 'org.mockito', name: 'mockito-all', version: '1.8.5'
45
- }
@@ -1,40 +0,0 @@
1
- <ivy-module version="2.0">
2
- <info organisation="vraptor-scaffold" module="vraptor-scaffold" />
3
-
4
- <configurations>
5
- <conf name="default" description="dependencies used for compile" />
6
- <conf name="test" description="dependencies used for tests" visibility="public" />
7
- <conf name="jetty" description="dependencies used for jetty" visibility="public" />
8
- <conf name="provided" description="dependencies used for compile but is not packaged" visibility="public" />
9
- </configurations>
10
-
11
- <dependencies>
12
- <dependency org="br.com.caelum" name="vraptor" rev="3.2.0" conf="default">
13
- <exclude org="org.springframework" name="spring" />
14
- </dependency>
15
- <dependency org="org.springframework" name="spring-web" rev="3.0.4.RELEASE" conf="default" />
16
- <dependency org="com.thoughtworks.xstream" name="xstream" rev="1.3.1" conf="default" />
17
- <dependency org="org.hsqldb" name="hsqldb" rev="2.0.0" conf="default" />
18
- <dependency org="opensymphony" name="sitemesh" rev="2.4.2" conf="default" />
19
- <dependency org="javax.servlet" name="jstl" rev="1.2" conf="default" />
20
- <dependency org="javax.persistence" name="persistence-api" rev="1.0" conf="default" />
21
- <dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.4.0.GA" conf="default" />
22
- <dependency org="org.hibernate" name="hibernate-core" rev="3.3.2.GA" conf="default" />
23
- <dependency org="org.hibernate" name="hibernate-validator" rev="3.1.0.GA" conf="default" />
24
- <dependency org="joda-time" name="joda-time" rev="1.6.2" conf="default" />
25
-
26
- <!-- Provided dependencies -->
27
- <dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="provided->default" />
28
- <dependency org="javax.servlet.jsp" name="jsp-api" rev="2.1" conf="provided->default" />
29
-
30
- <!-- Test dependencies -->
31
- <dependency org="junit" name="junit" rev="4.8.2" conf="test->default" />
32
- <dependency org="org.hamcrest" name="hamcrest-all" rev="1.1" conf="test->default" />
33
- <dependency org="org.mockito" name="mockito-all" rev="1.8.5" conf="test->default" />
34
-
35
- <!-- Jetty dependencies -->
36
- <dependency org="org.mortbay.jetty" name="jsp-api-2.1" rev="6.1.14" conf="jetty->default" />
37
- <dependency org="org.mortbay.jetty" name="jsp-2.1" rev="6.1.14" conf="jetty->default" />
38
- <dependency org="org.mortbay.jetty" name="jetty-ant" rev="6.1.14" conf="jetty->default" />
39
- </dependencies>
40
- </ivy-module>
@@ -1,163 +0,0 @@
1
- <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3
- <modelVersion>4.0.0</modelVersion>
4
- <groupId>vraptor-scaffold</groupId>
5
- <artifactId>vraptor-scaffold</artifactId>
6
- <packaging>war</packaging>
7
- <version>0.0.1-SNAPSHOT</version>
8
- <name>vraptor-scaffold</name>
9
-
10
- <properties>
11
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12
- </properties>
13
-
14
- <build>
15
- <outputDirectory>${basedir}/src/main/webapp/WEB-INF/classes</outputDirectory>
16
- <plugins>
17
- <plugin>
18
- <artifactId>maven-compiler-plugin</artifactId>
19
- <version>2.3.2</version>
20
- <configuration>
21
- <source>1.6</source>
22
- <target>1.6</target>
23
- <encoding>UTF-8</encoding>
24
- </configuration>
25
- </plugin>
26
- <plugin>
27
- <artifactId>maven-eclipse-plugin</artifactId>
28
- <version>2.8</version>
29
- <configuration>
30
- <downloadSources>true</downloadSources>
31
- <downloadJavadocs>true</downloadJavadocs>
32
- <wtpversion>2.0</wtpversion>
33
- </configuration>
34
- </plugin>
35
- <plugin>
36
- <groupId>org.apache.maven.plugins</groupId>
37
- <artifactId>maven-war-plugin</artifactId>
38
- <version>2.1</version>
39
- </plugin>
40
- <plugin>
41
- <groupId>org.mortbay.jetty</groupId>
42
- <artifactId>maven-jetty-plugin</artifactId>
43
- <version>6.1.14</version>
44
- <configuration>
45
- <scanIntervalSeconds>3</scanIntervalSeconds>
46
- <stopKey>foo</stopKey>
47
- <stopPort>9999</stopPort>
48
- <webAppConfig>
49
- <contextPath>/</contextPath>
50
- </webAppConfig>
51
- </configuration>
52
- </plugin>
53
- </plugins>
54
- </build>
55
-
56
- <dependencies>
57
- <dependency>
58
- <groupId>br.com.caelum</groupId>
59
- <artifactId>vraptor</artifactId>
60
- <version>3.2.0</version>
61
- <exclusions>
62
- <exclusion>
63
- <groupId>org.springframework</groupId>
64
- <artifactId>spring</artifactId>
65
- </exclusion>
66
- </exclusions>
67
- </dependency>
68
- <dependency>
69
- <groupId>org.springframework</groupId>
70
- <artifactId>spring-web</artifactId>
71
- <version>3.0.4.RELEASE</version>
72
- </dependency>
73
- <dependency>
74
- <groupId>com.thoughtworks.xstream</groupId>
75
- <artifactId>xstream</artifactId>
76
- <version>1.3.1</version>
77
- </dependency>
78
- <dependency>
79
- <groupId>org.hsqldb</groupId>
80
- <artifactId>hsqldb</artifactId>
81
- <version>2.0.0</version>
82
- </dependency>
83
- <dependency>
84
- <groupId>opensymphony</groupId>
85
- <artifactId>sitemesh</artifactId>
86
- <version>2.4.2</version>
87
- </dependency>
88
- <dependency>
89
- <groupId>javax.servlet</groupId>
90
- <artifactId>jstl</artifactId>
91
- <version>1.2</version>
92
- </dependency>
93
- <dependency>
94
- <groupId>javax.persistence</groupId>
95
- <artifactId>persistence-api</artifactId>
96
- <version>1.0</version>
97
- </dependency>
98
- <dependency>
99
- <groupId>org.hibernate</groupId>
100
- <artifactId>hibernate-entitymanager</artifactId>
101
- <version>3.4.0.GA</version>
102
- </dependency>
103
- <dependency>
104
- <groupId>org.hibernate</groupId>
105
- <artifactId>hibernate-core</artifactId>
106
- <version>3.3.2.GA</version>
107
- </dependency>
108
- <dependency>
109
- <groupId>org.hibernate</groupId>
110
- <artifactId>hibernate-validator</artifactId>
111
- <version>3.1.0.GA</version>
112
- </dependency>
113
- <dependency>
114
- <groupId>joda-time</groupId>
115
- <artifactId>joda-time</artifactId>
116
- <version>1.6.2</version>
117
- </dependency>
118
-
119
- <!-- Test dependencies -->
120
- <dependency>
121
- <groupId>junit</groupId>
122
- <artifactId>junit</artifactId>
123
- <version>4.8.2</version>
124
- <scope>test</scope>
125
- </dependency>
126
- <dependency>
127
- <groupId>org.hamcrest</groupId>
128
- <artifactId>hamcrest-all</artifactId>
129
- <version>1.1</version>
130
- <scope>test</scope>
131
- </dependency>
132
- <dependency>
133
- <groupId>org.mockito</groupId>
134
- <artifactId>mockito-all</artifactId>
135
- <version>1.8.5</version>
136
- <scope>test</scope>
137
- </dependency>
138
-
139
- <!-- Provided dependencies -->
140
- <dependency>
141
- <groupId>javax.servlet</groupId>
142
- <artifactId>servlet-api</artifactId>
143
- <version>2.5</version>
144
- <scope>provided</scope>
145
- </dependency>
146
- <dependency>
147
- <groupId>javax.servlet.jsp</groupId>
148
- <artifactId>jsp-api</artifactId>
149
- <version>2.1</version>
150
- <scope>provided</scope>
151
- </dependency>
152
- </dependencies>
153
-
154
- <reporting>
155
- <plugins>
156
- <plugin>
157
- <groupId>org.codehaus.mojo</groupId>
158
- <artifactId>cobertura-maven-plugin</artifactId>
159
- <version>2.4</version>
160
- </plugin>
161
- </plugins>
162
- </reporting>
163
- </project>