Skip to content

Commit fd21e0e

Browse files
jkuehnjkuehn
committed
Test fix
1 parent be3ac7c commit fd21e0e

File tree

9 files changed

+50
-51
lines changed

9 files changed

+50
-51
lines changed

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ out/*
77
*.iml
88
*.ipr
99
*.iws
10-
/lib/mongodb-morphia-ast.jar
10+
/lib/mongodb-morphia-ast.jar
11+
/mongodb-morphia-ast.jar

‎application.properties

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#Grails Metadata file
2-
#Thu Feb 23 13:02:27 CET 2012
3-
app.grails.version=2.0.0
2+
#Wed Sep 12 21:57:41 CEST 2012
3+
app.grails.version=2.1.0
44
app.name=mongodb-morphia
55
app.version=0.7.9
6+
plugins.hibernate=2.1.0
67
plugins.release=1.0.1
78
plugins.svn=1.0.2
8-
plugins.tomcat=2.0.0
9+
plugins.tomcat=2.1.0

‎plugin.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@
1313
<resource>org.acme.Contact</resource>
1414
</resources>
1515
<repositories>
16-
<repository name='grailsCentral' url='http://plugins.grails.org' />
17-
<repository name='http://repo.grails.org/grails/plugins' url='http://repo.grails.org/grails/plugins/' />
16+
<repository name='grailsCentral' url='http://grails.org/plugins' />
1817
<repository name='http://repo.grails.org/grails/core' url='http://repo.grails.org/grails/core/' />
19-
<repository name='grailsCore' url='http://svn.codehaus.org/grails/trunk/grails-plugins' />
2018
<repository name='mavenCentral' url='http://repo1.maven.org/maven2/' />
2119
</repositories>
2220
<dependencies />

‎scripts/_BuildAst.groovy

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
includeTargets << grailsScript("_GrailsClean")
66
includeTargets << grailsScript("_GrailsCompile")
77

8-
98
// Because we make use of ASTTransformations, make sure that everything is clean
109
// after installing the plugin.
1110
cleanAll()

‎test/integration/grails/plugins/mongodb/test/BasicPersistenceTests.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ public class BasicPersistenceTests extends GroovyTestCase {
296296
}
297297

298298
void testUpdateMethod() {
299-
def t = new Task(taskId: "Update me good", name: "Task that will be updated!", actualHours: 10)
299+
def t = new Task(taskId: "Update me good", name: "Task that will be updated!", actualHours: 10, dateCreated: new Date() - 1)
300300
def t2 = new Task(taskId: "Update me good 2", name: "Task that will be updated too!", actualHours: 10)
301301
t.save()
302302
t2.save()

‎web-app/WEB-INF/applicationContext.xml

+16-25
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>

‎web-app/WEB-INF/sitemesh.xml

+1-1
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>

‎web-app/WEB-INF/tld/c.tld

+17-8
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>

‎web-app/WEB-INF/tld/fmt.tld

+8-8
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>

0 commit comments

Comments
 (0)