Skip to content

Commit c681605

Browse files
jeffscottbrownjeffscottbrown
committed
use springloaded 1.1.1
Conflicts: build.gradle grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/fork/ForkedGrailsProcess.groovy
1 parent 1636ba2 commit c681605

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ ext {
3535
jlineVersion = "1.0"
3636
jnaVersion = "3.2.3"
3737
slf4jVersion = "1.6.2"
38-
springLoadedVersion = "1.1.0"
38+
springLoadedVersion = "1.1.1"
3939
springVersion = "3.1.2.RELEASE"
4040
springWebflowVersion= "2.0.8.RELEASE"
4141
hibernateVersion = "3.6.10.Final"

‎gradle/assemble.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ task installResources(type: Copy) {
139139
filter(ReplaceTokens, tokens: ['starter.main.class': 'org.codehaus.groovy.grails.cli.support.GrailsStarter'])
140140
filter(ReplaceTokens, tokens: ['windows.starter.classpath': "%GRAILS_HOME%\\lib\\org.codehaus.groovy\\groovy-all\\jars\\groovy-all-${groovyVersion}.jar;%GRAILS_HOME%\\dist\\grails-bootstrap-${grailsVersion}.jar".toString()])
141141
filter(ReplaceTokens, tokens: ['starter.classpath': "\$GRAILS_HOME/lib/org.codehaus.groovy/groovy-all/jars/groovy-all-${groovyVersion}.jar:\$GRAILS_HOME/dist/grails-bootstrap-${grailsVersion}.jar".toString()])
142-
filter(ReplaceTokens, tokens: ['agent.string': "-javaagent:\$AGENT_GRAILS_HOME/lib/com.springsource.springloaded/springloaded-core/jars/springloaded-core-${springLoadedVersion}.jar -noverify -Dspringloaded.synchronize=true -Dspringloaded=\$SPRINGLOADED_PARAMS".toString()])
143-
filter(ReplaceTokens, tokens: ['windows.agent.string': "-javaagent:%GRAILS_HOME:\\=/%/lib/com.springsource.springloaded/springloaded-core/jars/springloaded-core-${springLoadedVersion}.jar -noverify -Dspringloaded.synchronize=true -Dspringloaded=%SPRINGLOADED_PARAMS%".toString()])
142+
filter(ReplaceTokens, tokens: ['agent.string': "-javaagent:\$AGENT_GRAILS_HOME/lib/org.springsource.springloaded/springloaded-core/jars/springloaded-core-${springLoadedVersion}.jar -noverify -Dspringloaded.synchronize=true -Dspringloaded=\$SPRINGLOADED_PARAMS".toString()])
143+
filter(ReplaceTokens, tokens: ['windows.agent.string': "-javaagent:%GRAILS_HOME:\\=/%/lib/org.springsource.springloaded/springloaded-core/jars/springloaded-core-${springLoadedVersion}.jar -noverify -Dspringloaded.synchronize=true -Dspringloaded=%SPRINGLOADED_PARAMS%".toString()])
144144
filter(ReplaceTokens, tokens: ['startup.command': ''])
145145
fileMode = 0755
146146
}
@@ -232,8 +232,8 @@ task zipDist(type: Zip, dependsOn: [sourcesJars, install]) {
232232
filter(ReplaceTokens, tokens: ['starter.main.class': 'org.codehaus.groovy.grails.cli.support.GrailsStarter'])
233233
filter(ReplaceTokens, tokens: ['windows.starter.classpath': "%GRAILS_HOME%\\lib\\org.codehaus.groovy\\groovy-all\\jars\\groovy-all-${groovyVersion}.jar;%GRAILS_HOME%\\dist\\grails-bootstrap-${grailsVersion}.jar".toString()])
234234
filter(ReplaceTokens, tokens: ['starter.classpath': "\$GRAILS_HOME/lib/org.codehaus.groovy/groovy-all/jars/groovy-all-${groovyVersion}.jar:\$GRAILS_HOME/dist/grails-bootstrap-${grailsVersion}.jar".toString()])
235-
filter(ReplaceTokens, tokens: ['agent.string': "-javaagent:\$AGENT_GRAILS_HOME/lib/com.springsource.springloaded/springloaded-core/jars/springloaded-core-${springLoadedVersion}.jar -noverify -Dspringloaded=\$SPRINGLOADED_PARAMS".toString()])
236-
filter(ReplaceTokens, tokens: ['windows.agent.string': "-javaagent:%GRAILS_HOME:\\=/%/lib/com.springsource.springloaded/springloaded-core/jars/springloaded-core-${springLoadedVersion}.jar -noverify -Dspringloaded=%SPRINGLOADED_PARAMS%".toString()])
235+
filter(ReplaceTokens, tokens: ['agent.string': "-javaagent:\$AGENT_GRAILS_HOME/lib/org.springsource.springloaded/springloaded-core/jars/springloaded-core-${springLoadedVersion}.jar -noverify -Dspringloaded=\$SPRINGLOADED_PARAMS".toString()])
236+
filter(ReplaceTokens, tokens: ['windows.agent.string': "-javaagent:%GRAILS_HOME:\\=/%/lib/org.springsource.springloaded/springloaded-core/jars/springloaded-core-${springLoadedVersion}.jar -noverify -Dspringloaded=%SPRINGLOADED_PARAMS%".toString()])
237237
filter(ReplaceTokens, tokens: ['startup.command': ''])
238238
fileMode = 0755
239239
}

‎grails-bootstrap/src/main/groovy/grails/util/Environment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ public static void setInitializing(boolean initializing) {
414414
*/
415415
public static boolean isReloadingAgentEnabled() {
416416
try {
417-
Class.forName("com.springsource.loaded.TypeRegistry");
417+
Class.forName("org.springsource.loaded.TypeRegistry");
418418
return true;
419419
}
420420
catch (ClassNotFoundException e) {

‎grails-core/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ dependencies {
5656
exclude group: 'xml-apis', module:'xml-apis'
5757
}
5858

59-
compile ("com.springsource.springloaded:springloaded-core:$springLoadedVersion") {
59+
compile ("org.springsource.springloaded:springloaded-core:$springLoadedVersion") {
6060
ext.notInPom = true
6161
}
6262

‎grails-core/src/main/groovy/org/codehaus/groovy/grails/cli/agent/GrailsPluginManagerReloadPlugin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
package org.codehaus.groovy.grails.cli.agent;
1717

18-
import com.springsource.loaded.Plugins;
19-
import com.springsource.loaded.ReloadEventProcessorPlugin;
18+
import org.springsource.loaded.Plugins;
19+
import org.springsource.loaded.ReloadEventProcessorPlugin;
2020
import org.codehaus.groovy.grails.commons.ClassPropertyFetcher;
2121
import org.codehaus.groovy.grails.compiler.GrailsProjectWatcher;
2222
import org.springframework.beans.CachedIntrospectionResults;

‎grails-core/src/main/groovy/org/codehaus/groovy/grails/compiler/GrailsProjectWatcher.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public class GrailsProjectWatcher extends DirectoryWatcher {
4949
private static final Map<String, ClassUpdate> classChangeEventQueue = new ConcurrentHashMap<String, ClassUpdate>();
5050
private static boolean active = false;
5151
private static boolean reloadInProgress = false;
52-
public static final String SPRING_LOADED_PLUGIN_CLASS = "com.springsource.loaded.Plugins";
52+
public static final String SPRING_LOADED_PLUGIN_CLASS = "org.springsource.loaded.Plugins";
5353

5454
private List<String> compilerExtensions;
5555
private GrailsPluginManager pluginManager;

‎grails-core/src/main/groovy/org/codehaus/groovy/grails/exceptions/DefaultStackTraceFilterer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class DefaultStackTraceFilterer implements StackTraceFilterer {
5151
"sun.",
5252
"java.lang.reflect.",
5353
"org.springframework.",
54-
"com.springsource.loaded.",
54+
"org.springsource.loaded.",
5555
"com.opensymphony.",
5656
"org.hibernate.",
5757
"javax.servlet."

‎scripts/Wrapper.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ target ('default': "Installs the Grails wrapper") {
5454
ant.chmod(file: 'grailsw', perm: 'u+x')
5555

5656
springloadedFiles = []
57-
new File("${grailsHome}/lib/com.springsource.springloaded/springloaded-core/jars/").eachFileMatch( groovy.io.FileType.FILES, { it ==~ /springloaded-core-.*/ }) {
57+
new File("${grailsHome}/lib/org.springsource.springloaded/springloaded-core/jars/").eachFileMatch( groovy.io.FileType.FILES, { it ==~ /springloaded-core-.*/ }) {
5858
springloadedFiles << it
5959
}
6060
if(springloadedFiles.size() != 1) {

0 commit comments

Comments
 (0)