Skip to content

Commit 76ebce4

Browse files
pledbrookpledbrook
committed
Update test project to Grails 2.0.1.
1 parent 600ed18 commit 76ebce4

File tree

11 files changed

+240
-47
lines changed

11 files changed

+240
-47
lines changed

‎src/groovy/org/grails/rabbitmq/RabbitServiceConfigurer.groovy‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ class RabbitServiceConfigurer {
177177
delegate.delegate = ref(propertyName)
178178

179179
for (entry in adapterOptions) {
180+
println ">> Setting adapter option ${entry.key} to ${entry.value}"
180181
delegate."${entry.key}" = entry.value
181182
}
182183
}
@@ -202,6 +203,7 @@ class RabbitServiceConfigurer {
202203
concurrentConsumers = serviceConcurrentConsumers
203204
messageListener = ref("${propertyName}RabbitAdapter")
204205
for (entry in containerOptions) {
206+
println ">> Setting container option ${entry.key} to ${entry.value}"
205207
delegate."${entry.key}" = entry.value
206208
}
207209
}

‎test/projects/default/application.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#Grails Metadata file
2-
#Thu Jan 27 12:15:40 GMT 2011
3-
app.grails.version=1.3.6
2+
#Wed Feb 29 17:40:31 GMT 2012
3+
app.grails.version=2.0.1
44
app.name=default
55
app.servlet.version=2.4
66
app.version=0.1
7-
plugins.hibernate=1.3.6
8-
plugins.tomcat=1.3.6
7+
plugins.hibernate=2.0.1
8+
plugins.tomcat=2.0.1

‎test/projects/default/grails-app/conf/BuildConfig.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ grails.project.dependency.resolution = {
2929
dependencies {
3030
// specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes eg.
3131

32-
// runtime 'mysql:mysql-connector-java:5.1.13'
32+
runtime "hsqldb:hsqldb:1.8.0.10"
3333
}
3434
}

‎test/projects/default/web-app/WEB-INF/applicationContext.xml‎

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,28 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
66

77
<bean id="grailsApplication" class="org.codehaus.groovy.grails.commons.GrailsApplicationFactoryBean">
88
<description>Grails application factory bean</description>
9-
<property name="grailsDescriptor" value="/WEB-INF/grails.xml" />
10-
<property name="grailsResourceLoader" ref="grailsResourceLoader" />
9+
<property name="grailsDescriptor" value="/WEB-INF/grails.xml" />
10+
<property name="grailsResourceLoader" ref="grailsResourceLoader" />
1111
</bean>
1212

1313
<bean id="pluginManager" class="org.codehaus.groovy.grails.plugins.GrailsPluginManagerFactoryBean">
1414
<description>A bean that manages Grails plugins</description>
15-
<property name="grailsDescriptor" value="/WEB-INF/grails.xml" />
16-
<property name="application" ref="grailsApplication" />
15+
<property name="grailsDescriptor" value="/WEB-INF/grails.xml" />
16+
<property name="application" ref="grailsApplication" />
1717
</bean>
1818

19-
<bean id="grailsConfigurator" class="org.codehaus.groovy.grails.commons.spring.GrailsRuntimeConfigurator">
20-
<constructor-arg>
21-
<ref bean="grailsApplication" />
22-
</constructor-arg>
23-
<property name="pluginManager" ref="pluginManager" />
24-
</bean>
19+
<bean id="grailsConfigurator" class="org.codehaus.groovy.grails.commons.spring.GrailsRuntimeConfigurator">
20+
<constructor-arg>
21+
<ref bean="grailsApplication" />
22+
</constructor-arg>
23+
<property name="pluginManager" ref="pluginManager" />
24+
</bean>
2525

26-
<bean id="grailsResourceLoader" class="org.codehaus.groovy.grails.commons.GrailsResourceLoaderFactoryBean">
27-
<property name="grailsResourceHolder" ref="grailsResourceHolder" />
28-
</bean>
26+
<bean id="grailsResourceLoader" class="org.codehaus.groovy.grails.commons.GrailsResourceLoaderFactoryBean" />
2927

