Skip to content
Browse files

use springloaded 1.1.1

Conflicts:
	build.gradle
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/fork/ForkedGrailsProcess.groovy
  • Loading branch information...
1 parent 1636ba2 commit c68160538dfdff6ee6cde4b7c7a416eebcbcee5f @jeffbrown jeffbrown committed Dec 11, 2012
View
2 build.gradle
@@ -35,7 +35,7 @@ ext {
jlineVersion = "1.0"
jnaVersion = "3.2.3"
slf4jVersion = "1.6.2"
- springLoadedVersion = "1.1.0"
+ springLoadedVersion = "1.1.1"
springVersion = "3.1.2.RELEASE"
springWebflowVersion= "2.0.8.RELEASE"
hibernateVersion = "3.6.10.Final"
View
8 gradle/assemble.gradle
@@ -139,8 +139,8 @@ task installResources(type: Copy) {
filter(ReplaceTokens, tokens: ['starter.main.class': 'org.codehaus.groovy.grails.cli.support.GrailsStarter'])
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()])
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()])
- 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()])
- 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()])
+ 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()])
+ 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()])
filter(ReplaceTokens, tokens: ['startup.command': ''])
fileMode = 0755
}
@@ -232,8 +232,8 @@ task zipDist(type: Zip, dependsOn: [sourcesJars, install]) {
filter(ReplaceTokens, tokens: ['starter.main.class': 'org.codehaus.groovy.grails.cli.support.GrailsStarter'])
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()])
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()])
- 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()])
- 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()])
+ 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()])
+ 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()])
filter(ReplaceTokens, tokens: ['startup.command': ''])
fileMode = 0755
}
View
2 grails-bootstrap/src/main/groovy/grails/util/Environment.java
@@ -414,7 +414,7 @@ public static void setInitializing(boolean initializing) {
*/
public static boolean isReloadingAgentEnabled() {
try {
- Class.forName("com.springsource.loaded.TypeRegistry");
+ Class.forName("org.springsource.loaded.TypeRegistry");
return true;
}
catch (ClassNotFoundException e) {
View
2 grails-core/build.gradle
@@ -56,7 +56,7 @@ dependencies {
exclude group: 'xml-apis', module:'xml-apis'
}
- compile ("com.springsource.springloaded:springloaded-core:$springLoadedVersion") {
+ compile ("org.springsource.springloaded:springloaded-core:$springLoadedVersion") {
ext.notInPom = true
}
View
4 ...src/main/groovy/org/codehaus/groovy/grails/cli/agent/GrailsPluginManagerReloadPlugin.java
@@ -15,8 +15,8 @@
package org.codehaus.groovy.grails.cli.agent;
-import com.springsource.loaded.Plugins;
-import com.springsource.loaded.ReloadEventProcessorPlugin;
+import org.springsource.loaded.Plugins;
+import org.springsource.loaded.ReloadEventProcessorPlugin;
import org.codehaus.groovy.grails.commons.ClassPropertyFetcher;
import org.codehaus.groovy.grails.compiler.GrailsProjectWatcher;
import org.springframework.beans.CachedIntrospectionResults;
View
2 grails-core/src/main/groovy/org/codehaus/groovy/grails/compiler/GrailsProjectWatcher.java
@@ -49,7 +49,7 @@
private static final Map<String, ClassUpdate> classChangeEventQueue = new ConcurrentHashMap<String, ClassUpdate>();
private static boolean active = false;
private static boolean reloadInProgress = false;
- public static final String SPRING_LOADED_PLUGIN_CLASS = "com.springsource.loaded.Plugins";
+ public static final String SPRING_LOADED_PLUGIN_CLASS = "org.springsource.loaded.Plugins";
private List<String> compilerExtensions;
private GrailsPluginManager pluginManager;
View
2 ...core/src/main/groovy/org/codehaus/groovy/grails/exceptions/DefaultStackTraceFilterer.java
@@ -51,7 +51,7 @@
"sun.",
"java.lang.reflect.",
"org.springframework.",
- "com.springsource.loaded.",
+ "org.springsource.loaded.",
"com.opensymphony.",
"org.hibernate.",
"javax.servlet."
View
2 scripts/Wrapper.groovy
@@ -54,7 +54,7 @@ target ('default': "Installs the Grails wrapper") {
ant.chmod(file: 'grailsw', perm: 'u+x')
springloadedFiles = []
- new File("${grailsHome}/lib/com.springsource.springloaded/springloaded-core/jars/").eachFileMatch( groovy.io.FileType.FILES, { it ==~ /springloaded-core-.*/ }) {
+ new File("${grailsHome}/lib/org.springsource.springloaded/springloaded-core/jars/").eachFileMatch( groovy.io.FileType.FILES, { it ==~ /springloaded-core-.*/ }) {
springloadedFiles << it
}
if(springloadedFiles.size() != 1) {

0 comments on commit c681605

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