Skip to content

Commit

Permalink
updates to bookmarks app for 1.0 compatibility
Browse files Browse the repository at this point in the history 
git-svn-id: https://svn.codehaus.org/grails/trunk@6630 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d
  • Loading branch information
graeme committed Jan 31, 2008
1 parent 87b103d commit 822325c
Show file tree
Hide file tree
Showing 9 changed files with 422 additions and 476 deletions.
59 changes: 28 additions & 31 deletions .classpath
View file
Expand Up @@ -7,21 +7,15 @@
<classpathentry kind="src" path="grails-app/domain"/> <classpathentry kind="src" path="grails-app/domain"/>
<classpathentry kind="src" path="grails-app/services"/> <classpathentry kind="src" path="grails-app/services"/>
<classpathentry kind="src" path="grails-app/taglib"/> <classpathentry kind="src" path="grails-app/taglib"/>
<classpathentry kind="src" path="test/integration"/>
<classpathentry kind="src" path="test/unit"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/mail.jar"/> <classpathentry kind="output" path="web-app/WEB-INF/classes"/>
<classpathentry kind="lib" path="lib/commons-httpclient-3.0.1.jar"/>
<classpathentry kind="lib" path="lib/commons-email-1.0.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
<classpathentry kind="lib" path="lib/activation.jar"/>
<classpathentry kind="lib" path="lib/acegi-security-tiger-1.0.1.jar"/>
<classpathentry kind="lib" path="lib/acegi-security-jetty-1.0.1.jar"/>
<classpathentry kind="lib" path="lib/acegi-security-1.0.1.jar"/>
<classpathentry kind="lib" path="lib/xstream-1.2.jar"/>
<classpathentry kind="lib" path="lib/xfire-all-1.2.2.jar"/>
<classpathentry kind="output" path="bin"/>
<classpathentry kind="var" path="GRAILS_HOME/ant/lib/ant.jar"/> <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-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-nodeps.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/ant.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/antlr-2.7.6.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/antlr-2.7.6.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/bsf-2.3.0.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/bsf-2.3.0.jar" />
Expand All @@ -40,48 +34,51 @@
<classpathentry kind="var" path="GRAILS_HOME/lib/dom4j-1.6.1.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/dom4j-1.6.1.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/ehcache-1.2.4.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/ehcache-1.2.4.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/ejb3-persistence.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/ejb3-persistence.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/gant-0.2.5-SNAPSHOT.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/groovy-all-1.5.2.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/groovy-all-1.1-beta-3-SNAPSHOT.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/groovy-starter.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/hibernate-annotations.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/hibernate-annotations.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/hibernate3.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/hibernate3.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/hsqldb-1.8.0.5.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/hsqldb-1.8.0.5.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/jasper-compiler.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/jasper-compiler-5.5.15.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/jasper-runtime.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/jaxen-1.1-beta-11.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/jdbc2_0-stdext.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/jdbc2_0-stdext.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/jetty-6.1.4.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/jetty-6.1.4.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/jetty-6.1.5.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/jetty-naming-6.1.4.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/jetty-plus-6.1.4.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/jetty-util-6.1.4.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/jetty-util-6.1.4.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.0.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/jstl-2.3.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/jstl-2.4.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/jta.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/jta.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/junit-3.8.1.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/junit-3.8.2.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/log4j-1.2.8.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/ognl-2.6.9.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/oro-2.0.8.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/oro-2.0.8.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/serializer.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/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/sitemesh-2.3.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/spring-2.0.2.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/spring-2.5.1.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/spring-beans.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/spring-binding-2.0-m1.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/spring-binding-1.1-SNAPSHOT-20070720144338.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/spring-test.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/spring-core.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/spring-webflow-2.0-m1.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/spring-mock-2.0.2.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/spring-webmvc.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/spring-webflow-1.1-SNAPSHOT-20070720141159.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/springmodules-sandbox.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/springmodules-sandbox.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/standard-2.3.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/standard-2.4.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/start.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/start.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/svnkit.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/svnkit.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/xalan.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/xalan.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/xerces-2.6.2.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/xercesImpl.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/xml-apis.jar" />
<classpathentry kind="var" path="GRAILS_HOME/lib/xpp3_min-1.1.3.4.O.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/lib/xstream-1.2.1.jar" />
<classpathentry kind="var" path="GRAILS_HOME/dist/grails-core-0.6-SNAPSHOT.jar" /> <classpathentry kind="var" path="GRAILS_HOME/dist/grails-cli-1.0-final-SNAPSHOT.jar" />
<classpathentry kind="var" path="GRAILS_HOME/dist/grails-crud-0.6-SNAPSHOT.jar" /> <classpathentry kind="var" path="GRAILS_HOME/dist/grails-core-1.0-final-SNAPSHOT.jar" />
<classpathentry kind="var" path="GRAILS_HOME/dist/grails-gorm-0.6-SNAPSHOT.jar" /> <classpathentry kind="var" path="GRAILS_HOME/dist/grails-crud-1.0-final-SNAPSHOT.jar" />
<classpathentry kind="var" path="GRAILS_HOME/dist/grails-web-0.6-SNAPSHOT.jar" /> <classpathentry kind="var" path="GRAILS_HOME/dist/grails-gorm-1.0-final-SNAPSHOT.jar" />
<classpathentry kind="var" path="GRAILS_HOME/dist/grails-spring-1.0-final-SNAPSHOT.jar" />
<classpathentry kind="var" path="GRAILS_HOME/dist/grails-test-1.0-final-SNAPSHOT.jar" />
<classpathentry kind="var" path="GRAILS_HOME/dist/grails-web-1.0-final-SNAPSHOT.jar" />
<classpathentry kind="var" path="GRAILS_HOME/dist/grails-webflow-1.0-final-SNAPSHOT.jar" />
</classpath> </classpath>
4 changes: 4 additions & 0 deletions application.properties
View file
@@ -0,0 +1,4 @@
#Do not edit app.grails.* properties, they may change automatically. DO NOT put application configuration in here, it is not the right place!
#Thu Jan 31 15:18:41 GMT 2008
app.grails.version=1.0-final-SNAPSHOT
app.name=bookmarks
10 changes: 5 additions & 5 deletions bookmarks.launch
View file
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication"> <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"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="grails.util.GrailsMain"/>
<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/> <booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH"> <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;bookmarks&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/> <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;bookmarks&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;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/bookmarks/web-app/WEB-INF&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#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;bookmarks&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#13;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;bookmarks&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/> <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/bookmarks&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
</listAttribute> </listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/> <listEntry value="4"/>
</listAttribute> </listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bookmarks"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bookmarks"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dbase.dir=${project_loc} -Dserver.port=8080"/> <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"> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/bookmarks"/> <listEntry value="/bookmarks"/>
</listAttribute> </listAttribute>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
</launchConfiguration> </launchConfiguration>

