Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Upgraded from GParallelizer 0.8.3 to GPars 0.9. Two reasons:

 1. The GParallilizer name and project are deprecated.
 2. GPars is available in Maven Central, whereas GParallelizer
    is in the java.net repository.
  • Loading branch information...
commit eb97079ea2376323c1fe3302a32217971b76e51a 1 parent 8fcebbf
@pledbrook pledbrook authored
View
2  grails/conf/groovy-starter.conf
@@ -11,7 +11,7 @@
# Load required libraries
load ${grails.home}/dist/grails-bootstrap-${grails.version}.jar
load ${grails.home}/lib/groovy-all-1.6.7.jar
- load ${grails.home}/lib/GParallelizer-0.8.3.jar
+ load ${grails.home}/lib/gpars-0.9.jar
load ${grails.home}/lib/ivy-2.1.0.jar
load ${grails.home}/lib/gant_groovy1.6-1.6.0.jar
load ${tools.jar}
View
BIN  grails/lib/GParallelizer-0.8.3.jar
Binary file not shown
View
BIN  grails/lib/gpars-0.9.jar
Binary file not shown
View
6 grails/maven/grails-bootstrap.pom.in
@@ -34,9 +34,9 @@
<dependencies>
<!-- External Dependencies -->
<dependency>
- <groupId>org.gparallelizer</groupId>
- <artifactId>GParallelizer</artifactId>
- <version>0.8.3</version>
+ <groupId>org.codehaus.gpars</groupId>
+ <artifactId>gpars</artifactId>
+ <version>0.9</version>
</dependency>
<dependency>
View
7 grails/scripts/_GrailsPackage.groovy
@@ -19,9 +19,10 @@ import org.codehaus.groovy.grails.commons.ConfigurationHolder
import org.codehaus.groovy.grails.commons.cfg.ConfigurationHelper
import org.codehaus.groovy.grails.plugins.logging.Log4jConfig
import org.springframework.core.io.FileSystemResource
-import org.gparallelizer.Asynchronizer
import org.springframework.core.io.Resource
+
import grails.util.PluginBuildSettings
+import groovyx.gpars.Asynchronizer
/**
* Gant script that packages a Grails application (note: does not create WAR)
@@ -115,8 +116,8 @@ target( packageApp : "Implementation of package target") {
PluginBuildSettings settings = pluginSettings
def i18nPluginDirs = settings.pluginI18nDirectories
if(i18nPluginDirs) {
- Asynchronizer.withAsynchronizer(5) {
- i18nPluginDirs.eachAsync { Resource srcDir ->
+ Asynchronizer.doParallel(5) {
+ i18nPluginDirs.eachParallel { Resource srcDir ->
if(srcDir.exists()) {
def file = srcDir.file
def pluginDir = file.parentFile.parentFile
View
12 grails/src/java/grails/util/BuildSettings.groovy
@@ -20,7 +20,7 @@ import java.util.regex.Pattern
import org.apache.ivy.util.DefaultMessageLogger
import org.apache.ivy.util.Message
import org.codehaus.groovy.grails.resolve.IvyDependencyManager
-import org.gparallelizer.Asynchronizer
+import groovyx.gpars.Asynchronizer
/**
@@ -720,20 +720,20 @@ class BuildSettings {
// All projects need the plugins to be resolved.
def handlePluginDirectory = pluginDependencyHandler()
- Asynchronizer.withAsynchronizer(5) {
+ Asynchronizer.doParallel(5) {
Closure predicate = { it.directory && !it.hidden }
- def pluginDirs = projectPluginsDir.listFiles().findAllAsync(predicate)
+ def pluginDirs = projectPluginsDir.listFiles().findAllParallel(predicate)
if (globalPluginsDir.exists()) {
- pluginDirs.addAll(globalPluginsDir.listFiles().findAllAsync(predicate))
+ pluginDirs.addAll(globalPluginsDir.listFiles().findAllParallel(predicate))
}
def pluginLocations = config?.grails?.plugin?.location
- pluginLocations?.values().eachAsync {location ->
+ pluginLocations?.values().eachParallel {location ->
pluginDirs << new File(location).canonicalFile
}
- pluginDirs.eachAsync(handlePluginDirectory)
+ pluginDirs.eachParallel(handlePluginDirectory)
}
}
View
2  grails/src/java/org/codehaus/groovy/grails/resolve/IvyDependencyManager.groovy
@@ -239,7 +239,7 @@ public class IvyDependencyManager implements DependencyResolver, DependencyDefin
dependencies {
// dependencies needed by the Grails build system
- build "org.gparallelizer:GParallelizer:0.8.3",
+ build "org.codehaus.gpars:gpars:0.9",
"org.tmatesoft.svnkit:svnkit:1.3.1",
"org.apache.ant:ant:1.7.1",
"org.apache.ant:ant-launcher:1.7.1",
Please sign in to comment.
Something went wrong with that request. Please try again.