Menu
▾
▴
[Qtitools-commits] SF.net SVN: qtitools:[2437] branches/mathassess/QTIEngine
|
From: <dav...@us...> - 2010-04-08 16:40:13
|
Revision: 2437
http://qtitools.svn.sourceforge.net/qtitools/?rev=2437&view=rev
Author: davemckain
Date: 2010-04-08 16:40:06 +0000 (Thu, 08 Apr 2010)
Log Message:
-----------
MAE: Updated to Grails 1.2.2 and resynced src/templates/war/web.xml
with that from a fresh new project, which fixed the issue I've been
having with log4j configuration not working when running as a WAR.
As a result, WARs now deploy nicely and I've removed the explcit
mathassessengine.log to make the WAR more portable.
Finally, tidied up BuildConfig.groovy to completely remove the
commented out deps for the previously external
JQTI-Controller, JQTI-Rendering and QTItoolsUtils modules.
Modified Paths:
--------------
branches/mathassess/QTIEngine/application.properties
branches/mathassess/QTIEngine/grails-app/conf/BuildConfig.groovy
branches/mathassess/QTIEngine/grails-app/conf/Config.groovy
branches/mathassess/QTIEngine/src/templates/war/web.xml
Modified: branches/mathassess/QTIEngine/application.properties
===================================================================
--- branches/mathassess/QTIEngine/application.properties 2010-04-08 16:35:28 UTC (rev 2436)
+++ branches/mathassess/QTIEngine/application.properties 2010-04-08 16:40:06 UTC (rev 2437)
@@ -1,8 +1,8 @@
#Grails Metadata file
-#Fri Feb 12 11:56:46 GMT 2010
-app.grails.version=1.2.1
+#Thu Apr 08 14:51:51 BST 2010
+app.grails.version=1.2.2
app.name=MathAssessEngine
app.servlet.version=2.4
-app.version=0.3.3
-plugins.hibernate=1.2.1
-plugins.tomcat=1.2.1
+app.version=0.3.4-dev
+plugins.hibernate=1.2.2
+plugins.tomcat=1.2.2
Modified: branches/mathassess/QTIEngine/grails-app/conf/BuildConfig.groovy
===================================================================
--- branches/mathassess/QTIEngine/grails-app/conf/BuildConfig.groovy 2010-04-08 16:35:28 UTC (rev 2436)
+++ branches/mathassess/QTIEngine/grails-app/conf/BuildConfig.groovy 2010-04-08 16:40:06 UTC (rev 2437)
@@ -26,22 +26,14 @@
dependencies {
// specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes eg.
- compile 'org.qtitools.qti:JQTI:MA2.0-SNAPSHOT'
compile 'javax.mail:mail:1.4'
- compile 'uk.ac.ed.ph.snuggletex:snuggletex-core:1.2.0'
-
- /* DM: The following modules have been "temporarily" merged into this project */
-// compile 'org.qtitools:QTItoolsUtils:MA1.0-SNAPSHOT'
-// compile 'org.qtitools:JQTI-Rendering:MA1.0-SNAPSHOT'
-// compile 'org.qtitools:JQTI-Controller:MA1.0-SNAPSHOT'
-// runtime 'org.qtitools.mathassess:MathAssessTools-JQTI-Glue:1.2-SNAPSHOT'
-
- /* DM: The following need to be temporarily included as transitive deps of the modules we've temporarily merged in */
- compile 'org.qtitools.mathassess:MathAssessTools-Glue:1.3-SNAPSHOT'
- compile 'org.qtitools.mathassess:MathAssessTools-Glue-Extras:1.3-SNAPSHOT'
+ compile 'uk.ac.ed.ph.snuggletex:snuggletex-core:1.2.1'
+ compile 'org.qtitools.qti:JQTI-MathAssess:2.0'
+ compile 'org.qtitools.mathassess:MathAssessTools-Glue:1.3.0'
+ compile 'org.qtitools.mathassess:MathAssessTools-Glue-Extras:1.3.0'
runtime 'net.sf.saxon:saxon9:9.1.0.8'
runtime 'net.sf.saxon:saxon9-dom:9.1.0.8'
-
+
/* Replace the rubbish XML parser that ships with the JDK with a real version of Xerces */
runtime('xerces:xercesImpl:2.9.1') {
/* (Exclude xml-apis as there's a conflict with the one in the boot ClassLoader for run-app.) */
@@ -51,7 +43,7 @@
}
// NOTE: In some cases, you way want to exclude certain JARs from the WAR build.
-// If so, put something like the following code in ~/.grails/settings.groovy in order
+// If so, put something like the following code in $HOME/.grails/settings.groovy in order
// to customise your local build:
//
//grails.war.resources = { stagingDir ->
Modified: branches/mathassess/QTIEngine/grails-app/conf/Config.groovy
===================================================================
--- branches/mathassess/QTIEngine/grails-app/conf/Config.groovy 2010-04-08 16:35:28 UTC (rev 2436)
+++ branches/mathassess/QTIEngine/grails-app/conf/Config.groovy 2010-04-08 16:40:06 UTC (rev 2437)
@@ -9,6 +9,8 @@
// if(System.properties["${appName}.config.location"]) {
// grails.config.locations << "file:" + System.properties["${appName}.config.location"]
// }
+
+grails.project.groupId = appName // change this to alter the default package name and Maven publishing destination
grails.mime.file.extensions = true // enables the parsing of file extensions from URLs into the request format
grails.mime.use.accept.header = false
grails.mime.types = [ html: ['text/html','application/xhtml+xml'],
@@ -35,7 +37,6 @@
// Set to false to use the new Grails 1.2 JSONBuilder in the render method
grails.json.legacy.builder=false
-
// enabled native2ascii conversion of i18n properties files
grails.enable.native2ascii = true
// whether to install the java.util.logging bridge for sl4j. Disable fo AppEngine!
@@ -59,15 +60,14 @@
// log4j configuration
log4j = {
- // Example of changing the log pattern for the default console
- // appender:
- //
+// Example of changing the log pattern for the default console
+// appender:
+
appenders {
console name:'stdout', layout:pattern(conversionPattern: '%-5p [%d{ISO8601}] (%t) [%c/%L#%M()] - %m%n')
- rollingFile name:'file', maxFileSize:'1024KB', file:'mathassessengine.log', layout:pattern(conversionPattern: '%-5p [%d{ISO8601}] (%t) [%c/%L#%M()] - %m%n')
}
root {
- warn 'stdout', 'file'
+ debug
additivity = true
}
Modified: branches/mathassess/QTIEngine/src/templates/war/web.xml
===================================================================
--- branches/mathassess/QTIEngine/src/templates/war/web.xml 2010-04-08 16:35:28 UTC (rev 2436)
+++ branches/mathassess/QTIEngine/src/templates/war/web.xml 2010-04-08 16:40:06 UTC (rev 2437)
@@ -5,10 +5,6 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<display-name>/@grails.project.key@</display-name>
- <context-param>
- <param-name>log4jConfigLocation</param-name>
- <param-value>/WEB-INF/classes/log4j.xml</param-value>
- </context-param>
<context-param>
<param-name>contextConfigLocation</param-name>
@@ -49,6 +45,10 @@
</filter-mapping>
<listener>
+ <listener-class>org.codehaus.groovy.grails.web.util.Log4jConfigListener</listener-class>
+ </listener>
+
+ <listener>
<listener-class>org.codehaus.groovy.grails.web.context.GrailsContextLoaderListener</listener-class>
</listener>
@@ -73,7 +73,7 @@
<servlet-name>gsp</servlet-name>
<url-pattern>*.gsp</url-pattern>
</servlet-mapping>
-
+
<!--
(Upped the session timeout to 5 hours to help prevent timeouts occurring, especially
when running via the Moodle plugin.)
@@ -81,7 +81,7 @@
<session-config>
<session-timeout>300</session-timeout>
</session-config>
-
+
<welcome-file-list>
<!--
The order of the welcome pages is important. JBoss deployment will
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
