cleanup

grails · Sep 12, 2011 · 55cd302 · 55cd302
1 parent 3914f6c
commit 55cd302
Show file tree

Hide file tree

Showing 48 changed files with 160 additions and 228 deletions.
diff --git a/build.xml b/build.xml
@@ -26,25 +26,14 @@
 	<macrodef name='grails'>
 		<attribute name='action' />
 		<attribute name='environment' default='dev' />
-		<element name='args' optional='true' />
+		<element name='preArgs' optional='true' />
+		<element name='postArgs' optional='true' />
 		<sequential>
 			<exec executable='${grails}' failonerror='true'>
-				<args />
-				<arg value='@{environment}'/>
-				<arg value='@{action}'/>
-			</exec>
-		</sequential>
-	</macrodef>
-
-	<macrodef name='grails-debug'>
-		<attribute name='action' />
-		<attribute name='environment' default='dev' />
-		<element name='args' optional='true' />
-		<sequential>
-			<exec executable='${grails-debug}' failonerror='true'>
-				<args />
+				<preArgs />
 				<arg value='@{environment}'/>
 				<arg value='@{action}'/>
+				<postArgs />
 			</exec>
 		</sequential>
 	</macrodef>
@@ -60,25 +49,27 @@
 		<delete><fileset dir='.' includes='*.log*' /></delete>
 	</target>
 
-	<target name='doc' description='Generates docs' depends='init'>
-		<grails action='doc' />
-	</target>
-
 	<target name='test' description='Run unit tests' depends='clean'>
-		<grails action='test-app' environment='test' />
+		<grails action='test-app' environment='test'>
+			<postArgs><arg value='-unit' /></postArgs>
+		</grails>
 	</target>
 
-	<target name='package' description='Package the plugin' depends='test'>
+	<target name='package' description='Package the plugin'
+	        depends='test, doPackage, post-package-cleanup'/>
 
+	<target name='doPackage'>
 		<grails action='package-plugin' />
+	</target>
 
-		<!-- clean up -->
+	<target name='post-package-cleanup'>
 		<delete dir='grails-app/conf/hibernate'/>
 		<delete dir='grails-app/conf/spring'/>
 		<delete dir='grails-app/utils'/>
 		<delete dir='src/groovy'/>
 		<delete dir='src/java'/>
-		<delete dir='test'/>
+		<delete dir='test/functional'/>
+		<delete dir='test/integration'/>
 		<delete dir='web-app/META-INF'/>
 		<delete dir='web-app/WEB-INF'/>
 	</target>

diff --git a/grails-app/controllers/grails/plugins/springsecurity/ui/AclClassController.groovy b/grails-app/controllers/grails/plugins/springsecurity/ui/AclClassController.groovy
@@ -15,7 +15,6 @@
 package grails.plugins.springsecurity.ui
 
 import grails.converters.JSON
-import grails.plugins.springsecurity.ui.AbstractS2UiController
 
 import org.springframework.dao.DataIntegrityViolationException
 
