grails/lib/groovy-all-1.6.5.jar @@ -7,7 +7,7 @@ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> <excludeFolder url="file://$MODULE_DIR$/target" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> </component> </module> grails-maven-archetype/grails-maven-archetype.iml @@ -40,12 +40,10 @@ <classpathentry kind="lib" path="lib/commons-validator-1.3.1.jar"/> <classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/> <classpathentry kind="lib" path="lib/oscache-2.4.1.jar"/> - <classpathentry kind="lib" path="lib/ejb3-persistence-1.0.2.GA.jar"/> + <classpathentry kind="lib" path="/Developer/grails-dev/core/grails/grails/lib/ejb3-persistence-1.0.2.GA.jar"/> <classpathentry kind="lib" path="lib/gant_groovy1.6-1.6.0.jar"/> - <classpathentry kind="lib" path="lib/groovy-all-1.6.4.jar" sourcepath="/Developer/groovy-dev/releases/groovy-1.6.4/src/main"/> + <classpathentry kind="lib" path="lib/groovy-all-1.6.5.jar" sourcepath="/Developer/groovy-dev/releases/groovy-1.6.4/src/main"/> <classpathentry kind="lib" path="lib/hsqldb-1.8.0.10.jar"/> - <classpathentry kind="lib" path="lib/jasper-compiler-5.5.15.jar"/> - <classpathentry kind="lib" path="lib/jasper-runtime-5.5.15.jar"/> <classpathentry kind="lib" path="lib/jcl-over-slf4j-1.5.6.jar"/> <classpathentry kind="lib" path="lib/jsp-api-2.0.jar"/> <classpathentry kind="lib" path="lib/jstl-1.1.2.jar"/> grails/.classpath @@ -26,14 +26,13 @@ <excludeFolder url="file://$MODULE_DIR$/target" /> <excludeFolder url="file://$MODULE_DIR$/tmp" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="Groovy" level="project" /> <orderEntry type="library" exported="" name="Apache Commons" level="project" /> <orderEntry type="library" exported="" name="Spring" level="project" /> <orderEntry type="library" exported="" name="Hibernate 3" level="project" /> <orderEntry type="library" exported="" name="javax.servlet" level="project" /> - <orderEntry type="library" exported="" name="Jetty" level="project" /> <orderEntry type="module-library" exported=""> <library> <CLASSES> @@ -122,6 +121,17 @@ <orderEntry type="library" name="Radeox" level="project" /> <orderEntry type="library" name="Ivy" level="project" /> <orderEntry type="library" name="JUnit" level="project" /> + <orderEntry type="module-library"> + <library name="Apache Ivy"> + <CLASSES> + <root url="jar://$MODULE_DIR$/lib/ivy-2.0.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="file://$MODULE_DIR$/../../../../apache/ivy-2.0.0/src/java" /> + </SOURCES> + </library> + </orderEntry> <javadoc-paths> <root url="file://$MODULE_DIR$/../spring-framework-2.0/docs/api" /> <root url="file://$MODULE_DIR$/../hibernate-3.2/doc/api" /> grails/Grails.iml @@ -3,5 +3,5 @@ DIRNAME=`dirname "$0"` . "$DIRNAME/startGrails" -JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Dgrails.full.stacktrace=true -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005" +JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Dgrails.full.stacktrace=true -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005" startGrails org.codehaus.groovy.grails.cli.GrailsScriptRunner "$@" grails/bin/grails-debug @@ -114,7 +114,7 @@ fi if [ -z "$GROOVY_CONF" ]; then GROOVY_CONF="$GRAILS_HOME/conf/groovy-starter.conf" fi -STARTER_CLASSPATH="$GRAILS_HOME/lib/groovy-all-1.6.4.jar:$GRAILS_HOME/dist/grails-bootstrap-1.2-SNAPSHOT.jar" +STARTER_CLASSPATH="$GRAILS_HOME/lib/groovy-all-1.6.5.jar:$GRAILS_HOME/dist/grails-bootstrap-1.2-SNAPSHOT.jar" # Allow access to Cocoa classes on OS X if $darwin; then grails/bin/startGrails @@ -106,7 +106,7 @@ set CMD_LINE_ARGS=%$ :execute @rem Setup the command line -set STARTER_CLASSPATH=%GRAILS_HOME%\lib\groovy-all-1.6.4.jar;%GRAILS_HOME%\dist\grails-bootstrap-1.2-SNAPSHOT.jar +set STARTER_CLASSPATH=%GRAILS_HOME%\lib\groovy-all-1.6.5.jar;%GRAILS_HOME%\dist\grails-bootstrap-1.2-SNAPSHOT.jar if exist "%USERPROFILE%/.groovy/init.bat" call "%USERPROFILE%/.groovy/init.bat" grails/bin/startGrails.bat @@ -10,7 +10,7 @@ ## # Load required libraries load ${grails.home}/dist/grails-bootstrap-${grails.version}.jar - load ${grails.home}/lib/groovy-all-1.6.4.jar + load ${grails.home}/lib/groovy-all-1.6.5.jar load ${grails.home}/lib/GParallelizer-0.8.3.jar load ${grails.home}/lib/ivy-2.0.0.jar load ${grails.home}/lib/gant_groovy1.6-1.6.0.jar grails/conf/groovy-starter.conf @@ -72,6 +72,15 @@ <option name="LABEL_INDENT_SIZE" value="0" /> <option name="LABEL_INDENT_ABSOLUTE" value="false" /> </ADDITIONAL_INDENT_OPTIONS> + <ADDITIONAL_INDENT_OPTIONS fileType="sql"> + <option name="INDENT_SIZE" value="2" /> + <option name="CONTINUATION_INDENT_SIZE" value="8" /> + <option name="TAB_SIZE" value="4" /> + <option name="USE_TAB_CHARACTER" value="false" /> + <option name="SMART_TABS" value="false" /> + <option name="LABEL_INDENT_SIZE" value="0" /> + <option name="LABEL_INDENT_ABSOLUTE" value="false" /> + </ADDITIONAL_INDENT_OPTIONS> <ADDITIONAL_INDENT_OPTIONS fileType="txt"> <option name="INDENT_SIZE" value="2" /> <option name="CONTINUATION_INDENT_SIZE" value="8" /> @@ -210,8 +219,8 @@ <component name="IdProvider" IDEtalkID="094372AACB9649246F599517414513BF" /> <component name="InspectionProjectProfileManager"> <option name="PROJECT_PROFILE" value="Project Default" /> - <option name="USE_PROJECT_PROFILE" value="true" /> - <version value="1.0" /> + <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> + <scopes /> <profiles> <profile version="1.0" is_locked="false"> <option name="myName" value="Project Default" /> @@ -403,6 +412,7 @@ <module fileurl="file://$PROJECT_DIR$/Grails.iml" filepath="$PROJECT_DIR$/Grails.iml" /> <module fileurl="file://$PROJECT_DIR$//JSP21.iml" filepath="$PROJECT_DIR$//JSP21.iml" /> <module fileurl="file://$PROJECT_DIR$/../grails-maven-archetype/grails-maven-archetype.iml" filepath="$PROJECT_DIR$/../grails-maven-archetype/grails-maven-archetype.iml" /> + <module fileurl="file://$PROJECT_DIR$/../grails-maven-plugin/grails-maven-plugin.iml" filepath="$PROJECT_DIR$/../grails-maven-plugin/grails-maven-plugin.iml" /> </modules> </component> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK"> @@ -578,7 +588,7 @@ </library> <library name="Groovy"> <CLASSES> - <root url="jar://$PROJECT_DIR$/lib/groovy-all-1.6.4.jar!/" /> + <root url="jar://$PROJECT_DIR$/lib/groovy-all-1.6.5.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> grails/grails.ipr @@ -57,7 +57,7 @@ <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> - <version>1.6.4</version> + <version>1.6.5</version> <exclusions> <exclusion> <groupId>jline</groupId> grails/maven/grails.pom.in @@ -10,7 +10,7 @@ <listAttribute key="org.eclipse.jdt.launching.CLASSPATH"> <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
<runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="@grails.project.name@" path="1" type="4"/>
"/> <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
<runtimeClasspathEntry containerPath="GRAILS_HOME/dist/grails-bootstrap-@grails.version@.jar" path="3" type="3"/>
"/> -<listEntry value="<?xml version="1.0" encoding="UTF-8"?>
<runtimeClasspathEntry containerPath="GRAILS_HOME/lib/groovy-all-1.6.4.jar" path="3" type="3"/>
"/> +<listEntry value="<?xml version="1.0" encoding="UTF-8"?>
<runtimeClasspathEntry containerPath="GRAILS_HOME/lib/groovy-all-1.6.5.jar" path="3" type="3"/>
"/> </listAttribute> <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="grails.util.GrailsMain"/> grails/src/grails/templates/ide-support/eclipse/.launch @@ -253,7 +253,7 @@ public class IvyDependencyManager implements DependencyResolver, DependencyDefin "javax.servlet:jstl:1.1.2" // dependencies needed for compilation - compile("org.codehaus.groovy:groovy-all:1.6.4") { + compile("org.codehaus.groovy:groovy-all:1.6.5") { excludes 'jline' } grails/src/java/org/codehaus/groovy/grails/resolve/IvyDependencyManager.groovy @@ -114,7 +114,7 @@ fi if [ -z "$GROOVY_CONF" ]; then GROOVY_CONF="$GRAILS_HOME/conf/groovy-starter.conf" fi -STARTER_CLASSPATH="$GRAILS_HOME/lib/groovy-all-1.6.4.jar:$GRAILS_HOME/dist/grails-bootstrap-@grails.version@.jar" +STARTER_CLASSPATH="$GRAILS_HOME/lib/groovy-all-1.6.5.jar:$GRAILS_HOME/dist/grails-bootstrap-@grails.version@.jar" # Allow access to Cocoa classes on OS X if $darwin; then grails/src/resources/bash/startGrails @@ -106,7 +106,7 @@ set CMD_LINE_ARGS=%$ :execute @rem Setup the command line -set STARTER_CLASSPATH=%GRAILS_HOME%\lib\groovy-all-1.6.4.jar;%GRAILS_HOME%\dist\grails-bootstrap-@grails.version@.jar +set STARTER_CLASSPATH=%GRAILS_HOME%\lib\groovy-all-1.6.5.jar;%GRAILS_HOME%\dist\grails-bootstrap-@grails.version@.jar if exist "%USERPROFILE%/.groovy/init.bat" call "%USERPROFILE%/.groovy/init.bat" grails/src/resources/bash/startGrails.bat grails/lib/groovy-all-1.6.4.jar c266ff44f5b74eafe0f092df451a0f2d79c286c2 Graeme Rocher graeme.rocher@gmail.com http://github.com/grails/grails/commit/970abe375a53e5f8e6d17bf908ba9226e544c108 970abe375a53e5f8e6d17bf908ba9226e544c108

2009-10-26T08:21:44-07:00

upgrade to Groovy 1.6.5 a3b0e36969600ee4e4b073d57c7f5f2724a0499c Graeme Rocher graeme.rocher@gmail.com