Skip to content

Commit 00d50ba

Browse files
graemerochergraemerocher
committed
Merge branch '1.2.x' of github.com:grails/grails-core into 1.2.x
2 parents ba0a091 + c912614 commit 00d50ba

File tree

12 files changed

+95
-18
lines changed

12 files changed

+95
-18
lines changed

‎ant/build/compile.xml‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
<project name="grails-compile">
22

3-
<taskdef name="groovyc"
4-
classname="org.codehaus.groovy.ant.Groovyc">
3+
<taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc">
54
<classpath>
65
<fileset dir="${grails.lib}" includes="groovy-all*.jar"/>
76
</classpath>
87
</taskdef>
98

109
<target name="build-init">
11-
<mkdir dir="${grails.build}"/>
12-
<mkdir dir="${grails.test.build}"/>
13-
<mkdir dir="${grails.test.reports}"/>
14-
<mkdir dir="${grails.dist}"/>
10+
<mkdir dir="${grails.build}"/>
11+
<mkdir dir="${grails.test.build}"/>
12+
<mkdir dir="${grails.test.reports}"/>
1513
<mkdir dir="${grails.stubs}" />
1614
</target>
1715

18-
<target name="build" depends="build-init" description="compile Java and Groovy sources" >
16+
<target name="build" depends="build-init" description="compile Java and Groovy sources" >
1917

2018
<copy todir="${grails.build}">
2119
<fileset dir="${grails.src}" includes="**/*.properties" />
@@ -47,14 +45,14 @@
4745

4846
<mkdir dir="${grails.build}/META-INF" />
4947
<manifest file="${grails.build}/META-INF/MANIFEST.MF">
50-
<attribute name="Built-By" value="${user.name}"/>
51-
<attribute name="Implementation-Title" value="Grails"/>
52-
<attribute name="Implementation-Version" value="${grails.version}"/>
53-
<attribute name="Implementation-Vendor" value="grails.org"/>
48+
<attribute name="Built-By" value="${user.name}"/>
49+
<attribute name="Implementation-Title" value="Grails"/>
50+
<attribute name="Implementation-Version" value="${grails.version}"/>
51+
<attribute name="Implementation-Vendor" value="grails.org"/>
5452
</manifest>
5553

5654
<copy todir="${grails.build}">
57-
<fileset dir="${grails.src}" includes="**/*.xsd" />
55+
<fileset dir="${grails.src}" includes="**/*.xsd, **/*.dtd" />
5856
</copy>
5957

6058
<copy todir="${grails.build}/META-INF">
@@ -63,7 +61,7 @@
6361
<include name="*.schemas" />
6462
</fileset>
6563
</copy>
66-
64+
6765
</target>
6866

6967
<target name="build-scripts" depends="build">
@@ -77,5 +75,4 @@
7775
</groovyc>
7876
</target>
7977

80-
8178
</project>

‎build.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ bundlor.hibernate.version=3.3.1.GA
1313
bundlor.javassist.version=3.9.0
1414
bundlor.svnkit.version=1.3.1
1515
bundlor.servlet.version=2.5.0
16+
bundlor.servlet.jsp.version=2.1.0
1617
bundlor.radeox.version=1.0.0.b2
1718
bundlor.groovy.version=1.6.8
1819
bundlor.spring.version=3.0.0.RELEASE

‎maven/grails-crud.mf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Import-Template:
1616
org.codehaus.groovy.grails.*;version="${grails.version:[=.=.=, =.+1.0)}",
1717
grails.*;version="${grails.version:[=.=.=, =.+1.0)}",
1818
javax.servlet.*;version="${servlet.version:[=.=.=, +1.0.0)}",
19+
javax.servlet.jsp.*;version="${servlet.jsp.version:[=.=.=, +1.0.0)}",
1920
org.w3c.dom.*;version="0",
2021
org.xml.sax.*;version="0",
2122
org.springframework.*;version="${spring.version:[=.=.=, +1.0.0)}"

‎maven/grails-gorm.mf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Import-Template:
1919
org.hibernate.*;version="${hibernate.version:[=.=.=, =.+1.0)}",
2020
javassist.*;version="${javassist.version:[=.=.=, +1.0.0)}",
2121
javax.servlet.*;version="${servlet.version:[=.=.=, +1.0.0)}",
22+
javax.servlet.jsp.*;version="${servlet.jsp.version:[=.=.=, +1.0.0)}",
2223
javax.sql.*;version="0",
2324
org.w3c.dom.*;version="0",
2425
org.springframework.*;version="${spring.version:[=.=.=, +1.0.0)}"

