Skip to content
This repository
Browse code

[petclinic-grails] Upgrade application to Grails 2.0.4.

  • Loading branch information...
commit 928f6b85b247fadc4e774b8c3123f56f815ae586 1 parent 22f71da
Peter Ledbrook authored June 14, 2012
9  petclinic-grails/application.properties
... ...
@@ -1,9 +1,6 @@
1 1
 #Grails Metadata file
2  
-#Tue Apr 12 12:09:32 CEST 2011
3  
-app.grails.version=1.3.7
4  
-app.name=petclinic-grails
  2
+#Thu Jun 14 10:49:01 BST 2012
  3
+app.grails.version=2.0.4
  4
+app.name=pets4u
5 5
 app.servlet.version=2.4
6 6
 app.version=0.1
7  
-plugins.cloud-foundry=1.0.0.M1
8  
-plugins.hibernate=1.3.7
9  
-plugins.tomcat=1.3.7
14  petclinic-grails/grails-app/conf/BuildConfig.groovy
@@ -7,6 +7,18 @@ grails.project.dependency.resolution = {
7 7
     repositories {
8 8
         grailsHome()
9 9
         mavenCentral()	
10  
-		grailsCentral()
  10
+        grailsCentral()
  11
+        mavenRepo "http://maven.springframework.org/milestone/"
  12
+    }
  13
+
  14
+    dependencies {
  15
+        runtime "hsqldb:hsqldb:1.8.0.10", "postgresql:postgresql:9.1-901-1.jdbc4"
  16
+    }
  17
+
  18
+    plugins {
  19
+        compile ":cloud-foundry:1.2.2",
  20
+                ":hibernate:$grailsVersion",
  21
+                ":webxml:1.4.1"
  22
+        build   ":tomcat:$grailsVersion"
11 23
     }
12 24
 }
41  petclinic-grails/web-app/WEB-INF/applicationContext.xml
@@ -6,37 +6,28 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
6 6
 
7 7
 	<bean id="grailsApplication" class="org.codehaus.groovy.grails.commons.GrailsApplicationFactoryBean">
8 8
 		<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" />
11 11
 	</bean>
12 12
 
13 13
 	<bean id="pluginManager" class="org.codehaus.groovy.grails.plugins.GrailsPluginManagerFactoryBean">
14 14
 		<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" />
17 17
 	</bean>
18 18
 
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>
25 25
 
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" />
29 27
 
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>
42 33
 </beans>
2  petclinic-grails/web-app/WEB-INF/sitemesh.xml
@@ -5,7 +5,7 @@
5 5
         <parser content-type="text/html;charset=ISO-8859-1"
6 6
             class="org.codehaus.groovy.grails.web.sitemesh.GrailsHTMLPageParser" />
7 7
         <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" />
9 9
     </page-parsers>
10 10
 
11 11
     <decorator-mappers>
25  petclinic-grails/web-app/WEB-INF/tld/c.tld
... ...
@@ -1,13 +1,13 @@
1 1
 <?xml version="1.0" encoding="UTF-8" ?>
2 2
 
3  
-<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
  3
+<taglib xmlns="http://java.sun.com/xml/ns/javaee"
4 4
     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>
9 9
   <display-name>JSTL core</display-name>
10  
-  <tlib-version>1.1</tlib-version>
  10
+  <tlib-version>1.2</tlib-version>
11 11
   <short-name>c</short-name>
12 12
   <uri>http://java.sun.com/jsp/jstl/core</uri>
13 13
 
@@ -74,7 +74,7 @@ not the body content should be processed.
74 74
         <description>
75 75
 Name of the exported scoped variable for the
76 76
 resulting value of the test condition. The type
77  
-of the scoped variable is Boolean.        
  77
+of the scoped variable is Boolean.
78 78
         </description>
79 79
         <name>var</name>
80 80
         <required>false</required>
@@ -174,6 +174,9 @@ Collection of items to iterate over.
174 174
 	<required>false</required>
175 175
 	<rtexprvalue>true</rtexprvalue>
176 176
 	<type>java.lang.Object</type>
  177
+        <deferred-value>
  178
+	    <type>java.lang.Object</type>
  179
+        </deferred-value>
177 180
     </attribute>
178 181
     <attribute>
179 182
         <description>
@@ -253,6 +256,9 @@ String of tokens to iterate over.
253 256
 	<required>true</required>
254 257
 	<rtexprvalue>true</rtexprvalue>
255 258
 	<type>java.lang.String</type>
  259
+        <deferred-value>
  260
+	    <type>java.lang.String</type>
  261
+        </deferred-value>
256 262
     </attribute>
257 263
     <attribute>
258 264
         <description>
@@ -322,7 +328,7 @@ visibility.
322 328
   <tag>
323 329
     <description>
324 330
         Like &lt;%= ... &gt;, but for expressions.
325  
-    </description> 
  331
