Skip to content

Commit 8d715d4

Browse files
committed
0.7.8
* ast fixed * cleanup
1 parent 9783f87 commit 8d715d4

File tree

6 files changed

+20
-14
lines changed

6 files changed

+20
-14
lines changed

Diff for: grails-app/conf/BuildConfig.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ grails.project.dependency.resolution = {
3333
// not using ivy currently because of https://issues.apache.org/jira/browse/IVY-933 resolution of the 0.98 version fails
3434
// runtime 'com.google.code.morphia:morphia:0.98'
3535
// runtime 'com.google.code.morphia:logging-slf4j:0.98'
36-
compile 'org.mongodb:mongo-java-driver:2.7.+'
36+
// compile 'org.mongodb:mongo-java-driver:2.7.+'
3737
}
3838

3939
}

Diff for: lib/mongo-java-driver-2.7.2.jar

285 KB
Binary file not shown.

Diff for: plugin.xml

+12-6
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,25 @@
44
<title>Alternative MongoDB GORM based on the Morphia library</title>
55
<description>GORM implementation for the MongoDB NoSQL database based on the Morphia library</description>
66
<documentation>http://wiki.github.com/jkuehn/gorm-mongodb/</documentation>
7+
<type>MongodbMorphiaGrailsPlugin</type>
78
<resources>
8-
<resource>BuildConfig</resource>
9-
<resource>Config</resource>
10-
<resource>DataSource</resource>
11-
<resource>UrlMappings</resource>
129
<resource>org.acme.Project</resource>
1310
<resource>org.acme.Task</resource>
1411
<resource>org.acme.inheritance.Person</resource>
1512
<resource>org.acme.inheritance.User</resource>
1613
<resource>org.acme.Contact</resource>
1714
</resources>
18-
<dependencies>
15+
<repositories>
16+
<repository name='grailsCentral' url='http://plugins.grails.org' />
17+
<repository name='http://repo.grails.org/grails/plugins' url='http://repo.grails.org/grails/plugins/' />
18+
<repository name='http://repo.grails.org/grails/core' url='http://repo.grails.org/grails/core/' />
19+
<repository name='grailsCore' url='http://svn.codehaus.org/grails/trunk/grails-plugins' />
20+
<repository name='mavenCentral' url='http://repo1.maven.org/maven2/' />
21+
</repositories>
22+
<dependencies />
23+
<plugins />
24+
<runtimePluginRequirements>
1925
<plugin name='core' version='1.3.4 &gt; *' />
20-
</dependencies>
26+
</runtimePluginRequirements>
2127
<behavior />
2228
</plugin>

Diff for: release_2_publish.bat renamed to publish.bat

File renamed without changes.

Diff for: release_1_buildast.bat

-1
This file was deleted.

Diff for: scripts/_Install.groovy

+7-6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
//
1111

1212
includeTargets << grailsScript("_GrailsClean")
13+
includeTargets << grailsScript("_GrailsCompile")
14+
1315

1416
// Because we make use of ASTTransformations, make sure that everything is clean
1517
// after installing the plugin.
@@ -18,11 +20,10 @@ cleanAll()
1820
// make the mongodb domains folder
1921
ant.mkdir(dir:"${basedir}/grails-app/mongo")
2022

21-
22-
23-
// compile ast transformations
24-
def pluginDir = grailsSettings.projectPluginsDir.listFiles().find({ it.isDirectory() && it.name.startsWith('mongodb-morphia') })
25-
23+
/**
24+
* build ast jar
25+
*/
26+
def pluginDir = mongodbMorphiaPluginDir
2627
if (pluginDir) {
2728

2829
def mongoAstSrcDir = new File("${mongodbMorphiaPluginDir}/src/groovy/grails/plugins/mongodb/ast")
@@ -33,7 +34,7 @@ if (pluginDir) {
3334
ant.mkdir(dir:mongoAstBuildDir)
3435

3536
// compile ast classes
36-
ant.groovyc(destdir: mongoAstBuildDir, encoding: "UTF-8") {
37+
ant.groovyc(destdir: mongoAstBuildDir, encoding: "UTF-8", classpathref:"grails.compile.classpath") {
3738
src(path: mongoAstSrcDir)
3839
}
3940

0 commit comments

Comments
 (0)