Merge branch 'master' into CAS-1425

frett · Aug 30, 2014 · 2ea937b · 2ea937b
2 parents 58dc12b + 82647eb
commit 2ea937b
Show file tree

Hide file tree

Showing 59 changed files with 1,323 additions and 136 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -31,12 +31,11 @@ branches:
   - master
 jdk:
 - oraclejdk7
-- openjdk6
 - openjdk7
 env:
   global:
   - secure: "JlFTItSTHxmevCoX1fXWkXtQOqP8ERT5ndeYMc378acqZIWEpmoSQelP8unRjtU6sU/4dxdUWpEFLrbcNQsFuPsgzMLGSwuEcjbuSBGMgdAHXSl6+FfBWrCcde2WIfk+eYMm7mrhcySWMvtWss1kDOu+s8+HtRvnRCAsfz+77hs="
-script: mvn clean package -Dlog4j.configuration=/none.xml
+script: mvn clean package -Dlog4j.configuration=file:../travis/log4j.xml
 before_install:
 - chmod -R 777 ./travis/init-travis-build.sh
 - ./travis/init-travis-build.sh
@@ -45,4 +44,4 @@ after_success:
 - ./travis/push-javadoc-to-gh-pages.sh
 - mvn clean test cobertura:cobertura coveralls:cobertura
 #- chmod -R 777 ./travis/test-commit-message.sh
-#- ./travis/test-commit-message.sh
+#- ./travis/test-commit-message.sh
diff --git a/...t-webapp/src/main/java/org/jasig/cas/services/web/support/RegisteredServiceValidator.java b/...t-webapp/src/main/java/org/jasig/cas/services/web/support/RegisteredServiceValidator.java
@@ -23,7 +23,7 @@
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jasig.cas.services.RegisteredService;
 import org.jasig.cas.services.ServicesManager;
 import org.jasig.services.persondir.IPersonAttributeDao;

diff --git a/cas-server-core/pom.xml b/cas-server-core/pom.xml
@@ -54,8 +54,8 @@
         </dependency>
 
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
             <scope>compile</scope>
         </dependency>
 
@@ -170,6 +170,12 @@
             <artifactId>joda-time</artifactId>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.reflections</groupId>
+            <artifactId>reflections</artifactId>
+            <scope>compile</scope>
+        </dependency>
 
         <dependency>
           <groupId>org.quartz-scheduler</groupId>

diff --git a/cas-server-core/src/main/java/org/jasig/cas/CentralAuthenticationServiceImpl.java b/cas-server-core/src/main/java/org/jasig/cas/CentralAuthenticationServiceImpl.java
@@ -19,7 +19,7 @@
 package org.jasig.cas;
 
 import com.github.inspektr.audit.annotation.Audit;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jasig.cas.authentication.AcceptAnyAuthenticationPolicyFactory;
 import org.jasig.cas.authentication.Authentication;
 import org.jasig.cas.authentication.AuthenticationBuilder;

diff --git a/cas-server-core/src/main/java/org/jasig/cas/Message.java b/cas-server-core/src/main/java/org/jasig/cas/Message.java
@@ -21,7 +21,7 @@
 import java.io.Serializable;
 import java.util.Arrays;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.springframework.util.Assert;
 
 /**

diff --git a/cas-server-core/src/main/java/org/jasig/cas/authentication/AbstractCredential.java b/cas-server-core/src/main/java/org/jasig/cas/authentication/AbstractCredential.java
@@ -18,9 +18,9 @@
  */
 package org.jasig.cas.authentication;
 
-import java.io.Serializable;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import java.io.Serializable;
 
 /**
  * Base class for CAS credentials that are safe for long-term storage.

diff --git a/cas-server-core/src/main/java/org/jasig/cas/authentication/BasicCredentialMetaData.java b/cas-server-core/src/main/java/org/jasig/cas/authentication/BasicCredentialMetaData.java
@@ -20,8 +20,8 @@
 
 import java.io.Serializable;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * Basic credential metadata implementation that stores the original credential ID and the original credential type.

diff --git a/cas-server-core/src/main/java/org/jasig/cas/authentication/HandlerResult.java b/cas-server-core/src/main/java/org/jasig/cas/authentication/HandlerResult.java
@@ -22,8 +22,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.jasig.cas.Message;
 import org.jasig.cas.authentication.principal.Principal;
 import org.springframework.util.Assert;

diff --git a/cas-server-core/src/main/java/org/jasig/cas/authentication/HttpBasedServiceCredential.java b/cas-server-core/src/main/java/org/jasig/cas/authentication/HttpBasedServiceCredential.java
@@ -18,7 +18,7 @@
  */
 package org.jasig.cas.authentication;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.jasig.cas.services.RegisteredService;
 
 import javax.validation.constraints.NotNull;

