Skip to content

Commit fa9209d

Browse files
author
graeme
committed
updated version number for RC4
git-svn-id: https://svn.codehaus.org/grails/trunk@6488 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d
1 parent 91386a6 commit fa9209d

File tree

6 files changed

+67
-7
lines changed

6 files changed

+67
-7
lines changed

‎Grails.iml‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,15 @@
1111
<facet type="Groovy" name="Groovy">
1212
<configuration />
1313
</facet>
14+
<facet type="Spring" name="Spring" implicit="true">
15+
<configuration>
16+
<options>
17+
<option name="enableValidation" value="true" />
18+
<option name="reportErrorsAsWarnings" value="true" />
19+
</options>
20+
<customNs />
21+
</configuration>
22+
</facet>
1423
</component>
1524
<component name="NewModuleRootManager" inherit-compiler-output="false">
1625
<output url="file://$MODULE_DIR$/target/classes" />
@@ -29,9 +38,12 @@
2938
<sourceFolder url="file://$MODULE_DIR$/test/scaffolding" isTestSource="true" />
3039
<sourceFolder url="file://$MODULE_DIR$/test/web" isTestSource="true" />
3140
<excludeFolder url="file://$MODULE_DIR$/cruise" />
41+
<excludeFolder url="file://$MODULE_DIR$/doc" />
42+
<excludeFolder url="file://$MODULE_DIR$/media" />
3243
<excludeFolder url="file://$MODULE_DIR$/samples" />
3344
<excludeFolder url="file://$MODULE_DIR$/sandbox" />
3445
<excludeFolder url="file://$MODULE_DIR$/target" />
46+
<excludeFolder url="file://$MODULE_DIR$/tmp" />
3547
</content>
3648
<orderEntry type="library" name="GROOVY" level="application" />
3749
<orderEntry type="inheritedJdk" />
@@ -90,8 +102,8 @@
90102
<orderEntry type="module-library">
91103
<library name="Groovy">
92104
<CLASSES>
93-
<root url="jar://$MODULE_DIR$/lib/groovy-all-1.5.0.jar!/" />
94-
<root url="jar://$MODULE_DIR$/lib/gant-1.0.0.jar!/" />
105+
<root url="jar://$MODULE_DIR$/lib/groovy-all-1.6-beta-1-SNAPSHOT.jar!/" />
106+
<root url="jar://$MODULE_DIR$/lib/gant-1.0.2_groovy-1.5.0.jar!/" />
95107
</CLASSES>
96108
<JAVADOC />
97109
<SOURCES>
@@ -113,6 +125,17 @@
113125
<SOURCES />
114126
</library>
115127
</orderEntry>
128+
<orderEntry type="module-library">
129+
<library name="XML APIs">
130+
<CLASSES>
131+
<root url="jar://$MODULE_DIR$/lib/xalan.jar!/" />
132+
<root url="jar://$MODULE_DIR$/lib/serializer.jar!/" />
133+
<root url="jar://$MODULE_DIR$/lib/xercesImpl.jar!/" />
134+
</CLASSES>
135+
<JAVADOC />
136+
<SOURCES />
137+
</library>
138+
</orderEntry>
116139
<orderEntryProperties />
117140
<javadoc-paths>
118141
<root url="file://$MODULE_DIR$/../spring-framework-2.0/docs/api" />

‎bin/startGrails‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ fi
111111
if [ -z "$GROOVY_CONF" ]; then
112112
GROOVY_CONF="$GRAILS_HOME/conf/groovy-starter.conf"
113113
fi
114-
STARTER_CLASSPATH="$GRAILS_HOME/lib/groovy-all-1.6-beta-1-SNAPSHOT.jar:$GRAILS_HOME/dist/grails-cli-1.0-RC4-SNAPSHOT.jar"
114+
STARTER_CLASSPATH="$GRAILS_HOME/lib/groovy-all-1.6-beta-1-SNAPSHOT.jar:$GRAILS_HOME/dist/grails-cli-1.0-RC4.jar"
115115

116116
# Allow access to Cocoa classes on OS X
117117
if $darwin; then

‎bin/startGrails.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ set CMD_LINE_ARGS=%$
106106

