Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

use springloaded 1.1.1

Conflicts:
	build.gradle
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/fork/ForkedGrailsProcess.groovy
  • Loading branch information...
commit c68160538dfdff6ee6cde4b7c7a416eebcbcee5f 1 parent 1636ba2
Jeff Scott Brown jeffbrown authored
2  build.gradle
@@ -35,7 +35,7 @@ ext {
35 35 jlineVersion = "1.0"
36 36 jnaVersion = "3.2.3"
37 37 slf4jVersion = "1.6.2"
38   - springLoadedVersion = "1.1.0"
  38 + springLoadedVersion = "1.1.1"
39 39 springVersion = "3.1.2.RELEASE"
40 40 springWebflowVersion= "2.0.8.RELEASE"
41 41 hibernateVersion = "3.6.10.Final"
8 gradle/assemble.gradle
@@ -139,8 +139,8 @@ task installResources(type: Copy) {
139 139 filter(ReplaceTokens, tokens: ['starter.main.class': 'org.codehaus.groovy.grails.cli.support.GrailsStarter'])
140 140 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()])
141 141 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()])
144 144 filter(ReplaceTokens, tokens: ['startup.command': ''])
145 145 fileMode = 0755
146 146 }
@@ -232,8 +232,8 @@ task zipDist(type: Zip, dependsOn: [sourcesJars, install]) {
232 232 filter(ReplaceTokens, tokens: ['starter.main.class': 'org.codehaus.groovy.grails.cli.support.GrailsStarter'])
233 233 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()])
234 234 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()])
237 237 filter(ReplaceTokens, tokens: ['startup.command': ''])
238 238 fileMode = 0755
239 239 }
2  grails-bootstrap/src/main/groovy/grails/util/Environment.java
@@ -414,7 +414,7 @@ public static void setInitializing(boolean initializing) {
414 414 */
415 415 public static boolean isReloadingAgentEnabled() {
416 416 try {
417   - Class.forName("com.springsource.loaded.TypeRegistry");
  417 + Class.forName("org.springsource.loaded.TypeRegistry");
418 418 return true;
419 419 }
420 420 catch (ClassNotFoundException e) {
2  grails-core/build.gradle
@@ -56,7 +56,7 @@ dependencies {
56 56 exclude group: 'xml-apis', module:'xml-apis'
57 57 }
58 58
59   - compile ("com.springsource.springloaded:springloaded-core:$springLoadedVersion") {
  59 + compile ("org.springsource.springloaded:springloaded-core:$springLoadedVersion") {
60 60 ext.notInPom = true
61 61 }
62 62
4 grails-core/src/main/groovy/org/codehaus/groovy/grails/cli/agent/GrailsPluginManagerReloadPlugin.java
@@ -15,8 +15,8 @@
15 15
16 16 package org.codehaus.groovy.grails.cli.agent;
17 17
18   -import com.springsource.loaded.Plugins;
19   -import com.springsource.loaded.ReloadEventProcessorPlugin;
  18 +import org.springsource.loaded.Plugins;
  19 +import org.springsource.loaded.ReloadEventProcessorPlugin;
20 20 import org.codehaus.groovy.grails.commons.ClassPropertyFetcher;
21 21 import org.codehaus.groovy.grails.compiler.GrailsProjectWatcher;
22 22 import org.springframework.beans.CachedIntrospectionResults;
2  grails-core/src/main/groovy/org/codehaus/groovy/grails/compiler/GrailsProjectWatcher.java
@@ -49,7 +49,7 @@
49 49 private static final Map<String, ClassUpdate> classChangeEventQueue = new ConcurrentHashMap<String, ClassUpdate>();
50 50 private static boolean active = false;
51 51 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";
53 53
54 54 private List<String> compilerExtensions;
55 55 private GrailsPluginManager pluginManager;
2  grails-core/src/main/groovy/org/codehaus/groovy/grails/exceptions/DefaultStackTraceFilterer.java
@@ -51,7 +51,7 @@
51 51 "sun.",
52 52 "java.lang.reflect.",
53 53 "org.springframework.",
54   - "com.springsource.loaded.",
  54 + "org.springsource.loaded.",
55 55 "com.opensymphony.",
56 56 "org.hibernate.",
57 57 "javax.servlet."
2  scripts/Wrapper.groovy
@@ -54,7 +54,7 @@ target ('default': "Installs the Grails wrapper") {
54 54 ant.chmod(file: 'grailsw', perm: 'u+x')
55 55
56 56 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-.*/ }) {
58 58 springloadedFiles << it
59 59 }
60 60 if(springloadedFiles.size() != 1) {

0 comments on commit c681605

Please sign in to comment.
Something went wrong with that request. Please try again.