30-
<bean id="grailsResourceHolder" scope="prototype" class="org.codehaus.groovy.grails.commons.spring.GrailsResourceHolder">
31-
<property name="resources">
32-
<value>classpath*:**/grails-app/**/*.groovy</value>
33-
</property>
34-
</bean>
35-
36-
<bean id="characterEncodingFilter"
37-
class="org.springframework.web.filter.CharacterEncodingFilter">
38-
<property name="encoding">
39-
<value>utf-8</value>
40-
</property>
41-
</bean>
28+
<bean id="characterEncodingFilter" class="org.springframework.web.filter.CharacterEncodingFilter">
29+
<property name="encoding">
30+
<value>utf-8</value>
31+
</property>
32+
</bean>
4233
</beans>

‎test/projects/default/web-app/WEB-INF/sitemesh.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parser content-type="text/html;charset=ISO-8859-1"
66
class="org.codehaus.groovy.grails.web.sitemesh.GrailsHTMLPageParser" />
77
<parser content-type="text/html;charset=UTF-8"
8-
class="org.codehaus.groovy.grails.web.sitemesh.GrailsHTMLPageParser" />
8+
class="org.codehaus.groovy.grails.web.sitemesh.GrailsHTMLPageParser" />
99
</page-parsers>
1010

1111
<decorator-mappers>

‎test/projects/default/web-app/WEB-INF/tld/c.tld‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22

3-
<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
3+
<taglib xmlns="http://java.sun.com/xml/ns/javaee"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
6-
version="2.0">
7-
8-
<description>JSTL 1.1 core library</description>
5+
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
6+
version="2.1">
7+
8+
<description>JSTL 1.2 core library</description>
99
<display-name>JSTL core</display-name>
10-
<tlib-version>1.1</tlib-version>
10+
<tlib-version>1.2</tlib-version>
1111
<short-name>c</short-name>
1212
<uri>http://java.sun.com/jsp/jstl/core</uri>
1313

@@ -74,7 +74,7 @@ not the body content should be processed.
7474
<description>
7575
Name of the exported scoped variable for the
7676
resulting value of the test condition. The type
77-
of the scoped variable is Boolean.
77+
of the scoped variable is Boolean.
7878
</description>
7979
<name>var</name>
8080
<required>false</required>
@@ -174,6 +174,9 @@ Collection of items to iterate over.
174174
<required>false</required>
175175
<rtexprvalue>true</rtexprvalue>
176176
<type>java.lang.Object</type>
177+
<deferred-value>
178+
<type>java.lang.Object</type>
179+
</deferred-value>
177180
</attribute>
178181
<attribute>
179182
<description>
@@ -253,6 +256,9 @@ String of tokens to iterate over.
253256
<required>true</required>
254257
<rtexprvalue>true</rtexprvalue>
255258
<type>java.lang.String</type>
259+
<deferred-value>
260+
<type>java.lang.String</type>
261+
</deferred-value>
256262
</attribute>
257263
<attribute>
258264
<description>
@@ -322,7 +328,7 @@ visibility.
322328
<tag>
323329
<description>
324330
Like &lt;%= ... &gt;, but for expressions.
325-
</description>
331+
</description>
326332
<name>out</name>
327333
<tag-class>org.apache.taglibs.standard.tag.rt.core.OutTag</tag-class>
328334
<body-content>JSP</body-content>
@@ -467,6 +473,9 @@ Expression to be evaluated.
467473
<name>value</name>
468474
<required>false</required>
469475
<rtexprvalue>true</rtexprvalue>
476+
<deferred-value>
477+
<type>java.lang.Object</type>
478+
</deferred-value>
470479
</attribute>
471480
<attribute>
472481
<description>

‎test/projects/default/web-app/WEB-INF/tld/fmt.tld‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22

3-
<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
3+
<taglib xmlns="http://java.sun.com/xml/ns/javaee"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
6-
version="2.0">
7-
8-
<description>JSTL 1.1 i18n-capable formatting library</description>
5+
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
6+
version="2.1">
7+
8+
<description>JSTL 1.2 i18n-capable formatting library</description>
99
<display-name>JSTL fmt</display-name>
10-
<tlib-version>1.1</tlib-version>
10+
<tlib-version>1.2</tlib-version>
1111
<short-name>fmt</short-name>
1212
<uri>http://java.sun.com/jsp/jstl/fmt</uri>
1313

