diff --git a/acl/src/test/resources/logback-test.xml b/acl/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..39ba6d17e7
--- /dev/null
+++ b/acl/src/test/resources/logback-test.xml
@@ -0,0 +1,12 @@
+
+
+
+ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+
+
+
+
+
+
+
+
diff --git a/build.gradle b/build.gradle
index f8173ae6e9..24d989c490 100644
--- a/build.gradle
+++ b/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')
- }
- })
- }
-}
-*/
-
diff --git a/config/src/test/resources/logback-test.xml b/config/src/test/resources/logback-test.xml
index 0bbb0e3369..bf58c9887e 100644
--- a/config/src/test/resources/logback-test.xml
+++ b/config/src/test/resources/logback-test.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/core/src/test/resources/logback-test.xml b/core/src/test/resources/logback-test.xml
index 0bbb0e3369..39ba6d17e7 100644
--- a/core/src/test/resources/logback-test.xml
+++ b/core/src/test/resources/logback-test.xml
@@ -5,9 +5,7 @@
-
-
-
+
diff --git a/gradle/maven.gradle b/gradle/maven.gradle
index 7c76a1b795..5088ebf81f 100644
--- a/gradle/maven.gradle
+++ b/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)
}
}
diff --git a/itest/context/src/test/resources/logback-test.xml b/itest/context/src/test/resources/logback-test.xml
index 0bbb0e3369..2a165ab3f7 100644
--- a/itest/context/src/test/resources/logback-test.xml
+++ b/itest/context/src/test/resources/logback-test.xml
@@ -5,9 +5,9 @@
-
+
-
+
diff --git a/itest/web/src/test/resources/logback-test.xml b/itest/web/src/test/resources/logback-test.xml
index 0bbb0e3369..2a165ab3f7 100644
--- a/itest/web/src/test/resources/logback-test.xml
+++ b/itest/web/src/test/resources/logback-test.xml
@@ -5,9 +5,9 @@
-
+
-
+
diff --git a/ldap/src/test/resources/logback-test.xml b/ldap/src/test/resources/logback-test.xml
index a53fe39b00..2a165ab3f7 100644
--- a/ldap/src/test/resources/logback-test.xml
+++ b/ldap/src/test/resources/logback-test.xml
@@ -5,10 +5,10 @@
-
+
-
+
-
\ No newline at end of file
+
diff --git a/samples/aspectj/src/test/resources/logback-test.xml b/samples/aspectj/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..39ba6d17e7
--- /dev/null
+++ b/samples/aspectj/src/test/resources/logback-test.xml
@@ -0,0 +1,12 @@
+
+
+
+ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+
+
+
+
+
+
+
+
diff --git a/samples/cas/cas.gradle b/samples/cas/cas.gradle
index b4162aa34a..713fbb9f6d 100644
--- a/samples/cas/cas.gradle
+++ b/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
}
+*/
\ No newline at end of file
diff --git a/web/src/test/resources/logback-test.xml b/web/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..39ba6d17e7
--- /dev/null
+++ b/web/src/test/resources/logback-test.xml
@@ -0,0 +1,12 @@
+
+
+
+ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+
+
+
+
+
+
+
+