More build and logging tuning.
This commit is contained in:
parent
c9b0bc1bd9
commit
64375484a1
|
@ -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>
|
17
build.gradle
17
build.gradle
|
@ -78,20 +78,3 @@ task wrapper(type: Wrapper) {
|
||||||
gradleVersion = '0.9-rc-1'
|
gradleVersion = '0.9-rc-1'
|
||||||
jarPath = 'gradle/wrapper'
|
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')
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
<logger name="org.apache.directory" level="WARN"/>
|
<logger name="org.apache.directory" level="WARN"/>
|
||||||
|
|
||||||
<root level="INFO">
|
<root level="WARN">
|
||||||
<appender-ref ref="STDOUT" />
|
<appender-ref ref="STDOUT" />
|
||||||
</root>
|
</root>
|
||||||
|
|
||||||
|
|
|
@ -5,9 +5,7 @@
|
||||||
</encoder>
|
</encoder>
|
||||||
</appender>
|
</appender>
|
||||||
|
|
||||||
<logger name="org.apache.directory" level="WARN"/>
|
<root level="WARN">
|
||||||
|
|
||||||
<root level="INFO">
|
|
||||||
<appender-ref ref="STDOUT" />
|
<appender-ref ref="STDOUT" />
|
||||||
</root>
|
</root>
|
||||||
|
|
||||||
|
|
|
@ -35,17 +35,21 @@ gradle.taskGraph.whenReady {graph ->
|
||||||
def deployer = null
|
def deployer = null
|
||||||
|
|
||||||
uploadArchives {
|
uploadArchives {
|
||||||
|
def releaseRepositoryUrl = "file://${project.properties.mavenSyncRepoDir}"
|
||||||
|
def milestoneRepositoryUrl = 's3://maven.springframework.org/milestone'
|
||||||
|
def snapshotRepositoryUrl = 's3://maven.springframework.org/snapshot'
|
||||||
|
|
||||||
deployer = repositories.mavenDeployer {
|
deployer = repositories.mavenDeployer {
|
||||||
configuration = configurations.deployerJars
|
configuration = configurations.deployerJars
|
||||||
if (releaseBuild) {
|
if (releaseBuild) {
|
||||||
// "mavenSyncRepoDir" should be set in properties
|
// "mavenSyncRepoDir" should be set in properties
|
||||||
repository(url: mavenSyncRepoDir)
|
repository(url: releaseRepositoryUrl)
|
||||||
} else {
|
} else {
|
||||||
s3credentials = [userName: s3AccessKey, passphrase: s3SecretAccessKey]
|
s3credentials = [userName: project.properties.s3AccessKey, passphrase: project.properties.s3SecretAccessKey]
|
||||||
repository(url: "s3://maven.springframework.org/milestone") {
|
repository(url: milestoneRepositoryUrl) {
|
||||||
authentication(s3credentials)
|
authentication(s3credentials)
|
||||||
}
|
}
|
||||||
snapshotRepository(url: "s3://maven.springframework.org/snapshot") {
|
snapshotRepository(url: snapshotRepositoryUrl) {
|
||||||
authentication(s3credentials)
|
authentication(s3credentials)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,9 +5,9 @@
|
||||||
</encoder>
|
</encoder>
|
||||||
</appender>
|
</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" />
|
<appender-ref ref="STDOUT" />
|
||||||
</root>
|
</root>
|
||||||
|
|
||||||
|
|
|
@ -5,9 +5,9 @@
|
||||||
</encoder>
|
</encoder>
|
||||||
</appender>
|
</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" />
|
<appender-ref ref="STDOUT" />
|
||||||
</root>
|
</root>
|
||||||
|
|
||||||
|
|
|
@ -5,9 +5,9 @@
|
||||||
</encoder>
|
</encoder>
|
||||||
</appender>
|
</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" />
|
<appender-ref ref="STDOUT" />
|
||||||
</root>
|
</root>
|
||||||
|
|
||||||
|
|
|
@ -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>
|
|
@ -3,13 +3,14 @@
|
||||||
apply plugin: 'war'
|
apply plugin: 'war'
|
||||||
apply plugin: 'jetty'
|
apply plugin: 'jetty'
|
||||||
|
|
||||||
|
/*
|
||||||
configurations {
|
configurations {
|
||||||
casServer
|
casServer
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
dependencies {
|
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'),
|
runtime project(':spring-security-web'),
|
||||||
project(':spring-security-cas'),
|
project(':spring-security-cas'),
|
||||||
|
@ -34,6 +35,7 @@ jettyRun {
|
||||||
connectors = [httpConnector, httpsConnector]
|
connectors = [httpConnector, httpsConnector]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
task casServer (type: org.gradle.api.plugins.jetty.JettyRunWar) {
|
task casServer (type: org.gradle.api.plugins.jetty.JettyRunWar) {
|
||||||
contextPath = "/cas"
|
contextPath = "/cas"
|
||||||
connectors = [new org.mortbay.jetty.security.SslSocketConnector()]
|
connectors = [new org.mortbay.jetty.security.SslSocketConnector()]
|
||||||
|
@ -53,3 +55,4 @@ task cas (dependsOn: jettyRun) {
|
||||||
jettyRun.dependsOn(casServer)
|
jettyRun.dependsOn(casServer)
|
||||||
casServer.daemon = true
|
casServer.daemon = true
|
||||||
}
|
}
|
||||||
|
*/
|
|
@ -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>
|
Loading…
Reference in New Issue