option to define log4j config as a string, more tests for constraints

git-svn-id: https://svn.codehaus.org/grails/trunk@5755 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d

Author: graeme

scripts/Package.groovy

@@ -162,16 +162,20 @@ target(generateLog4j:"Generates the Log4j config File") {
         def log4jConfig = config.log4j
         try {
             if(log4jConfig) {
-                def props = log4jConfig.toProperties("log4j")
-                log4jFile.withOutputStream { out ->
-                    props.store(out, "Grails' Log4j Configuration")
+                if(log4jConfig instanceof ConfigObject) {
+                    def props = log4jConfig.toProperties("log4j")
+                    log4jFile.withOutputStream { out ->
+                        props.store(out, "Grails' Log4j Configuration")
+                    }
+                }
+                else {
+                    log4jFile.write(log4jConfig.toString())
                 }
             }
             else {
                 // default log4j settings
                 createDefaultLog4J(log4jFile)
             }
-
         }
         catch(Exception e) {
             event("StatusFinal", [ "Error creating Log4j config: " + e.message ])

test/groovy/org/codehaus/groovy/grails/validation/ConstraintsBuilderTests.groovy

@@ -54,7 +54,16 @@ class ConstraintsBuilderTests extends AbstractGrailsMockTests {
         def instance = theClass.newInstance()
         def validator = configureValidator(theClass, instance)
 
+        instance.anotherURL = "http://grails.org"
         def errors = validateInstance(instance, validator)
+        assert !errors.hasErrors()
+        
+        instance.anotherURL = "a_bad_url"
+        errors = validateInstance(instance, validator)
+        assert errors.hasErrors()
+
+        instance.anotherURL = "http://grails.org"
+        errors = validateInstance(instance, validator)
 
         assert !errors.hasErrors()
 
@@ -65,6 +74,9 @@ class ConstraintsBuilderTests extends AbstractGrailsMockTests {
         instance.url = new URL("http://localhost:8080/tau_gwi_00/clif/cb/19")
         errors = validateInstance(instance, validator)
         assert !errors.hasErrors()
+
+
+
 
     }
 
@@ -106,8 +118,10 @@ class Site {
     Long id
     Long version
     URL url
+    String anotherURL
     static constraints = {
         url(url:true, nullable:true)
+        anotherURL(url:true, nullable:true)
     }
 }
         ''')