add docker checks

zzg · Feb 11, 2018 · e66df05 · e66df05
1 parent eb78bf4
commit e66df05
Show file tree

Hide file tree

Showing 91 changed files with 262 additions and 264 deletions.
diff --git a/api/cas-server-core-api-events/src/test/resources/log4j2.xml b/api/cas-server-core-api-events/src/test/resources/log4j2.xml
@@ -15,10 +15,10 @@
         </RollingFile>
     </Appenders>
     <Loggers>
-        <Logger name="org.apereo" level="warn">
+        <Logger name="org.apereo" level="off">
             <AppenderRef ref="console"/>
         </Logger>
-        <Root level="warn">
+        <Root level="off">
             <AppenderRef ref="console"/>
         </Root>
     </Loggers>

diff --git a/ci/run-couchbase-server.sh b/ci/run-couchbase-server.sh
@@ -19,6 +19,7 @@ until $(curl --output /dev/null --silent --head --fail http://localhost:8091); d
 done
 
 echo -e "\nCreating default Couchbase bucket..."
-curl -X POST -d name=default -d ramQuotaMB=120 -d authType=none -d proxyPort=11216 http://localhost:8091/pools/default/buckets
+curl -X POST -d 'name=default' -d 'ramQuotaMB=120' -d 'authType=none' -d 'proxyPort=11216' http://localhost:8091/pools/default/buckets
+curl -X POST -d 'name=casbucket' -d 'ramQuotaMB=120' -d 'authType=none' -d 'proxyPort=11217' http://localhost:8091/pools/default/buckets
 
 
diff --git a/core/cas-server-core-audit/src/test/resources/log4j2.xml b/core/cas-server-core-audit/src/test/resources/log4j2.xml
@@ -29,10 +29,10 @@
         <Logger name="org.slf4j.impl" level="trace">
             <AppenderRef ref="slf4j"/>
         </Logger>
-        <Logger name="org.apereo" level="warn" additivity="false">
+        <Logger name="org.apereo" level="off" additivity="false">
             <AppenderRef ref="console"/>
         </Logger>
-        <Root level="warn">
+        <Root level="off">
             <AppenderRef ref="console"/>
         </Root>
     </Loggers>

diff --git a/core/cas-server-core-authentication-attributes/src/test/resources/log4j2.xml b/core/cas-server-core-authentication-attributes/src/test/resources/log4j2.xml
@@ -15,10 +15,10 @@
         </RollingFile>
     </Appenders>
     <Loggers>
-        <Logger name="org.apereo" level="warn">
+        <Logger name="org.apereo" level="off">
             <AppenderRef ref="console"/>
         </Logger>
-        <Root level="warn">
+        <Root level="off">
             <AppenderRef ref="console"/>
         </Root>
     </Loggers>

diff --git a/core/cas-server-core-authentication/src/test/resources/log4j2.xml b/core/cas-server-core-authentication/src/test/resources/log4j2.xml
@@ -29,10 +29,10 @@
         <Logger name="org.slf4j.impl" level="trace">
             <AppenderRef ref="slf4j"/>
         </Logger>
-        <Logger name="org.apereo" level="warn" additivity="false">
+        <Logger name="org.apereo" level="off" additivity="false">
             <AppenderRef ref="console"/>
         </Logger>
-        <Root level="warn">
+        <Root level="off">
             <AppenderRef ref="console"/>
         </Root>
     </Loggers>

diff --git a/core/cas-server-core-events/src/test/resources/log4j2.xml b/core/cas-server-core-events/src/test/resources/log4j2.xml
@@ -15,10 +15,10 @@
         </RollingFile>
     </Appenders>
     <Loggers>
-        <Logger name="org.apereo" level="warn">
+        <Logger name="org.apereo" level="off">
             <AppenderRef ref="console"/>
         </Logger>
-        <Root level="warn">
+        <Root level="off">
             <AppenderRef ref="console"/>
         </Root>
     </Loggers>

diff --git a/core/cas-server-core-logging-config/src/test/resources/log4j2.xml b/core/cas-server-core-logging-config/src/test/resources/log4j2.xml
@@ -29,10 +29,10 @@
         <Logger name="org.slf4j.impl" level="trace">
             <AppenderRef ref="slf4j"/>
         </Logger>
-        <Logger name="org.apereo" level="warn" additivity="false">
+        <Logger name="org.apereo" level="off" additivity="false">
             <AppenderRef ref="console"/>
         </Logger>
-        <Root level="warn">
+        <Root level="off">
             <AppenderRef ref="console"/>
         </Root>
     </Loggers>

diff --git a/core/cas-server-core-logging/src/test/resources/log4j2.xml b/core/cas-server-core-logging/src/test/resources/log4j2.xml
@@ -29,10 +29,10 @@
         <Logger name="org.slf4j.impl" level="trace">
             <AppenderRef ref="slf4j"/>
         </Logger>
-        <Logger name="org.apereo" level="warn" additivity="false">
+        <Logger name="org.apereo" level="off" additivity="false">
             <AppenderRef ref="console"/>
         </Logger>
-        <Root level="warn">
+        <Root level="off">
             <AppenderRef ref="console"/>
         </Root>
     </Loggers>

diff --git a/core/cas-server-core-logout/src/test/resources/log4j2.xml b/core/cas-server-core-logout/src/test/resources/log4j2.xml
@@ -29,10 +29,10 @@
         <Logger name="org.slf4j.impl" level="trace">
             <AppenderRef ref="slf4j"/>
         </Logger>
-        <Logger name="org.apereo" level="warn" additivity="false">
+        <Logger name="org.apereo" level="off" additivity="false">
             <AppenderRef ref="console"/>
         </Logger>
-        <Root level="warn">
+        <Root level="off">
             <AppenderRef ref="console"/>
         </Root>
     </Loggers>

diff --git a/core/cas-server-core-monitor/src/test/resources/log4j2.xml b/core/cas-server-core-monitor/src/test/resources/log4j2.xml
@@ -29,10 +29,10 @@
         <Logger name="org.slf4j.impl" level="trace">
             <AppenderRef ref="slf4j"/>
         </Logger>
-        <Logger name="org.apereo" level="warn" additivity="false">
+        <Logger name="org.apereo" level="off" additivity="false">
             <AppenderRef ref="console"/>
         </Logger>
-        <Root level="warn">
+        <Root level="off">
             <AppenderRef ref="console"/>
         </Root>
     </Loggers>

diff --git a/core/cas-server-core-services/src/test/resources/log4j2.xml b/core/cas-server-core-services/src/test/resources/log4j2.xml
@@ -26,10 +26,10 @@
         </RollingFile>
     </Appenders>
     <Loggers>
-        <Logger name="org.apereo" level="warn" additivity="false">
+        <Logger name="org.apereo" level="off" additivity="false">
             <AppenderRef ref="console"/>
         </Logger>
-        <Root level="warn">
+        <Root level="off">
             <AppenderRef ref="console"/>
         </Root>
     </Loggers>

diff --git a/core/cas-server-core-tickets/src/test/resources/log4j2.xml b/core/cas-server-core-tickets/src/test/resources/log4j2.xml
@@ -29,10 +29,10 @@
         <Logger name="org.slf4j.impl" level="trace">
             <AppenderRef ref="slf4j"/>
         </Logger>
-        <Logger name="org.apereo" level="warn" additivity="false">
+        <Logger name="org.apereo" level="off" additivity="false">
             <AppenderRef ref="console"/>
         </Logger>
-        <Root level="warn">
+        <Root level="off">
             <AppenderRef ref="console"/>
         </Root>
     </Loggers>

diff --git a/core/cas-server-core-util/src/test/resources/log4j2.xml b/core/cas-server-core-util/src/test/resources/log4j2.xml
@@ -29,10 +29,10 @@
         <Logger name="org.slf4j.impl" level="trace">
             <AppenderRef ref="slf4j"/>
         </Logger>
-        <Logger name="org.apereo" level="warn" additivity="false">
+        <Logger name="org.apereo" level="off" additivity="false">
             <AppenderRef ref="console"/>
         </Logger>
-        <Root level="warn">
+        <Root level="off">
             <AppenderRef ref="console"/>
         </Root>
     </Loggers>

diff --git a/core/cas-server-core-validation/src/test/resources/log4j2.xml b/core/cas-server-core-validation/src/test/resources/log4j2.xml
@@ -29,10 +29,10 @@
         <Logger name="org.slf4j.impl" level="trace">
             <AppenderRef ref="slf4j"/>
         </Logger>
-        <Logger name="org.apereo" level="warn" additivity="false">
+        <Logger name="org.apereo" level="off" additivity="false">
             <AppenderRef ref="console"/>
         </Logger>
-        <Root level="warn">
+        <Root level="off">
             <AppenderRef ref="console"/>
         </Root>
     </Loggers>

diff --git a/core/cas-server-core/src/test/resources/log4j2.xml b/core/cas-server-core/src/test/resources/log4j2.xml
@@ -30,10 +30,10 @@
         <Logger name="org.slf4j.impl" level="trace">
             <AppenderRef ref="slf4j"/>
         </Logger>
-        <Logger name="org.apereo" level="warn" additivity="false">
+        <Logger name="org.apereo" level="off" additivity="false">
             <AppenderRef ref="console"/>
         </Logger>
-        <Root level="warn">
+        <Root level="off">
             <AppenderRef ref="console"/>
         </Root>
     </Loggers>

diff --git a/support/cas-server-support-audit-jdbc/src/test/resources/log4j2.xml b/support/cas-server-support-audit-jdbc/src/test/resources/log4j2.xml
@@ -15,10 +15,10 @@
         </RollingFile>
     </Appenders>
     <Loggers>
-        <Logger name="org.apereo" level="warn" additivity="false">
+        <Logger name="org.apereo" level="off" additivity="false">
             <AppenderRef ref="console"/>
         </Logger>
-        <Root level="warn">
+        <Root level="off">
             <AppenderRef ref="console"/>
         </Root>
     </Loggers>

diff --git a/support/cas-server-support-azure/src/test/resources/log4j2.xml b/support/cas-server-support-azure/src/test/resources/log4j2.xml
@@ -15,11 +15,11 @@
         </RollingFile>
     </Appenders>
     <Loggers>
-        <Logger name="org.apereo.cas" level="warn">
+        <Logger name="org.apereo.cas" level="off">
             <AppenderRef ref="console"/>
         </Logger>
 
-        <Root level="warn">
+        <Root level="off">
             <AppenderRef ref="console"/>
         </Root>
     </Loggers>

diff --git a/support/cas-server-support-consent-ldap/src/test/resources/log4j2.xml b/support/cas-server-support-consent-ldap/src/test/resources/log4j2.xml
@@ -15,16 +15,16 @@
         </RollingFile>
     </Appenders>
     <Loggers>
-        <Logger name="org.apereo" level="warn" additivity="false">
+        <Logger name="org.apereo" level="off" additivity="false">
             <AppenderRef ref="console"/>
         </Logger>
-        <Logger name="org.ldaptive" level="warn" additivity="false">
+        <Logger name="org.ldaptive" level="off" additivity="false">
             <AppenderRef ref="console"/>
         </Logger>
         <Logger name="com.unboundid" level="debug" additivity="false">
             <AppenderRef ref="console"/>
         </Logger>
-        <Root level="warn">
+        <Root level="off">
             <AppenderRef ref="console"/>
         </Root>
     </Loggers>

diff --git a/support/cas-server-support-consent-rest/src/test/resources/log4j2.xml b/support/cas-server-support-consent-rest/src/test/resources/log4j2.xml
@@ -15,10 +15,10 @@
         </RollingFile>
     </Appenders>
     <Loggers>
-        <Logger name="org.apereo" level="warn" additivity="false">
+        <Logger name="org.apereo" level="off" additivity="false">
             <AppenderRef ref="console"/>
         </Logger>
-        <Root level="warn">
+        <Root level="off">
             <AppenderRef ref="console"/>
         </Root>
     </Loggers>

diff --git a/...rt-couchbase-core/src/main/java/org/apereo/cas/couchbase/core/CouchbaseClientFactory.java b/...rt-couchbase-core/src/main/java/org/apereo/cas/couchbase/core/CouchbaseClientFactory.java
@@ -147,20 +147,17 @@ private void createDesignDocumentAndViewIfNeeded() {
     private void openBucket() {
         try {
             LOGGER.debug("Trying to connect to couchbase bucket [{}]", this.bucketName);
-            this.bucket = this.cluster.openBucket(this.bucketName, this.bucketPassword, this.timeout, TimeUnit.SECONDS);
+            if (StringUtils.isBlank(this.bucketPassword)) {
+                this.bucket = this.cluster.openBucket(this.bucketName, this.timeout, TimeUnit.MILLISECONDS);
+            } else {
+                this.bucket = this.cluster.openBucket(this.bucketName, this.bucketPassword, this.timeout, TimeUnit.MILLISECONDS);
+            }
         } catch (final Exception e) {
             throw new IllegalArgumentException("Failed to connect to Couchbase bucket " + this.bucketName, e);
         }
         LOGGER.info("Connected to Couchbase bucket [{}]", this.bucketName);
     }
-
-    /**
-     * Remove default bucket.
-     */
-    public static void removeDefaultBucket() {
-        HttpUtils.execute("http://localhost:8091/pools/default/buckets/default", "DELETE");
-    }
-
+
     /**
      * Create default bucket http servlet response.
      *

diff --git a/support/cas-server-support-couchbase-service-registry/src/test/resources/cas.properties b/support/cas-server-support-couchbase-service-registry/src/test/resources/cas.properties
diff --git a/support/cas-server-support-couchbase-service-registry/src/test/resources/log4j2.xml b/support/cas-server-support-couchbase-service-registry/src/test/resources/log4j2.xml
@@ -15,13 +15,13 @@
         </RollingFile>
     </Appenders>
     <Loggers>
-        <Logger name="org.apereo" level="warn" additivity="false">
+        <Logger name="org.apereo" level="debug" additivity="false">
             <AppenderRef ref="console"/>
         </Logger>
-        <Logger name="com.couchbase" level="warn" additivity="false">
+        <Logger name="com.couchbase" level="debug" additivity="false">
             <AppenderRef ref="console"/>
         </Logger>
-        <Root level="warn">
+        <Root level="off">
             <AppenderRef ref="console"/>
         </Root>
     </Loggers>

diff --git a/support/cas-server-support-couchbase-ticket-registry/src/test/resources/log4j2.xml b/support/cas-server-support-couchbase-ticket-registry/src/test/resources/log4j2.xml
@@ -21,7 +21,7 @@
         <Logger name="com.couchbase" level="debug" additivity="false">
             <AppenderRef ref="console"/>
         </Logger>
-        <Root level="warn">
+        <Root level="off">
             <AppenderRef ref="console"/>
         </Root>
     </Loggers>

diff --git a/support/cas-server-support-dynamodb-service-registry/src/test/resources/log4j2.xml b/support/cas-server-support-dynamodb-service-registry/src/test/resources/log4j2.xml
@@ -15,13 +15,13 @@
         </RollingFile>
     </Appenders>
     <Loggers>
-        <Logger name="org.apereo" level="warn" additivity="false">
+        <Logger name="org.apereo" level="off" additivity="false">
             <AppenderRef ref="console"/>
         </Logger>
-        <Logger name="com.amazonaws" level="warn" additivity="false">
+        <Logger name="com.amazonaws" level="off" additivity="false">
             <AppenderRef ref="console"/>
         </Logger>
-        <Root level="warn" additivity="false">
+        <Root level="off" additivity="false">
             <AppenderRef ref="console"/>
         </Root>
     </Loggers>

diff --git a/support/cas-server-support-dynamodb-ticket-registry/src/test/resources/log4j2.xml b/support/cas-server-support-dynamodb-ticket-registry/src/test/resources/log4j2.xml
@@ -15,13 +15,13 @@
         </RollingFile>
     </Appenders>
     <Loggers>
-        <Logger name="org.apereo" level="warn" additivity="false">
+        <Logger name="org.apereo" level="off" additivity="false">
             <AppenderRef ref="console"/>
         </Logger>
-        <Logger name="com.amazonaws" level="warn" additivity="false">
+        <Logger name="com.amazonaws" level="off" additivity="false">
             <AppenderRef ref="console"/>
         </Logger>
-        <Root level="warn" additivity="false">
+        <Root level="off" additivity="false">
             <AppenderRef ref="console"/>
         </Root>
     </Loggers>

diff --git a/support/cas-server-support-ehcache-monitor/src/test/resources/log4j2.xml b/support/cas-server-support-ehcache-monitor/src/test/resources/log4j2.xml
@@ -18,10 +18,10 @@
         <Logger name="org.apache.xml.security" level="off" />
         <Logger name="org.springframework.test" level="off" />
 
-        <Logger name="org.apereo" level="warn">
+        <Logger name="org.apereo" level="off">
             <AppenderRef ref="console"/>
         </Logger>
-        <Root level="warn">
+        <Root level="off">
             <AppenderRef ref="console"/>
         </Root>
     </Loggers>

diff --git a/support/cas-server-support-ehcache-ticket-registry/src/test/resources/log4j2.xml b/support/cas-server-support-ehcache-ticket-registry/src/test/resources/log4j2.xml
@@ -18,10 +18,10 @@
         <Logger name="org.apache.xml.security" level="off" />
         <Logger name="org.springframework.test" level="off" />
 
-        <Logger name="org.apereo" level="warn" additivity="false">
+        <Logger name="org.apereo" level="off" additivity="false">
             <AppenderRef ref="console"/>
         </Logger>
-        <Root level="warn">
+        <Root level="off">
             <AppenderRef ref="console"/>
         </Root>
     </Loggers>

diff --git a/support/cas-server-support-electrofence/src/test/resources/log4j2.xml b/support/cas-server-support-electrofence/src/test/resources/log4j2.xml
@@ -15,10 +15,10 @@
         </RollingFile>
     </Appenders>
     <Loggers>
-        <Logger name="org.apereo" level="warn" additivity="false">
+        <Logger name="org.apereo" level="off" additivity="false">
             <AppenderRef ref="console"/>
         </Logger>
-        <Root level="warn">
+        <Root level="off">
             <AppenderRef ref="console"/>
         </Root>
     </Loggers>

diff --git a/support/cas-server-support-events-jpa/src/test/resources/log4j2.xml b/support/cas-server-support-events-jpa/src/test/resources/log4j2.xml
@@ -15,10 +15,10 @@
         </RollingFile>
     </Appenders>
     <Loggers>
-        <Logger name="org.apereo" level="warn" additivity="false">
+        <Logger name="org.apereo" level="off" additivity="false">
             <AppenderRef ref="console"/>
         </Logger>
-        <Root level="warn">
+        <Root level="off">
             <AppenderRef ref="console"/>
         </Root>
     </Loggers>