+    </description>
326 332
     <name>out</name>
327 333
     <tag-class>org.apache.taglibs.standard.tag.rt.core.OutTag</tag-class>
328 334
     <body-content>JSP</body-content>
@@ -467,6 +473,9 @@ Expression to be evaluated.
467 473
         <name>value</name>
468 474
         <required>false</required>
469 475
         <rtexprvalue>true</rtexprvalue>
  476
+        <deferred-value>
  477
+	    <type>java.lang.Object</type>
  478
+        </deferred-value>
470 479
     </attribute>
471 480
     <attribute>
472 481
         <description>
16  petclinic-grails/web-app/WEB-INF/tld/fmt.tld
... ...
@@ -1,13 +1,13 @@
1 1
 <?xml version="1.0" encoding="UTF-8" ?>
2 2
 
3  
-<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
  3
+<taglib xmlns="http://java.sun.com/xml/ns/javaee"
4 4
     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>
9 9
   <display-name>JSTL fmt</display-name>
10  
-  <tlib-version>1.1</tlib-version>
  10
+  <tlib-version>1.2</tlib-version>
11 11
   <short-name>fmt</short-name>
12 12
   <uri>http://java.sun.com/jsp/jstl/fmt</uri>
13 13
 
@@ -55,7 +55,7 @@ and may contain a two-letter (upper-case)
55 55
 country code (as defined by ISO-3166).
56 56
 Language and country codes must be
57 57
 separated by hyphen (-) or underscore
58  
-(_).        
  58
+(_).
59 59
 	</description>
60 60
         <name>value</name>
61 61
         <required>true</required>
@@ -496,7 +496,7 @@ Date and/or time to be formatted.
496 496
         <description>
497 497
 Specifies whether the time, the date, or both
498 498
 the time and date components of the given
499  
-date are to be formatted. 
  499
+date are to be formatted.
500 500
         </description>
501 501
         <name>type</name>
502 502
         <required>false</required>
109  petclinic-grails/web-app/css/errors.css
... ...
@@ -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
+}
82  petclinic-grails/web-app/css/mobile.css
... ...
@@ -0,0 +1,82 @@
  1
+/* Styles for mobile devices */
  2
+
  3
+@media screen and (max-width: 480px) {
  4
+	.nav {
  5
+		padding: 0.5em;
  6
+	}
  7
+
  8
+	.nav li {
  9
+		margin: 0 0.5em 0 0;
  10
+		padding: 0.25em;
  11
+	}
  12
+
  13
+	/* Hide individual steps in pagination, just have next & previous */
  14
+	.pagination .step, .pagination .currentStep {
  15
+		display: none;
  16
+	}
  17
+
  18
+	.pagination .prevLink {
  19
+		float: left;
  20
+	}
  21
+
  22
+	.pagination .nextLink {
  23
+		float: right;
  24
+	}
  25
+
  26
+	/* pagination needs to wrap around floated buttons */
  27
+	.pagination {
  28
+		overflow: hidden;
  29
+	}
  30
+
  31
+	/* slightly smaller margin around content body */
  32
+	fieldset,
  33
+	.property-list {
  34
+		padding: 0.3em 1em 1em;
  35
+	}
  36
+
  37
+	input, textarea {
  38
+		width: 100%;
  39
+		   -moz-box-sizing: border-box;
  40
+		-webkit-box-sizing: border-box;
  41
+		    -ms-box-sizing: border-box;
  42
+		        box-sizing: border-box;
  43
+	}
  44
+
  45
+	select, input[type=checkbox], input[type=radio], input[type=submit], input[type=button], input[type=reset] {
  46
+		width: auto;
  47
+	}
  48
+
  49
+	/* hide all but the first column of list tables */
  50
+	.scaffold-list td:not(:first-child),
  51
+	.scaffold-list th:not(:first-child) {
  52
+		display: none;
  53
+	}
  54
+
  55
+	.scaffold-list thead th {
  56
+		text-align: center;
  57
+	}
  58
+
  59
+	/* stack form elements */
  60
+	.fieldcontain {
  61
+		margin-top: 0.6em;
  62
+	}
  63
+
  64
+	.fieldcontain label,
  65
+	.fieldcontain .property-label,
  66
+	.fieldcontain .property-value {
  67
+		display: block;
  68
+		float: none;
  69
+		margin: 0 0 0.25em 0;
  70
+		text-align: left;
  71
+		width: auto;
  72
+	}
  73
+
  74
+	.errors ul,
  75
+	.message p {
  76
+		margin: 0.5em;
  77
+	}
  78
+
  79
+	.error ul {
  80
+		margin-left: 0;
  81
+	}
  82
+}
BIN  petclinic-grails/web-app/images/apple-touch-icon-retina.png
BIN  petclinic-grails/web-app/images/apple-touch-icon.png

0 notes on commit 928f6b8

Please sign in to comment.
Something went wrong with that request. Please try again.