‎maven/grails-osgi.mf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Import-Template:
2626
org.codehaus.groovy.grails.*;version="${grails.version:[=.=.=, =.+1.0)}",
2727
grails.*;version="${grails.version:[=.=.=, =.+1.0)}",
2828
javax.servlet.*;version="${servlet.version:[=.=.=, +1.0.0)}",
29+
javax.servlet.jsp.*;version="${servlet.jsp.version:[=.=.=, +1.0.0)}",
2930
javax.persistence.*;version="${javax.persistence.version:[=.=.=, =.+1.0)}",
3031
javax.sql.*;version="0",
3132
javax.xml.parsers.*;version="0",

‎maven/grails-spring.mf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Import-Template:
1515
org.codehaus.groovy.classgen.*;version="${groovy.version:[=.=.=, =.+1.0)}",
1616
grails.*;version="${grails.version:[=.=.=, =.+1.0)}",
1717
javax.servlet.*;version="${servlet.version:[=.=.=, +1.0.0)}",
18+
javax.servlet.jsp.*;version="${servlet.jsp.version:[=.=.=, +1.0.0)}",
1819
org.w3c.dom.*;version="0",
1920
org.xml.sax.*;version="0",
2021
org.springframework.*;version="${spring.version:[=.=.=, +1.0.0)}"

‎maven/grails-test.mf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Import-Template:
1212
org.apache.tools.ant.*;version="${ant.version:[=.=.=, +1.0.0)}",
1313
groovy.*;version="${groovy.version:[=.=.=, =.+1.0)}",
1414
javax.servlet.*;version="${servlet.version:[=.=.=, +1.0.0)}",
15+
javax.servlet.jsp.*;version="${servlet.jsp.version:[=.=.=, +1.0.0)}",
1516
org.codehaus.groovy.classgen.*;version="${groovy.version:[=.=.=, =.+1.0)}",
1617
org.codehaus.groovy.transform.*;version="${groovy.version:[=.=.=, =.+1.0)}",
1718
org.codehaus.groovy.runtime.*;version="${groovy.version:[=.=.=, =.+1.0)}",

‎maven/grails-web.mf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Import-Template:
2727
com.opensymphony.sitemesh.*;version="${sitemesh.version:[=.=.=, =.+1.0)}",
2828
grails.*;version="${grails.version:[=.=.=, =.+1.0)}",
2929
javax.servlet.*;version="${servlet.version:[=.=.=, +1.0.0)}",
30+
javax.servlet.jsp.*;version="${servlet.jsp.version:[=.=.=, +1.0.0)}",
3031
org.w3c.dom.*;version="0",
3132
javax.el.*;version="0",
3233
javax.xml.parsers.*;version="0",

‎maven/grails-webflow.mf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Import-Template:
1515
org.codehaus.groovy.grails.*;version="${grails.version:[=.=.=, =.+1.0)}",
1616
grails.*;version="${grails.version:[=.=.=, =.+1.0)}",
1717
javax.servlet.*;version="${servlet.version:[=.=.=, +1.0.0)}",
18+
javax.servlet.jsp.*;version="${servlet.jsp.version:[=.=.=, +1.0.0)}",
1819
org.hibernate.*;version="${hibernate.version:[=.=.=, =.+1.0)}",
1920
org.springframework.beans.*;version="${spring.version:[=.=.=, +1.0.0)}",
2021
org.springframework.core.*;version="${spring.version:[=.=.=, +1.0.0)}",

‎scripts/ReleasePlugin.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ def addPluginZipAndMetadataIfNeccessary(File pluginXml, File pluginFile) {
368368

369369

370370
target(updateAndCommitLatest:"Commits the latest revision of the Plug-in") {
371-
def result = confirmInput("""
371+
def result = !isInteractive || confirmInput("""
372372
This command will perform the following steps to release your plug-in to Grails' SVN repository:
373373
* Update your sources to the HEAD revision
374374
* Commit any changes you've made to SVN
@@ -431,7 +431,7 @@ target(importToSVN:"Imports a plugin project to Grails' remote SVN repository")
431431
}
432432

433433
try {
434-
def result = confirmInput("""
434+
def result = !isInteractive || confirmInput("""
435435
This plug-in project is not currently in the repository, this command will now:
436436
* Perform an SVN import into the repository
437437
* Checkout the imported version of the project from SVN to '${checkOutDir}'
@@ -466,7 +466,7 @@ def checkoutFromSVN(File checkOutDir, SVNURL svnURL) {
466466

467467
SVNURL importBaseToSVN(File importBaseDirectory) {
468468
importClient = new SVNCommitClient((ISVNAuthenticationManager) authManager, null)
469-
askForMessage()
469+
if (!commitMessage) askForMessage()
470470

471471
println "Importing project to ${remoteLocation}. Please wait..."
472472

0 commit comments

Comments
 (0)