cleanup

.gitignore

@@ -3,3 +3,5 @@
 /scripts
 /lib
 /.settings
+/plugin.xml
+/grails-elfinder-connector-*.zip

ElfinderConnectorGrailsPlugin.groovy

@@ -10,15 +10,12 @@ import grails.plugin.elfinder.command.ElfinderParentsCommand
 import grails.plugin.elfinder.command.ElfinderTreeCommand
 import grails.plugin.elfinder.filemanager.ElfinderLocalFileSystemFileManager
 
-
 /**
  * @author Sudhir Nimavat
- *
  */
 class ElfinderConnectorGrailsPlugin {
-	// the plugin version
 	def version = "0.1"
-	def grailsVersion = "1.3 > *"
+	def grailsVersion = "2.0 > *"
 	def title = "Elfinder Connector Plugin"
 	def author = "Sudhir Nimavat"
 	def authorEmail = "sudhir@nimavat.me"
@@ -28,7 +25,6 @@ class ElfinderConnectorGrailsPlugin {
 	def issueManagement = [ system: "GITHUB", url: "https://github.com/snimavat/grails-elfinder-connector/issues" ]
 	def license = "APACHE"
 
-
 	def doWithSpring = {
 		//configure file manger
 		def pluginConfig = application.config.grails.plugin.elfinder
@@ -41,55 +37,30 @@ class ElfinderConnectorGrailsPlugin {
 		elfinderFileManager(ElfinderLocalFileSystemFileManager) { root = pluginConfig.rootDir }
 
 		//configure commands
-		elfinderOpenCommand(ElfinderOpenCommand) { bean ->
-			bean.scope = "prototype"
-			elFinderFileManager = ref("elfinderFileManager")
-		}
 
-		elfinderParentsCommand(ElfinderParentsCommand) { bean ->
+		def configurationClosure = { bean ->
 			bean.scope = "prototype"
 			elFinderFileManager = ref("elfinderFileManager")
 		}
 
-		elfinderTreeCommand(ElfinderTreeCommand) { bean ->
-			bean.scope = "prototype"
-			elFinderFileManager = ref("elfinderFileManager")
-		}
+		elfinderOpenCommand(ElfinderOpenCommand, configurationClosure)
 
-		elfinderMkdirCommand(ElFinderMkdirCommand) { bean ->
-			bean.scope = "prototype"
-			elFinderFileManager = ref("elfinderFileManager")
-		}
+		elfinderParentsCommand(ElfinderParentsCommand, configurationClosure)
 
-		elfinderMkfileCommand(ElFinderMkfileCommand) { bean ->
-			bean.scope = "prototype"
-			elFinderFileManager = ref("elfinderFileManager")
-		}
+		elfinderTreeCommand(ElfinderTreeCommand, configurationClosure)
 
-		elfinderRenameCommand(ElFinderRenameCommand) { bean ->
-			bean.scope = "prototype"
-			elFinderFileManager = ref("elfinderFileManager")
-		}
+		elfinderMkdirCommand(ElFinderMkdirCommand, configurationClosure)
 
-		elfinderRmCommand(ElFinderRmCommand) { bean ->
-			bean.scope = "prototype"
-			elFinderFileManager = ref("elfinderFileManager")
-		}
+		elfinderMkfileCommand(ElFinderMkfileCommand, configurationClosure)
 
-		elfinderLsCommand(ElfinderLsCommand) { bean ->
-			bean.scope = "prototype"
-			elFinderFileManager = ref("elfinderFileManager")
-		}
+		elfinderRenameCommand(ElFinderRenameCommand, configurationClosure)
 
-		elfinderFileCommand(ElFinderFileCommand) { bean ->
-			bean.scope = "prototype"
-			elFinderFileManager = ref("elfinderFileManager")
-		}
+		elfinderRmCommand(ElFinderRmCommand, configurationClosure)
 
-		elfinderUploadCommand(ElFinderUploadCommand) { bean ->
-			bean.scope = "prototype"
-			elFinderFileManager = ref("elfinderFileManager")
-		}
+		elfinderLsCommand(ElfinderLsCommand, configurationClosure)
+
+		elfinderFileCommand(ElFinderFileCommand, configurationClosure)
 
+		elfinderUploadCommand(ElFinderUploadCommand, configurationClosure)
 	}
 }

README.md

@@ -1,7 +1,7 @@
 grails-elfinder-connector
 =========================
 
-Elfinder file browser connector for grails
+Elfinder file browser connector for Grails
 
 elfinder demo : http://elfinder.org/
 
@@ -14,14 +14,11 @@ Now point your elfinder client to index action of *ElfinderConnectorController*
 
 Example:
 ```
-		<script> 
-			$().ready(function() {
-				var elf = $('#elfinder').elfinder({
-					url : '${g.createLink(controller:'elfinderConnector')}'				
-				}).elfinder('instance');
-			});			
-		</script>
-
+<script>
+	$().ready(function() {
+		var elf = $('#elfinder').elfinder({
+			url : '${g.createLink(controller:'elfinderConnector')}'
+		}).elfinder('instance');
+	});
+</script>
 ```
-
-

application.properties

@@ -1,4 +1 @@
-#Grails Metadata file
-#Tue Aug 06 16:47:22 IST 2013
 app.grails.version=2.2.4
-app.name=elfinder-connector

grails-app/conf/BuildConfig.groovy

@@ -1,24 +1,23 @@
-grails.project.class.dir = "target/classes"
-grails.project.test.class.dir = "target/test-classes"
-grails.project.test.reports.dir = "target/test-reports"
+grails.project.work.dir = 'target'
 
 grails.project.dependency.resolution = {
-	inherits("global") {
-	}
-	log "warn"
-	legacyResolve false
+
+	inherits 'global'
+	log 'warn'
+
 	repositories {
 		grailsCentral()
-		mavenCentral()
 		mavenLocal()
+		mavenCentral()
 	}
+
 	dependencies {
 		test("org.spockframework:spock-grails-support:0.7-groovy-2.0") { export = false }
 		compile "commons-io:commons-io:2.4"
 	}
 
 	plugins {
-		build(":tomcat:$grailsVersion", ":release:2.2.1", ":rest-client-builder:1.0.3") { export = false }
+		build(":release:2.2.1", ":rest-client-builder:1.0.3") { export = false }
 		test(":spock:latest.integration") { export = false }
 	}
 }

grails-app/conf/Config.groovy

@@ -1,21 +1,12 @@
 log4j = {
-    appenders {
-        console name:'stdout', layout:pattern(conversionPattern: '%c{2} %m%n')
-    }
-    error  'org.codehaus.groovy.grails.web.servlet',  //  controllers
-           'org.codehaus.groovy.grails.web.pages', //  GSP
-           'org.codehaus.groovy.grails.web.sitemesh', //  layouts
-           'org.codehaus.groovy.grails.web.mapping.filter', // URL mapping
-           'org.codehaus.groovy.grails.web.mapping', // URL mapping
-           'org.codehaus.groovy.grails.commons', // core / classloading
-           'org.codehaus.groovy.grails.plugins', // plugins
-           'org.codehaus.groovy.grails.orm.hibernate', // hibernate integration
-           'org.springframework',
-           'org.hibernate',
-           'net.sf.ehcache.hibernate'
-
-    warn   'org.mortbay.log'
-	 debug  'grails.plugin.elfinder'
+	appenders {
+		console name:'stdout', layout:pattern(conversionPattern: '%c{2} %m%n')
+	}
+	error 'org.codehaus.groovy.grails',
+			'org.springframework',
+			'org.hibernate',
+			'net.sf.ehcache.hibernate'
+	debug 'grails.plugin.elfinder'
 }
 
-grails.plugin.elfinder.rootDir = "test/integration/resources"
+grails.plugin.elfinder.rootDir = "test/integration/resources"

grails-app/controllers/grails/plugin/elfinder/ElfinderConnectorController.groovy

@@ -2,22 +2,17 @@ package grails.plugin.elfinder
 
 import grails.converters.JSON
 import grails.plugin.elfinder.command.ElfinderBaseCommand
-import grails.plugin.elfinder.filemanager.ElfinderLocalFileSystemFileManager
 
 import org.apache.commons.lang.StringUtils
 
 /**
- * 
  * @author Sudhir Nimavat
- *
  */
 class ElfinderConnectorController {
 
-	def grailsApplication
-
-	def index() {
-		String cmd = params.cmd ?: "Unknown"
-		String commandName = "elfinder"+StringUtils.capitalize(cmd)+"Command"
+	def index(String cmd) {
+		cmd = cmd ?: "Unknown"
+		String commandName = "elfinder${StringUtils.capitalize(cmd)}Command"
 
 		log.debug("Executing command $commandName")
 
@@ -26,21 +21,22 @@ class ElfinderConnectorController {
 		if(command == null) {
 			log.error("Unknown command received : $commandName")
 			render(status:400, text:"unknown command")
-		} else {
-			command.params = params
-			command.request = request
-			command.response = response
-			try {
-				command.execute()
-				if(!command.responseOutputDone) {
-					def resp = command.responseMap as JSON
-					render resp
-				}
-			}catch(Exception e) {
-				log.error("Error encountered while executing command $commandName", e)
-				def resp = [error:e.message]
-				render resp as JSON
+			return
+		}
+
+		command.params = params
+		command.request = request
+		command.response = response
+		try {
+			command.execute()
+			if(!command.responseOutputDone) {
+				def resp = command.responseMap as JSON
+				render resp
 			}
+		}catch(Exception e) {
+			log.error("Error encountered while executing command $commandName", e)
+			def resp = [error:e.message]
+			render resp as JSON
 		}
 	}
 }

src/groovy/grails/plugin/elfinder/MimeTypeMappings.groovy

@@ -2,7 +2,7 @@ package grails.plugin.elfinder
 
 class MimeTypeMappings {
 
-	private static Map mappings = [
+	private static final Map mappings = [
 		// applications
 		'ai'    : 'application/postscript',
 		'eps'   : 'application/postscript',
@@ -120,8 +120,7 @@ class MimeTypeMappings {
 		'ogm'   : 'video/ogg'
 	]
 
-
-	public static String forExtension(String extension) {
+	static String forExtension(String extension) {
 		return mappings[extension] ?: "unknown"
 	}
 }

src/groovy/grails/plugin/elfinder/command/ElFinderFileCommand.groovy

@@ -2,7 +2,6 @@ package grails.plugin.elfinder.command
 
 /**
  * @author Sudhir Nimavat
- *
  */
 class ElFinderFileCommand extends ElfinderBaseCommand {
 

src/groovy/grails/plugin/elfinder/command/ElFinderMkdirCommand.groovy

@@ -1,9 +1,7 @@
 package grails.plugin.elfinder.command
 
 /**
- * 
  * @author Sudhir Nimavat
- *
  */
 class ElFinderMkdirCommand extends ElfinderBaseCommand {
 

src/groovy/grails/plugin/elfinder/command/ElFinderMkfileCommand.groovy

@@ -2,7 +2,6 @@ package grails.plugin.elfinder.command
 
 /**
  * @author Sudhir Nimavat
- *
  */
 class ElFinderMkfileCommand extends ElfinderBaseCommand {
 

src/groovy/grails/plugin/elfinder/command/ElFinderRenameCommand.groovy

@@ -2,7 +2,6 @@ package grails.plugin.elfinder.command
 
 /**
  * @author Sudhir Nimavat
- *
  */
 class ElFinderRenameCommand extends ElfinderBaseCommand {
 

src/groovy/grails/plugin/elfinder/command/ElFinderRmCommand.groovy

@@ -1,20 +1,18 @@
 package grails.plugin.elfinder.command
 
 /**
- * 
  * @author Sudhir Nimavat
- *
  */
 class ElFinderRmCommand extends ElfinderBaseCommand {
-		
+
 	@Override
 	void execute() {
-		List targets =  params.list('targets[]')	
-		
+		List targets =  params.list('targets[]')
+
 		List removed = []
 		targets.each {
 			removed.addAll(elFinderFileManager.delete(unhash(it)))
-		}			
-		putResponse("removed",removed )	
+		}
+		putResponse("removed", removed)
 	}
 }

src/groovy/grails/plugin/elfinder/command/ElFinderUploadCommand.groovy

@@ -5,19 +5,18 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile
 
 /**
  * @author Sudhir Nimavat
- *
  */
 class ElFinderUploadCommand extends ElfinderBaseCommand {
 
 	@Override
 	void execute() {
-		String target =  params['target']
+		String target = params['target']
 
 		List<MultipartFile> files = request.getFiles('upload[]')
 		List added = []
 
 		files.each {CommonsMultipartFile tempFile ->
-			println "uploading: "+tempFile.originalFilename
+			log.debug "uploading: $tempFile.originalFilename"
 			def info = elFinderFileManager.uploadFile(tempFile, unhash(target))
 			if(info) {
 				added.add(info)

src/groovy/grails/plugin/elfinder/command/ElfinderBaseCommand.groovy

@@ -4,7 +4,6 @@ import grails.plugin.elfinder.filemanager.ElFinderFileManager
 
 import org.apache.commons.lang.Validate
 
-
 abstract class ElfinderBaseCommand {
 
 	ElFinderFileManager elFinderFileManager
@@ -17,14 +16,14 @@ abstract class ElfinderBaseCommand {
 
 	boolean responseOutputDone = false
 
-	public abstract void execute()
+	abstract void execute()
 
-	protected void putResponse(def key, def val) {
+	protected void putResponse(key, val) {
 		Validate.notNull(key, "Key can not be null")
 		responseMap[key] = val
 	}
 
-	protected void addError(def err) {
+	protected void addError(err) {
 		responseMap.clear()
 		responseMap["error"] = err
 	}
@@ -54,7 +53,6 @@ abstract class ElfinderBaseCommand {
 		putResponse("files", files)
 	}
 
-
 	void tree(String target) {
 		String path = unhash(target)
 		List tree = []