Explorar el Código

More build and logging tuning.

Luke Taylor hace 15 años
padre
commit
64375484a1

+ 12 - 0
acl/src/test/resources/logback-test.xml

@@ -0,0 +1,12 @@
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="WARN">
+    <appender-ref ref="STDOUT" />
+  </root>
+
+</configuration>

+ 0 - 17
build.gradle

@@ -78,20 +78,3 @@ task wrapper(type: Wrapper) {
     gradleVersion = '0.9-rc-1'
     jarPath = 'gradle/wrapper'
 }
-
-/*
-ideaWorkspace {
-    withXml { node ->
-        Node servers = node.component.find{ it.@name == 'TaskManager' }.servers[0]
-        def bldr = new NodeBuilder()
-        servers.append(
-            bldr.JIRA(shared: false, url: 'https://jira.springsource.org') {
-                if (project.hasProperty('jiraUser')) {
-                    password project.property('jiraPassword')
-                    username project.property('jiraUser')
-                }
-            })
-    }
-}
-*/
-

+ 1 - 1
config/src/test/resources/logback-test.xml

@@ -7,7 +7,7 @@
 
   <logger name="org.apache.directory" level="WARN"/>
 
-  <root level="INFO">
+  <root level="WARN">
     <appender-ref ref="STDOUT" />
   </root>
 

+ 1 - 3
core/src/test/resources/logback-test.xml

@@ -5,9 +5,7 @@
     </encoder>
   </appender>
 
-  <logger name="org.apache.directory" level="WARN"/>
-
-  <root level="INFO">
+  <root level="WARN">
     <appender-ref ref="STDOUT" />
   </root>
 

+ 8 - 4
gradle/maven.gradle

@@ -35,17 +35,21 @@ gradle.taskGraph.whenReady {graph ->
 def deployer = null
 
 uploadArchives {
+    def releaseRepositoryUrl = "file://${project.properties.mavenSyncRepoDir}"
+    def milestoneRepositoryUrl = 's3://maven.springframework.org/milestone'
+    def snapshotRepositoryUrl = 's3://maven.springframework.org/snapshot'
+
     deployer = repositories.mavenDeployer {
         configuration = configurations.deployerJars
         if (releaseBuild) {
             // "mavenSyncRepoDir" should be set in properties
-            repository(url: mavenSyncRepoDir)
+            repository(url: releaseRepositoryUrl)
         } else {
-            s3credentials = [userName: s3AccessKey, passphrase: s3SecretAccessKey]
-            repository(url: "s3://maven.springframework.org/milestone") {
+            s3credentials = [userName: project.properties.s3AccessKey, passphrase: project.properties.s3SecretAccessKey]
+            repository(url: milestoneRepositoryUrl) {
                 authentication(s3credentials)
             }
-            snapshotRepository(url: "s3://maven.springframework.org/snapshot") {
+            snapshotRepository(url: snapshotRepositoryUrl) {
                 authentication(s3credentials)
             }
         }

+ 2 - 2
itest/context/src/test/resources/logback-test.xml

@@ -5,9 +5,9 @@
     </encoder>
   </appender>
 
-  <logger name="org.apache.directory" level="WARN"/>
+  <logger name="org.apache.directory" level="ERROR"/>
 
-  <root level="INFO">
+  <root level="WARN">
     <appender-ref ref="STDOUT" />
   </root>
 

+ 2 - 2
itest/web/src/test/resources/logback-test.xml

@@ -5,9 +5,9 @@
     </encoder>
   </appender>
 
-  <logger name="org.apache.directory" level="WARN"/>
+  <logger name="org.apache.directory" level="ERROR"/>
 
-  <root level="INFO">
+  <root level="WARN">
     <appender-ref ref="STDOUT" />
   </root>
 

+ 3 - 3
ldap/src/test/resources/logback-test.xml

@@ -5,10 +5,10 @@
     </encoder>
   </appender>
 
-  <logger name="org.apache.directory" level="WARN"/>
+  <logger name="org.apache.directory" level="ERROR"/>
 
-  <root level="DEBUG">
+  <root level="WARN">
     <appender-ref ref="STDOUT" />
   </root>
 
-</configuration>
+</configuration>

+ 12 - 0
samples/aspectj/src/test/resources/logback-test.xml

@@ -0,0 +1,12 @@
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="WARN">
+    <appender-ref ref="STDOUT" />
+  </root>
+
+</configuration>

+ 5 - 2
samples/cas/cas.gradle

@@ -3,13 +3,14 @@
 apply plugin: 'war'
 apply plugin: 'jetty'
 
-
+/*
 configurations {
     casServer
 }
+*/
 
 dependencies {
-    casServer("org.jasig.cas:cas-server-webapp:3.4.2.1") { transitive = false }
+//    casServer "org.jasig.cas:cas-server-webapp:3.4.2.1@war"
 
     runtime project(':spring-security-web'),
             project(':spring-security-cas'),
@@ -34,6 +35,7 @@ jettyRun {
     connectors = [httpConnector, httpsConnector]
 }
 
+/*
 task casServer (type: org.gradle.api.plugins.jetty.JettyRunWar) {
     contextPath = "/cas"
     connectors = [new org.mortbay.jetty.security.SslSocketConnector()]
@@ -53,3 +55,4 @@ task cas (dependsOn: jettyRun) {
     jettyRun.dependsOn(casServer)
     casServer.daemon = true
 }
+*/

+ 12 - 0
web/src/test/resources/logback-test.xml

@@ -0,0 +1,12 @@
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="WARN">
+    <appender-ref ref="STDOUT" />
+  </root>
+
+</configuration>