diff --git a/cas-server-core/src/main/java/org/jasig/cas/authentication/ImmutableAuthentication.java b/cas-server-core/src/main/java/org/jasig/cas/authentication/ImmutableAuthentication.java
@@ -23,8 +23,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.jasig.cas.authentication.principal.Principal;
 import org.springframework.util.Assert;
 

diff --git a/cas-server-core/src/main/java/org/jasig/cas/authentication/principal/SimplePrincipal.java b/cas-server-core/src/main/java/org/jasig/cas/authentication/principal/SimplePrincipal.java
@@ -21,7 +21,7 @@
 import java.util.Collections;
 import java.util.Map;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.springframework.util.Assert;
 
 /**

diff --git a/cas-server-core/src/main/java/org/jasig/cas/monitor/AbstractNamedMonitor.java b/cas-server-core/src/main/java/org/jasig/cas/monitor/AbstractNamedMonitor.java
@@ -18,7 +18,7 @@
  */
 package org.jasig.cas.monitor;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.Assert;

diff --git a/cas-server-core/src/main/java/org/jasig/cas/services/AbstractAttributeReleasePolicy.java b/cas-server-core/src/main/java/org/jasig/cas/services/AbstractAttributeReleasePolicy.java
@@ -20,8 +20,8 @@
 
 import java.util.Map;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.jasig.cas.authentication.principal.Principal;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/cas-server-core/src/main/java/org/jasig/cas/services/AbstractRegisteredService.java b/cas-server-core/src/main/java/org/jasig/cas/services/AbstractRegisteredService.java
@@ -19,12 +19,12 @@
 
 package org.jasig.cas.services;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.builder.CompareToBuilder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.builder.CompareToBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.HashSet;
 import java.util.Set;

diff --git a/cas-server-core/src/main/java/org/jasig/cas/services/RefuseRegisteredServiceProxyPolicy.java b/cas-server-core/src/main/java/org/jasig/cas/services/RefuseRegisteredServiceProxyPolicy.java
@@ -18,7 +18,7 @@
  */
 package org.jasig.cas.services;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import java.net.URL;
 

diff --git a/...-core/src/main/java/org/jasig/cas/services/RegexMatchingRegisteredServiceProxyPolicy.java b/...-core/src/main/java/org/jasig/cas/services/RegexMatchingRegisteredServiceProxyPolicy.java
@@ -21,9 +21,9 @@
 import java.net.URL;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.sun.istack.NotNull;
 

diff --git a/...e/src/main/java/org/jasig/cas/services/support/RegisteredServiceRegexAttributeFilter.java b/...e/src/main/java/org/jasig/cas/services/support/RegisteredServiceRegexAttributeFilter.java
@@ -27,8 +27,8 @@
 
 import javax.validation.constraints.NotNull;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.jasig.cas.services.AttributeFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/cas-server-core/src/main/java/org/jasig/cas/ticket/TicketGrantingTicketImpl.java b/cas-server-core/src/main/java/org/jasig/cas/ticket/TicketGrantingTicketImpl.java
@@ -18,7 +18,7 @@
  */
 package org.jasig.cas.ticket;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.jasig.cas.authentication.Authentication;
 import org.jasig.cas.authentication.principal.Service;
 import org.slf4j.Logger;

diff --git a/cas-server-core/src/main/java/org/jasig/cas/util/ISOStandardDateFormat.java b/cas-server-core/src/main/java/org/jasig/cas/util/ISOStandardDateFormat.java
@@ -18,9 +18,11 @@
  */
 package org.jasig.cas.util;
 
-import java.util.Date;
+import org.apache.commons.lang3.time.FastDateFormat;
 
-import org.apache.commons.lang.time.FastDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
 
 /**
  * A fast date format based on the ISO-8601 standard.
@@ -39,8 +41,7 @@ public final class ISOStandardDateFormat extends FastDateFormat {
      * based on the format {@link #DATE_FORMAT}.
      */
     public ISOStandardDateFormat() {
-        super(DATE_FORMAT, null, null);
-        super.init();
+        super(DATE_FORMAT, TimeZone.getDefault(), Locale.getDefault());
     }
 
     /**

diff --git a/cas-server-core/src/main/java/org/jasig/cas/validation/ImmutableAssertion.java b/cas-server-core/src/main/java/org/jasig/cas/validation/ImmutableAssertion.java
@@ -22,7 +22,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.jasig.cas.authentication.Authentication;
 import org.jasig.cas.authentication.principal.Service;
 import org.springframework.util.Assert;