Skip to content

Commit

Permalink
fix NPE problems and broken API links
Browse files Browse the repository at this point in the history
  • Loading branch information
graemerocher committed Feb 19, 2015
1 parent f77701f commit 4b6a07d
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 26 deletions.
8 changes: 6 additions & 2 deletions build.gradle
Expand Up @@ -22,11 +22,15 @@ buildscript {
}

dependencies {
classpath "org.grails:grails-docs:3.0.0.M1"
classpath "org.grails:grails-docs:3.0.0.BUILD-SNAPSHOT"
classpath 'org.codehaus.groovy:groovy-all:2.4.0'
}
}

task buildscriptDependencies(type: DependencyReportTask) {
configurations = [buildscript.configurations.classpath]
}

// use jsoup in PdfBuilder for cleaning input html
System.setProperty('grails.docs.clean.html','true')
// creates single.html.before.xml and single.html.after.xml files for debugging pdf input when enabled
Expand Down Expand Up @@ -57,7 +61,7 @@ fetchGrailsSource.onlyIf { !explicitGrailsHome }
task apiDocs(type: Exec, dependsOn: 'fetchGrailsSource') {
commandLine = ["./gradlew", "groovydoc"]
workingDir = "${checkOutDir}/grails-src"

environment "GRADLE_OPTS", "-Xmx2048m -Xms256m -XX:MaxPermSize=512m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError"
}

apiDocs.onlyIf { !System.getProperty("disable.groovydocs") }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Wed May 07 15:07:35 EEST 2014
#Thu Feb 19 14:04:49 CET 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
6 changes: 3 additions & 3 deletions resources/doc.properties
Expand Up @@ -88,9 +88,9 @@ api.org.springframework=http://docs.spring.io/spring/docs/4.0.x/javadoc-api
api.javax.servlet=http://download.oracle.com/javaee/1.4/api
api.java.=http://docs.oracle.com/javase/6/docs/api
api.groovy.=http://docs.groovy-lang.org/docs/latest/html/api
api.org.codehaus.groovy.grails=http://grails.org/doc/2.4.x/api
api.grails.=http://grails.org/doc/2.4.x/api
api.org.grails.=http://grails.org/doc/2.4.x/api
api.org.codehaus.groovy.grails=http://grails.org/doc/3.0.x/api
api.grails.=http://grails.org/doc/3.0.x/api
api.org.grails.=http://grails.org/doc/3.0.x/api

# Regular expression to parse out source code
source.tag.regex=/\s*?def\s+?[a-zA-Z]+?\s*?=\s*?\{\s*?attrs\s*?,{0,1}\s*?body{0,1}\s*?->.+?/
29 changes: 14 additions & 15 deletions src/en/guide/commandLine/gradleBuild/gradleDependencies.gdoc
Expand Up @@ -5,26 +5,26 @@ The default dependencies for the "web" profile can be seen below:
{code}
dependencies {
compile 'org.springframework.boot:spring-boot-starter-logging'
compile("org.springframework.boot:spring-boot-starter-actuator")
compile "org.springframework.boot:spring-boot-autoconfigure"
compile "org.springframework.boot:spring-boot-starter-tomcat"
compile "org.grails:grails-dependencies:$grailsVersion"
compile "org.grails:grails-web-boot:$grailsVersion"
compile('org.springframework.boot:spring-boot-starter-actuator')
compile 'org.springframework.boot:spring-boot-autoconfigure'
compile 'org.springframework.boot:spring-boot-starter-tomcat'
compile 'org.grails:grails-dependencies'
compile 'org.grails:grails-web-boot'

compile "org.grails.plugins:hibernate"
compile "org.grails.plugins:cache"
compile "org.hibernate:hibernate-ehcache"
compile 'org.grails.plugins:hibernate'
compile 'org.grails.plugins:cache'
compile 'org.hibernate:hibernate-ehcache'

runtime "org.grails.plugins:asset-pipeline"
runtime "org.grails.plugins:scaffolding"
runtime 'org.grails.plugins:asset-pipeline'
runtime 'org.grails.plugins:scaffolding'

testCompile "org.grails:grails-plugin-testing"
testCompile "org.grails.plugins:geb"
testCompile "org.grails:grails-plugin-testing'
testCompile "org.grails.plugins:geb'

// Note: It is recommended to update to a more robust driver (Chrome, Firefox etc.)
testRuntime 'org.seleniumhq.selenium:selenium-htmlunit-driver:2.44.0'

console "org.grails:grails-console"
console 'org.grails:grails-console'
}
{code}

Expand All @@ -33,9 +33,8 @@ Note that version numbers are not present in the majority of the dependencies. T
{code}
dependencyManagement {
imports {
mavenBom "org.grails:grails-bom:$grailsVersion"
mavenBom 'org.grails:grails-bom:' + grailsVersion
}
applyMavenExclusions false
}
{code}

2 changes: 1 addition & 1 deletion src/en/guide/testing/functionalTesting.gdoc
Expand Up @@ -23,7 +23,7 @@ class HomeSpec extends GebSpec {
go '/'

then:"The title is correct"
$('title').text() == "Welcome to Grails"
\$('title').text() == "Welcome to Grails"
}
}

Expand Down
Expand Up @@ -23,9 +23,11 @@ An @Interceptor@ implements the [Interceptor|api:grails.artefact.Interceptor] tr
void afterView() {}
{code}

As described above the @before@ method is executed prior to an action and can cancel the execution of the action by returning @false.
As described above the @before@ method is executed prior to an action and can cancel the execution of the action by returning @false@.

The @after@ method is executed after an action executes and can halt view rendering if it returns false. The @after@ method can also modify the view or model using the @view@ and @model@ properties respectively:


The @after@ method is executed after an action executes and can halt view rendering if it returns false. The @after@ method can also modify the view or model using the @view@ and @model@ properties:

{code}
boolean after() {
Expand All @@ -35,4 +37,4 @@ boolean after() {
}
{code}

The @afterView@ method is executed after view rendering completes and if an exception occurs, the exception is available using the @throwable@ property of the [Interceptor|api:grails.artefact.Interceptor] trait.
The @afterView@ method is executed after view rendering completes and if an exception occurs, the exception is available using the @throwable@ property of the [Interceptor|api:grails.artefact.Interceptor] trait.

0 comments on commit 4b6a07d

Please sign in to comment.