@@ -70,6 +70,10 @@ target(createPlugin: "The implementation target") { // Rename the plugin descriptor. pluginName = GrailsNameUtils.getNameFromScript(grailsAppName) + if(!(pluginName ==~ /[a-zA-Z-]+/)) { + println "Error: Specified plugin name [$grailsAppName] is invalid. Plugin names can only contain word characters separated by hyphens." + exit 1 + } ant.move( file: "${basedir}/GrailsPlugin.groovy", tofile: "${basedir}/${pluginName}GrailsPlugin.groovy", grails/scripts/_GrailsCreateProject.groovy @@ -82,7 +82,11 @@ public abstract class AbstractGrailsPlugin extends GroovyObjectSupport implement public abstract void doArtefactConfiguration(); public String getFileSystemName() { - return GrailsNameUtils.getScriptName(getName())+'-'+getVersion(); + return getFileSystemShortName()+'-'+getVersion(); + } + + public String getFileSystemShortName() { + return GrailsNameUtils.getScriptName(getName()); } public Class getPluginClass() { grails/src/java/org/codehaus/groovy/grails/plugins/AbstractGrailsPlugin.java @@ -15,6 +15,7 @@ import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.core.io.Resource; import org.springframework.core.type.filter.TypeFilter; +import org.springframework.util.StringUtils; import java.util.*; @@ -295,7 +296,7 @@ public abstract class AbstractGrailsPluginManager implements GrailsPluginManager public String getPluginViewsPathForClass(Class<? extends Object> theClass) { if(theClass!=null) { final String path = getPluginPathForClass(theClass); - if(path!=null) + if(StringUtils.hasText(path)) return path +'/'+GrailsResourceUtils.GRAILS_APP_DIR+"/views"; } return null; grails/src/java/org/codehaus/groovy/grails/plugins/AbstractGrailsPluginManager.java @@ -381,6 +381,12 @@ public interface GrailsPlugin extends ApplicationContextAware, Comparable { String getFileSystemName(); /** + * Returns the name of the plugin as represented on the file system without the version. For example TagLibGrailsPlugin would result in "tag-lib" + * @return The file system name + */ + String getFileSystemShortName(); + + /** * Returns the underlying class that represents this plugin * @return The plugin class */ grails/src/java/org/codehaus/groovy/grails/plugins/GrailsPlugin.java @@ -25,6 +25,10 @@ public class GrailsPluginMetadataTests extends GroovyTestCase{ assertEquals "/plugins/groovy-pages-${GrailsUtil.grailsVersion}", pluginManager.getPluginPathForInstance(new Test2()) assertNull pluginManager.getPluginPathForInstance(new Test3()) + + assertEquals "/plugins/controllers-${GrailsUtil.grailsVersion}/grails-app/views", pluginManager.getPluginViewsPathForClass(Test1) + assertEquals "/plugins/groovy-pages-${GrailsUtil.grailsVersion}/grails-app/views", pluginManager.getPluginViewsPathForClass(Test2) + assertNull pluginManager.getPluginViewsPathForClass(Test3) } } grails/src/test/org/codehaus/groovy/grails/plugins/metadata/GrailsPluginMetadataTests.groovy 4c1de4da1dbcf51f6c6bf139a6e1022bd142a90d Graeme Rocher graeme.rocher@gmail.com http://github.com/grails/grails/commit/13522d06062d030e33b6aa86d3ae1feded74cc80 13522d06062d030e33b6aa86d3ae1feded74cc80 2009-11-11T05:22:25-08:00 2009-11-11T05:22:25-08:00 fix for GRAILS-5349 "Web-app path of user defined plugins not resolved correctly in dev env" 2ab31938f91ac5ca55289a1f10e1c67d5140c379 Graeme Rocher graeme.rocher@gmail.com