@@ -85,7 +84,7 @@ class AclClassController extends AbstractS2UiController {
 		setIfMissing 'max', 10, 100
 		setIfMissing 'offset', 0
 
-		def hql = new StringBuilder('FROM ' + lookupClassName() + ' c WHERE 1=1 ')
+		def hql = new StringBuilder('FROM ').append(lookupClassName()).append(' c WHERE 1=1 ')
 		def queryParams = [:]
 
 		for (name in ['className']) {

diff --git a/grails-app/controllers/grails/plugins/springsecurity/ui/AclEntryController.groovy b/grails-app/controllers/grails/plugins/springsecurity/ui/AclEntryController.groovy
@@ -14,9 +14,6 @@
  */
 package grails.plugins.springsecurity.ui
 
-import grails.converters.JSON
-import grails.plugins.springsecurity.ui.AbstractS2UiController
-
 import org.springframework.dao.DataIntegrityViolationException
 
 /**
@@ -95,7 +92,7 @@ class AclEntryController extends AbstractS2UiController {
 		setIfMissing 'max', 10, 100
 		setIfMissing 'offset', 0
 
-		def hql = new StringBuilder('FROM ' + lookupClassName() + ' e WHERE 1=1 ')
+		def hql = new StringBuilder('FROM ').append(lookupClassName()).append(' e WHERE 1=1 ')
 		def queryParams = [:]
 
 		for (name in ['aceOrder', 'mask']) {

diff --git a/grails-app/controllers/grails/plugins/springsecurity/ui/AclObjectIdentityController.groovy b/grails-app/controllers/grails/plugins/springsecurity/ui/AclObjectIdentityController.groovy
@@ -14,9 +14,6 @@
  */
 package grails.plugins.springsecurity.ui
 
-import grails.converters.JSON
-import grails.plugins.springsecurity.ui.AbstractS2UiController
-
 import org.springframework.dao.DataIntegrityViolationException
 
 /**
@@ -100,7 +97,7 @@ class AclObjectIdentityController extends AbstractS2UiController {
 		setIfMissing 'max', 10, 100
 		setIfMissing 'offset', 0
 
-		def hql = new StringBuilder('FROM ' + lookupClassName() + ' oid WHERE 1=1 ')
+		def hql = new StringBuilder('FROM ').append(lookupClassName()).append(' oid WHERE 1=1 ')
 		def queryParams = [:]
 
 		if (params.objectId) {

diff --git a/grails-app/controllers/grails/plugins/springsecurity/ui/AclSidController.groovy b/grails-app/controllers/grails/plugins/springsecurity/ui/AclSidController.groovy
@@ -15,7 +15,6 @@
 package grails.plugins.springsecurity.ui
 
 import grails.converters.JSON
-import grails.plugins.springsecurity.ui.AbstractS2UiController
 
 import org.springframework.dao.DataIntegrityViolationException
 
@@ -87,7 +86,7 @@ class AclSidController extends AbstractS2UiController {
 		setIfMissing 'max', 10, 100
 		setIfMissing 'offset', 0
 
-		def hql = new StringBuilder('FROM ' + lookupClassName() + ' s WHERE 1=1 ')
+		def hql = new StringBuilder('FROM ').append(lookupClassName()).append(' s WHERE 1=1 ')
 		def queryParams = [:]
 
 		for (name in ['sid']) {

diff --git a/grails-app/controllers/grails/plugins/springsecurity/ui/PersistentLoginController.groovy b/grails-app/controllers/grails/plugins/springsecurity/ui/PersistentLoginController.groovy
@@ -70,7 +70,7 @@ class PersistentLoginController extends AbstractS2UiController {
 		setIfMissing 'max', 10, 100
 		setIfMissing 'offset', 0
 
-		def hql = new StringBuilder('FROM ' + lookupPersistentLoginClassName() + ' pl WHERE 1=1 ')
+		def hql = new StringBuilder('FROM ').append(lookupPersistentLoginClassName()).append(' pl WHERE 1=1 ')
 		def queryParams = [:]
 
 		for (name in ['username', 'series', 'token']) {

diff --git a/grails-app/controllers/grails/plugins/springsecurity/ui/RequestmapController.groovy b/grails-app/controllers/grails/plugins/springsecurity/ui/RequestmapController.groovy
@@ -14,8 +14,6 @@
  */
 package grails.plugins.springsecurity.ui
 
-import grails.plugins.springsecurity.ui.AbstractS2UiController
-
 import org.springframework.dao.DataIntegrityViolationException
 
 /**
@@ -31,7 +29,7 @@ class RequestmapController extends AbstractS2UiController {
 		setIfMissing 'max', 10, 100
 		setIfMissing 'offset', 0
 
-		def hql = new StringBuilder('FROM ' + lookupRequestmapClassName() + ' r WHERE 1=1 ')
+		def hql = new StringBuilder('FROM ').append(lookupRequestmapClassName()).append(' r WHERE 1=1 ')
 		def queryParams = [:]
 
 		for (name in ['url', 'configAttribute']) {

diff --git a/grails-app/domain/org/codehaus/groovy/grails/plugins/springsecurity/acl/AclClass.groovy b/grails-app/domain/org/codehaus/groovy/grails/plugins/springsecurity/acl/AclClass.groovy
diff --git a/grails-app/domain/org/codehaus/groovy/grails/plugins/springsecurity/acl/AclEntry.groovy b/grails-app/domain/org/codehaus/groovy/grails/plugins/springsecurity/acl/AclEntry.groovy
diff --git a/...app/domain/org/codehaus/groovy/grails/plugins/springsecurity/acl/AclObjectIdentity.groovy b/...app/domain/org/codehaus/groovy/grails/plugins/springsecurity/acl/AclObjectIdentity.groovy
diff --git a/grails-app/domain/org/codehaus/groovy/grails/plugins/springsecurity/acl/AclSid.groovy b/grails-app/domain/org/codehaus/groovy/grails/plugins/springsecurity/acl/AclSid.groovy
diff --git a/grails-app/views/aclClass/create.gsp b/grails-app/views/aclClass/create.gsp
@@ -1,3 +1,5 @@
+<html>
+
 <head>
 	<meta name='layout' content='springSecurityUI'/>
 	<g:set var="entityName" value="${message(code: 'aclClass.label', default: 'AclClass')}"/>
@@ -9,7 +11,7 @@
 <div class="body">
 
 	<s2ui:form width='100%' height='200' elementId='formContainer'
-	      titleCode='default.create.label' titleCodeArgs='[entityName]'>
+	           titleCode='default.create.label' titleCodeArgs='[entityName]'>
 
 	<g:form action="save" name='aclClassCreateForm'>
 		<div class="dialog">
@@ -52,3 +54,4 @@ $(document).ready(function() {
 </script>
 
 </body>
+</html>
diff --git a/grails-app/views/aclClass/edit.gsp b/grails-app/views/aclClass/edit.gsp
@@ -1,3 +1,5 @@
+<html>
+
 <head>
 	<meta name='layout' content='springSecurityUI'/>
 	<g:set var="entityName" value="${message(code: 'aclClass.label', default: 'AclClass')}" />
@@ -9,7 +11,7 @@
 <div class="body">
 
 	<s2ui:form width='100%' height='225' elementId='formContainer'
-	      titleCode='default.edit.label' titleCodeArgs='[entityName]'>
+	           titleCode='default.edit.label' titleCodeArgs='[entityName]'>
 
 	<g:form action='update' name='aclClassEditForm'>
 		<g:hiddenField name="id" value="${aclClass?.id}"/>
@@ -58,3 +60,4 @@
 </div>
 
 </body>
+</html>
diff --git a/grails-app/views/aclClass/search.gsp b/grails-app/views/aclClass/search.gsp
@@ -1,3 +1,5 @@
+<html>
+
 <head>
 	<meta name='layout' content='springSecurityUI'/>
 	<title><g:message code='spring.security.ui.aclClass.search'/></title>
@@ -8,7 +10,7 @@
 <div>
 
 	<s2ui:form width='100%' height='175' elementId='formContainer'
-	      titleCode='spring.security.ui.aclClass.search'>
+	           titleCode='spring.security.ui.aclClass.search'>
 
 	<g:form action='aclClassSearch' name='aclClassSearchForm'>
 
@@ -78,3 +80,4 @@ $(document).ready(function() {
 </script>
 
 </body>
+</html>