107107
:execute
108108
@rem Setup the command line
109-
set STARTER_CLASSPATH=%GRAILS_HOME%\lib\groovy-all-1.6-beta-1-SNAPSHOT.jar;%GRAILS_HOME%\dist\grails-cli-1.0-RC4-SNAPSHOT.jar
109+
set STARTER_CLASSPATH=%GRAILS_HOME%\lib\groovy-all-1.6-beta-1-SNAPSHOT.jar;%GRAILS_HOME%\dist\grails-cli-1.0-RC4.jar
110110

111111
if exist "%USERPROFILE%/.groovy/init.bat" call "%USERPROFILE%/.groovy/init.bat"
112112

‎build.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
grails.version=1.0-RC4-SNAPSHOT
1+
grails.version=1.0-RC4
22
grails.src.commons=src/commons
33
grails.src.groovy=src/groovy
44

‎grails.ipr‎

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,20 @@
5656
<file url="file:///Users/graemerocher/Library/Caches/IntelliJIDEA70/compiler/grails.grailsad1ec4b3/.generated/Groovy_to_java_source_code_generator/searchable.e2a8b521/production/org/codehaus/groovy/grails/plugins/searchable/compass/mapping/DefaultSearchableCompassClassMappingXmlBuilder.java" />
5757
<file url="file://$PROJECT_DIR$/src/tiger/org/codehaus/groovy/grails/commons/AnnotationDomainClassArtefactHandler.java" />
5858
<file url="file://$PROJECT_DIR$/src/tiger/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsAnnotationConfiguration.java" />
59+
<file url="file:///Developer/grails-dev/plugins/searchable/src/test/java/org/codehaus/groovy/grails/plugins/searchable/test/domain/annotated/AnnotatedSearchable.java" />
60+
<file url="file:///Users/graemerocher/Library/Caches/IntelliJIDEA70/compiler/grails.grailsad1ec4b3/.generated/Groovy_to_java_source_code_generator/Grails_Docs.2adb568b/production/org/grails/doc/filters/HeaderFilter.java" />
61+
<file url="file:///Users/graemerocher/Library/Caches/IntelliJIDEA70/compiler/grails.grailsad1ec4b3/.generated/Groovy_to_java_source_code_generator/Grails_Docs.2adb568b/production/org/grails/doc/filters/LinkTestFilter.java" />
62+
<file url="file:///Users/graemerocher/Library/Caches/IntelliJIDEA70/compiler/grails.grailsad1ec4b3/.generated/Groovy_to_java_source_code_generator/Grails_Docs.2adb568b/production/org/grails/doc/CodeFilter.java" />
63+
<file url="file:///Users/graemerocher/Library/Caches/IntelliJIDEA70/compiler/grails.grailsad1ec4b3/.generated/Groovy_to_java_source_code_generator/Grails_Docs.2adb568b/production/org/grails/doc/ItalicFilter.java" />
64+
<file url="file:///Users/graemerocher/Library/Caches/IntelliJIDEA70/compiler/grails.grailsad1ec4b3/.generated/Groovy_to_java_source_code_generator/Grails_Docs.2adb568b/production/org/grails/doc/TextileLinkFilter.java" />
65+
<file url="file:///Users/graemerocher/Library/Caches/IntelliJIDEA70/compiler/grails.grailsad1ec4b3/.generated/Groovy_to_java_source_code_generator/Grails_Docs.2adb568b/production/org/grails/doc/BoldFilter.java" />
66+
<file url="file:///Users/graemerocher/Library/Caches/IntelliJIDEA70/compiler/grails.grailsad1ec4b3/.generated/Groovy_to_java_source_code_generator/Grails_Docs.2adb568b/production/org/grails/doc/BlockQuoteFilter.java" />
67+
<file url="file:///Users/graemerocher/Library/Caches/IntelliJIDEA70/compiler/grails.grailsad1ec4b3/.generated/Groovy_to_java_source_code_generator/Grails_Docs.2adb568b/production/org/grails/doc/ImageFilter.java" />
68+
<file url="file:///Users/graemerocher/Library/Caches/IntelliJIDEA70/compiler/grails.grailsad1ec4b3/.generated/Groovy_to_java_source_code_generator/Grails_Docs.2adb568b/production/org/grails/doc/WarningMacro.java" />
69+
<file url="file:///Users/graemerocher/Library/Caches/IntelliJIDEA70/compiler/grails.grailsad1ec4b3/.generated/Groovy_to_java_source_code_generator/Grails_Docs.2adb568b/production/org/grails/doc/NoteMacro.java" />
70+
<file url="file:///Users/graemerocher/Library/Caches/IntelliJIDEA70/compiler/grails.grailsad1ec4b3/.generated/Groovy_to_java_source_code_generator/Grails_Docs.2adb568b/production/org/grails/doc/filters/ListFilter.java" />
71+
<file url="file:///Users/graemerocher/Library/Caches/IntelliJIDEA70/compiler/grails.grailsad1ec4b3/.generated/Groovy_to_java_source_code_generator/Grails_Docs.2adb568b/production/org/grails/doc/SourceMacro.java" />
72+
<file url="file:///Users/graemerocher/Library/Caches/IntelliJIDEA70/compiler/grails.grailsad1ec4b3/.generated/Groovy_to_java_source_code_generator/Grails_Docs.2adb568b/production/org/grails/doc/DocEngine.java" />
5973
</excludeFromCompile>
6074
<resourceExtensions>
6175
<entry name=".+\.(properties|xml|html|dtd|tld)" />
@@ -110,6 +124,27 @@
110124
<file url="file://$PROJECT_DIR$/test/cliTestApp/testapp/staging/WEB-INF/web.xml" />
111125
</files>
112126
</module>
127+
<module name="groovy-grails-build">
128+
<files>
129+
<file url="file:///Developer/grails-dev/groovy-grails-build/checkout/groovy/cruise/reporting-app/WEB-INF/web.xml" />
130+
<file url="file:///Developer/grails-dev/groovy-grails-build/checkout/groovy/src/examples/webapps/groovlet-examples/WEB-INF/web.xml" />
131+
<file url="file:///Developer/grails-dev/groovy-grails-build/checkout/groovy/src/examples/webapps/template-examples/WEB-INF/web.xml" />
132+
</files>
133+
</module>
134+
<module name="Grails Docs">
135+
<files>
136+
<file url="file:///Developer/grails-dev/doc/checkout/grails/cruise/reporting-app/WEB-INF/web.xml" />
137+
</files>
138+
</module>
139+
</modules>
140+
</facet-type>
141+
<facet-type id="hibernate">
142+
<modules>
143+
<module name="Grails Docs">
144+
<files>
145+
<file url="file:///Developer/grails-dev/doc/checkout/grails/test/persistence/hibernate.cfg.xml" />
146+
</files>
147+
</module>
113148
</modules>
114149
</facet-type>
115150
</autodetection-disabled>
@@ -290,6 +325,8 @@
290325
<component name="ProjectModuleManager">
291326
<modules>
292327
<module fileurl="file://$PROJECT_DIR$/Grails.iml" filepath="$PROJECT_DIR$/Grails.iml" />
328+
<module fileurl="file:///Developer/grails-dev/doc/Grails Docs.iml" filepath="/Developer/grails-dev/doc/Grails Docs.iml" />
329+
<module fileurl="file:///Developer/grails-dev/groovy-grails-build/Groovy + Grails Build.iml" filepath="/Developer/grails-dev/groovy-grails-build/Groovy + Grails Build.iml" />
293330
</modules>
294331
</component>
295332
<component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="false" project-jdk-name="1.5" project-jdk-type="JavaSDK" />
@@ -367,9 +404,9 @@
367404
<root url="jar://$PROJECT_DIR$/lib/springmodules-sandbox.jar!/" />
368405
<root url="jar://$PROJECT_DIR$/lib/spring-test.jar!/" />
369406
<root url="jar://$PROJECT_DIR$/lib/spring-webmvc.jar!/" />
370-
<root url="jar://$PROJECT_DIR$/lib/spring-2.5.jar!/" />
371407
<root url="jar://$PROJECT_DIR$/lib/spring-webflow-2.0-m1.jar!/" />
372408
<root url="jar://$PROJECT_DIR$/lib/spring-binding-2.0-m1.jar!/" />
409+
<root url="jar://$PROJECT_DIR$/lib/spring-2.5.1.jar!/" />
373410
</CLASSES>
374411
<JAVADOC />
375412
<SOURCES>

‎test/groovy/grails/util/GrailsUtilTests.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class GrailsUtilTests extends GroovyTestCase {
77

88
void testGrailsVersion() {
99

10-
assertEquals "1.0-RC4-SNAPSHOT", grails.util.GrailsUtil.getGrailsVersion()
10+
assertEquals "1.0-RC4", grails.util.GrailsUtil.getGrailsVersion()
1111
}
1212

1313
}

0 commit comments

Comments
 (0)