10 changes: 10 additions & 0 deletions src/templates/war/web.xml
View file
Expand Up @@ -91,6 +91,16 @@
<url-pattern>/services/*</url-pattern> <url-pattern>/services/*</url-pattern>
</servlet-mapping> </servlet-mapping>


<welcome-file-list>
<!--
The order of the welcome pages is important. JBoss deployment will
break if index.gsp is first in the list.
-->
<welcome-file>index.html</welcome-file>
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.gsp</welcome-file>
</welcome-file-list>

<taglib> <taglib>
<taglib-uri>http://java.sun.com/jstl/core</taglib-uri> <taglib-uri>http://java.sun.com/jstl/core</taglib-uri>
<taglib-location>/WEB-INF/tld/c.tld</taglib-location> <taglib-location>/WEB-INF/tld/c.tld</taglib-location>
Expand Down
16 changes: 9 additions & 7 deletions web-app/WEB-INF/applicationContext.xml
View file
Expand Up @@ -12,13 +12,15 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem


<bean id="pluginManager" class="org.codehaus.groovy.grails.plugins.GrailsPluginManagerFactoryBean"> <bean id="pluginManager" class="org.codehaus.groovy.grails.plugins.GrailsPluginManagerFactoryBean">
<description>A bean that manages Grails plugins</description> <description>A bean that manages Grails plugins</description>
<property name="pluginFiles"> <property name="grailsDescriptor" value="/WEB-INF/grails.xml" />
<value>classpath*:**/plugins/**/*GrailsPlugin.groovy</value> <property name="application" ref="grailsApplication" />
</property> </bean>
<property name="application" ref="grailsApplication" />
</bean> <bean id="pluginMetaManager" class="org.codehaus.groovy.grails.plugins.DefaultPluginMetaManager">

<constructor-arg value="classpath*:**/plugins/*/plugin.xml" />
<bean id="grailsConfigurator" class="org.codehaus.groovy.grails.commons.spring.GrailsRuntimeConfigurator"> </bean>

<bean id="grailsConfigurator" class="org.codehaus.groovy.grails.commons.spring.GrailsRuntimeConfigurator">
<constructor-arg> <constructor-arg>
<ref bean="grailsApplication" /> <ref bean="grailsApplication" />
</constructor-arg> </constructor-arg>
Expand Down

0 comments on commit 822325c

Please sign in to comment.