Permalink
Browse files

Upgrade to Grails 1.1

  • Loading branch information...
1 parent 0e3f55f commit 99eeb28ea473645109d7da9e9fbeeb5a7f2f7094 mstine committed Mar 12, 2009
Showing with 417 additions and 363 deletions.
  1. +36 −36 .classpath
  2. +4 −3 application.properties
  3. +11 −0 imageTools-test.launch
  4. +11 −12 imageTools.launch
  5. +27 −0 ivy.xml
  6. +15 −0 ivysettings.xml
  7. +2 −1 web-app/WEB-INF/applicationContext.xml
  8. +311 −311 web-app/WEB-INF/tld/spring.tld
View
@@ -12,75 +12,75 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="web-app/WEB-INF/classes"/>
<classpathentry kind="var" path="GRAILS_HOME/ant/lib/ant.jar"/>
-<classpathentry kind="var" path="GRAILS_HOME/lib/ant-junit.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/lib/ant-launcher.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/lib/ant-nodeps.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/lib/ant-1.7.0.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/lib/ant-junit-1.7.0.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/lib/ant-launcher-1.7.0.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/lib/ant-nodeps-1.7.0.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/ant-trax.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/lib/ant.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/antlr-2.7.6.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/backport-util-concurrent-3.0.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/cglib-nodep-2.1_3.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/commons-beanutils-1.7.0.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/commons-cli-1.0.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/lib/commons-codec-1.3.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/commons-collections-3.2.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/commons-dbcp-1.2.1.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/commons-el-1.0.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/commons-fileupload-1.1.1.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/commons-io-1.4.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/lib/commons-lang-2.1.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/lib/commons-logging-1.1.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/lib/commons-lang-2.4.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/commons-pool-1.2.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/commons-validator-1.3.0.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/lib/dom4j-1.6.1.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/ehcache-1.5.0.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/lib/ejb3-persistence.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/lib/groovy-all-1.5.6.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/lib/hibernate-annotations.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/lib/hibernate-commons-annotations.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/lib/hibernate3.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/lib/ejb3-persistence-3.3.0.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/lib/gant_groovy1.6-1.6.0.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/lib/groovy-all-1.6.0.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/hsqldb-1.8.0.5.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/lib/ivy-2.0.0.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/jasper-compiler-5.5.15.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/jasper-compiler-jdt-5.5.15.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/jasper-runtime-5.5.15.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/lib/jaxen-1.1-beta-11.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/lib/jdbc2_0-stdext.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/lib/jetty-6.1.12.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/lib/jetty-naming-6.1.12.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/lib/jetty-plus-6.1.12.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/lib/jetty-util-6.1.12.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/lib/jcl-over-slf4j-1.5.6.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/lib/jetty-6.1.14.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/lib/jetty-naming-6.1.14.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/lib/jetty-plus-6.1.14.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/lib/jetty-util-6.1.14.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/jline-0.9.91.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/jsp-api-2.0.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/lib/jsp-api-2.1.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/jsr107cache-1.0.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/jstl-2.3.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/jstl-2.4.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/lib/jta.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/lib/jta-1.1.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/junit-3.8.2.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/log4j-1.2.15.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/ognl-2.6.9.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/lib/org.springframework.binding-2.0.3.RELEASE.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/lib/org.springframework.js-2.0.3.RELEASE.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/lib/org.springframework.webflow-2.0.3.RELEASE.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/oro-2.0.8.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/oscache-2.4.1.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/serializer.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/lib/servlet-api-2.5-6.1.4.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/lib/sitemesh-2.3.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/lib/servlet-api-2.5-6.1.14.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/lib/sitemesh-2.4.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/lib/slf4j-api-1.5.6.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/lib/slf4j-log4j12-1.5.6.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/spring-2.5.6.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/lib/spring-binding-2.0-m1.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/lib/spring-test.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/lib/spring-webflow-2.0-m1.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/lib/spring-webmvc.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/lib/spring-test-2.5.6.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/lib/spring-webmvc-2.5.6.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/standard-2.3.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/standard-2.4.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/start.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/svnkit-1.2.0.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/lib/xalan.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/lib/xercesImpl.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/xpp3_min-1.1.3.4.O.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/lib/xstream-1.2.1.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/dist/grails-cli-1.0.4.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/dist/grails-core-1.0.4.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/dist/grails-crud-1.0.4.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/dist/grails-gorm-1.0.4.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/dist/grails-spring-1.0.4.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/dist/grails-test-1.0.4.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/dist/grails-web-1.0.4.jar" />
-<classpathentry kind="var" path="GRAILS_HOME/dist/grails-webflow-1.0.4.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/dist/grails-bootstrap-1.1.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/dist/grails-core-1.1.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/dist/grails-crud-1.1.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/dist/grails-gorm-1.1.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/dist/grails-resources-1.1.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/dist/grails-scripts-1.1.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/dist/grails-spring-1.1.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/dist/grails-test-1.1.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/dist/grails-web-1.1.jar" />
+<classpathentry kind="var" path="GRAILS_HOME/dist/grails-webflow-1.1.jar" />
</classpath>
View
@@ -1,4 +1,5 @@
-#Do not edit app.grails.* properties, they may change automatically. DO NOT put application configuration in here, it is not the right place!
-#Fri Mar 06 23:30:06 CST 2009
-app.grails.version=1.0.4
+#utf-8
+#Thu Mar 12 11:19:37 CDT 2009
+app.grails.version=1.1
+plugins.hibernate=1.1
app.name=imageTools
View
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="grails.test.GrailsAwareGroovyTestSuite"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="imageTools"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dtest=${resource_loc}"/>
+</launchConfiguration>
View
@@ -1,20 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="grails.util.GrailsMain"/>
-<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
-<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;imageTools&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;imageTools&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/imageTools&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/imageTools"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/>
</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="imageTools"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dbase.dir=${project_loc} -Dserver.port=8080 -Dgrails.env=development"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/imageTools"/>
-</listAttribute>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;imageTools&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;GRAILS_HOME/dist/grails-bootstrap-1.1.jar&quot; path=&quot;3&quot; type=&quot;3&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;GRAILS_HOME/lib/groovy-all-1.6.0.jar&quot; path=&quot;3&quot; type=&quot;3&quot;/&gt;&#10;"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="grails.util.GrailsMain"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="imageTools"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dbase.dir=&quot;${project_loc:imageTools}&quot; -Dserver.port=8080 -Dgrails.env=development"/>
</launchConfiguration>
View
27 ivy.xml
@@ -0,0 +1,27 @@
+<ivy-module version="2.0">
+ <info organisation="org.example" module="imageTools"/>
+ <configurations defaultconfmapping="build->default;compile->compile(*),master(*);test,runtime->runtime(*),master(*)">
+ <conf name="build"/>
+ <conf name="compile"/>
+ <conf name="test" extends="compile"/>
+ <conf name="runtime" extends="compile"/>
+ </configurations>
+ <dependencies>
+ <dependency org="org.grails" name="grails-bootstrap" rev="1.1" conf="build"/>
+ <dependency org="org.grails" name="grails-scripts" rev="1.1" conf="build"/>
+ <dependency org="org.grails" name="grails-gorm" rev="1.1" conf="compile"/>
+ <dependency org="org.grails" name="grails-web" rev="1.1" conf="compile"/>
+ <dependency org="org.grails" name="grails-test" rev="1.1" conf="test"/>
+ <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.5.5" conf="runtime"/>
+ <dependency org="opensymphony" name="oscache" rev="2.4" conf="runtime">
+ <exclude org="javax.jms" module="jms" name="*" type="*" ext="*" conf="" matcher="exact"/>
+ <exclude org="commons-logging" module="commons-logging" name="*" type="*" ext="*" conf="" matcher="exact"/>
+ <exclude org="javax.servlet" module="servlet-api" name="*" type="*" ext="*" conf="" matcher="exact"/>
+ </dependency>
+ <dependency org="hsqldb" name="hsqldb" rev="1.8.0.5" conf="runtime"/>
+ <!--
+ <dependency org="mysql" name="mysql-connector-java" rev="5.1.6" conf="runtime"/>
+ <dependency org="postgresql" name="postgresql" rev="8.3-603.jdbc3" conf="runtime"/>
+ -->
+ </dependencies>
+</ivy-module>
View
@@ -0,0 +1,15 @@
+<ivysettings>
+ <settings defaultResolver="codehaus-plus"/>
+ <include url="${ivy.default.settings.dir}/ivysettings-public.xml" />
+ <include url="${ivy.default.settings.dir}/ivysettings-shared.xml"/>
+ <include url="${ivy.default.settings.dir}/ivysettings-local.xml" />
+ <include url="${ivy.default.settings.dir}/ivysettings-main-chain.xml"/>
+ <resolvers>
+ <chain name="codehaus-plus" dual="true">
+ <ibiblio name="codehaus-snapshots" root="http://snapshots.repository.codehaus.org" m2compatible="true" changingPattern=".*SNAPSHOT"/>
+ <ibiblio name="codehaus" root="http://repository.codehaus.org" m2compatible="true"/>
+ <ibiblio name="javanet" root="http://download.java.net/maven/2/" m2compatible="true"/>
+ <resolver ref="public"/>
+ </chain>
+ </resolvers>
+</ivysettings>
@@ -17,7 +17,8 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
</bean>
<bean id="pluginMetaManager" class="org.codehaus.groovy.grails.plugins.DefaultPluginMetaManager">
- <constructor-arg value="classpath*:**/plugins/*/plugin.xml" />
+ <property name="grailsApplication" ref="grailsApplication" />
+ <property name="resourcePattern" value="/WEB-INF/plugins/*/plugin.xml" />
</bean>
<bean id="grailsConfigurator" class="org.codehaus.groovy.grails.commons.spring.GrailsRuntimeConfigurator">
Oops, something went wrong.

0 comments on commit 99eeb28

Please sign in to comment.