@@ -55,7 +55,7 @@ and may contain a two-letter (upper-case)
5555
country code (as defined by ISO-3166).
5656
Language and country codes must be
5757
separated by hyphen (-) or underscore
58-
(_).
58+
(_).
5959
</description>
6060
<name>value</name>
6161
<required>true</required>
@@ -496,7 +496,7 @@ Date and/or time to be formatted.
496496
<description>
497497
Specifies whether the time, the date, or both
498498
the time and date components of the given
499-
date are to be formatted.
499+
date are to be formatted.
500500
</description>
501501
<name>type</name>
502502
<required>false</required>

‎test/projects/default/web-app/css/errors.css‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
h1, h2 {
2+
margin: 10px 25px 5px;
3+
}
4+
5+
h2 {
6+
font-size: 1.1em;
7+
}
8+
9+
.filename {
10+
font-style: italic;
11+
}
12+
13+
.exceptionMessage {
14+
margin: 10px;
15+
border: 1px solid #000;
16+
padding: 5px;
17+
background-color: #E9E9E9;
18+
}
19+
20+
.stack,
21+
.snippet {
22+
margin: 0 25px 10px;
23+
}
24+
25+
.stack,
26+
.snippet {
27+
border: 1px solid #ccc;
28+
-mox-box-shadow: 0 0 2px rgba(0,0,0,0.2);
29+
-webkit-box-shadow: 0 0 2px rgba(0,0,0,0.2);
30+
box-shadow: 0 0 2px rgba(0,0,0,0.2);
31+
}
32+
33+
/* error details */
34+
.error-details {
35+
border-top: 1px solid #FFAAAA;
36+
-mox-box-shadow: 0 0 2px rgba(0,0,0,0.2);
37+
-webkit-box-shadow: 0 0 2px rgba(0,0,0,0.2);
38+
box-shadow: 0 0 2px rgba(0,0,0,0.2);
39+
border-bottom: 1px solid #FFAAAA;
40+
-mox-box-shadow: 0 0 2px rgba(0,0,0,0.2);
41+
-webkit-box-shadow: 0 0 2px rgba(0,0,0,0.2);
42+
box-shadow: 0 0 2px rgba(0,0,0,0.2);
43+
background-color:#FFF3F3;
44+
line-height: 1.5;
45+
overflow: hidden;
46+
padding: 5px;
47+
padding-left:25px;
48+
}
49+
50+
.error-details dt {
51+
clear: left;
52+
float: left;
53+
font-weight: bold;
54+
margin-right: 5px;
55+
}
56+
57+
.error-details dt:after {
58+
content: ":";
59+
}
60+
61+
.error-details dd {
62+
display: block;
63+
}
64+
65+
/* stack trace */
66+
.stack {
67+
padding: 5px;
68+
overflow: auto;
69+
height: 150px;
70+
}
71+
72+
/* code snippet */
73+
.snippet {
74+
background-color: #fff;
75+
font-family: monospace;
76+
}
77+
78+
.snippet .line {
79+
display: block;
80+
}
81+
82+
.snippet .lineNumber {
83+
background-color: #ddd;
84+
color: #999;
85+
display: inline-block;
86+
margin-right: 5px;
87+
padding: 0 3px;
88+
text-align: right;
89+
width: 3em;
90+
}
91+
92+
.snippet .error {
93+
background-color: #fff3f3;
94+
font-weight: bold;
95+
}
96+
97+
.snippet .error .lineNumber {
98+
background-color: #faa;
99+
color: #333;
100+
font-weight: bold;
101+
}
102+
103+
.snippet .line:first-child .lineNumber {
104+
padding-top: 5px;
105+
}
106+
107+
.snippet .line:last-child .lineNumber {
108+
padding-bottom: 5px;
109+
}

0 commit comments

Comments
 (0)