diff --git a/.travis.yml b/.travis.yml
index 988b248a..915eaf1a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,6 @@
 #
+# Copyright (c) 2015. Center for Open Science
+#
 # Licensed to Apereo under one or more contributor license
 # agreements. See the NOTICE file distributed with this work
 # for additional information regarding copyright ownership.
diff --git a/AUTHORS.md b/AUTHORS.md
index 76f47e52..18e063b7 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -1,11 +1,15 @@
 # Credits
 
-## Contributors
+## Maintainers
 
-- Michael Haselton  [`@icereval`](https://github.com/icereval)
 - Longze Chen [`@cslzchen`](https://github.com/cslzchen)
 - Fitz Elliott [`@felliott`](https://github.com/felliott)
-- Erin Braswell [`@erinspace`](https://github.com/erinspace)
-- Andy Boughton [`@abought`](https://github.com/abought)
-- Billy Hunt [`@billyhunt`](https://github.com/billyhunt)
-- Darío Hereñú [`@kant`](https://github.com/kant)
+- Matt Fraizer [`@mfraezz`](https://github.com/mfraezz)
+
+## Alumni
+
+- Michael Haselton  [`@icereval`](https://github.com/icereval)
+
+## Contributors
+
+* Here is the [contributor list](https://github.com/CenterForOpenScience/cas-overlay/graphs/contributors).
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e0376da..21f7ace6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
+19.3.0 (2019-11-18)
+===================
+
+- Gracefully handle exceptions during delegated login using pac4j-1.7.x
+- Add / Update / Fix Apache 2.0 license header
+
 19.2.2 (2019-11-13)
 ===================
 
diff --git a/cas-server-support-oauth/pom.xml b/cas-server-support-oauth/pom.xml
index 14b23fa7..1143edf0 100755
--- a/cas-server-support-oauth/pom.xml
+++ b/cas-server-support-oauth/pom.xml
@@ -1,4 +1,6 @@
 <!--
+  ~ Copyright (c) 2015. Center for Open Science
+  ~
   ~ Licensed to Apereo under one or more contributor license
   ~ agreements. See the NOTICE file distributed with this work
   ~ for additional information regarding copyright ownership.
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/services/OSFRegisteredService.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/services/OSFRegisteredService.java
index 56cfe3e4..c4c77fba 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/services/OSFRegisteredService.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/services/OSFRegisteredService.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2017. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.services;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/CentralOAuthService.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/CentralOAuthService.java
index c4496b2a..6717d31a 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/CentralOAuthService.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/CentralOAuthService.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/CentralOAuthServiceImpl.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/CentralOAuthServiceImpl.java
index 7abbbdd0..c7a2d801 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/CentralOAuthServiceImpl.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/CentralOAuthServiceImpl.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/InvalidParameterException.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/InvalidParameterException.java
index 02e8de04..67e4eeb3 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/InvalidParameterException.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/InvalidParameterException.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/OAuthConstants.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/OAuthConstants.java
index bc201b00..0d2a7e30 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/OAuthConstants.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/OAuthConstants.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2015. Center for Open Science
+ *
  * Licensed to Apereo under one or more contributor license
  * agreements. See the NOTICE file distributed with this work
  * for additional information regarding copyright ownership.
@@ -28,7 +30,7 @@
  * @author Jerome Leleu
  * @author Michael Haselton
  * @author Longze Chen
- * @since 4.1.5
+ * @since 3.5.0
  */
 public interface OAuthConstants {
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/OAuthUtils.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/OAuthUtils.java
index 568b6acf..7826a4de 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/OAuthUtils.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/OAuthUtils.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2015. Center for Open Science
+ *
  * Licensed to Apereo under one or more contributor license
  * agreements. See the NOTICE file distributed with this work
  * for additional information regarding copyright ownership.
@@ -50,7 +52,7 @@
  *
  * @author Jerome Leleu
  * @author Longze Chen
- * @since 4.1.5
+ * @since 3.5.0
  */
 public final class OAuthUtils {
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/authentication/handler/support/OAuthCredentialsAuthenticationHandler.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/authentication/handler/support/OAuthCredentialsAuthenticationHandler.java
index b7b9bc8d..a59e6745 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/authentication/handler/support/OAuthCredentialsAuthenticationHandler.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/authentication/handler/support/OAuthCredentialsAuthenticationHandler.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.authentication.handler.support;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/authentication/principal/OAuthAuthenticationMetaDataPopulator.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/authentication/principal/OAuthAuthenticationMetaDataPopulator.java
index 37db7692..d0cd118d 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/authentication/principal/OAuthAuthenticationMetaDataPopulator.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/authentication/principal/OAuthAuthenticationMetaDataPopulator.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.authentication.principal;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/authentication/principal/OAuthCredential.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/authentication/principal/OAuthCredential.java
index 17b2af88..35a5310b 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/authentication/principal/OAuthCredential.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/authentication/principal/OAuthCredential.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.authentication.principal;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/metadata/ClientMetadata.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/metadata/ClientMetadata.java
index 11f0512d..0964ffa5 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/metadata/ClientMetadata.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/metadata/ClientMetadata.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.metadata;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/metadata/PrincipalMetadata.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/metadata/PrincipalMetadata.java
index f75a2b53..092f14b2 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/metadata/PrincipalMetadata.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/metadata/PrincipalMetadata.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.metadata;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/personal/PersonalAccessToken.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/personal/PersonalAccessToken.java
index 7fdeb238..b62eb749 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/personal/PersonalAccessToken.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/personal/PersonalAccessToken.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.personal;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/personal/PersonalAccessTokenManager.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/personal/PersonalAccessTokenManager.java
index cdddc34e..eba40d62 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/personal/PersonalAccessTokenManager.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/personal/PersonalAccessTokenManager.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.personal;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/personal/handler/SimplePersonalAccessTokenHandler.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/personal/handler/SimplePersonalAccessTokenHandler.java
index 03101d32..31b8985d 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/personal/handler/SimplePersonalAccessTokenHandler.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/personal/handler/SimplePersonalAccessTokenHandler.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.personal.handler;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/personal/handler/support/AbstractPersonalAccessTokenHandler.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/personal/handler/support/AbstractPersonalAccessTokenHandler.java
index d75ab532..dfb64c4d 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/personal/handler/support/AbstractPersonalAccessTokenHandler.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/personal/handler/support/AbstractPersonalAccessTokenHandler.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.personal.handler.support;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/personal/handler/support/PersonalAccessTokenHandler.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/personal/handler/support/PersonalAccessTokenHandler.java
index c4208460..e09ef9cc 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/personal/handler/support/PersonalAccessTokenHandler.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/personal/handler/support/PersonalAccessTokenHandler.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.personal.handler.support;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/scope/InvalidScopeException.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/scope/InvalidScopeException.java
index f6966def..886f0c4b 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/scope/InvalidScopeException.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/scope/InvalidScopeException.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.scope;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/scope/Scope.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/scope/Scope.java
index 71f45994..0348a4a2 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/scope/Scope.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/scope/Scope.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.scope;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/scope/ScopeManager.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/scope/ScopeManager.java
index 4557427f..fd80dce0 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/scope/ScopeManager.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/scope/ScopeManager.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.scope;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/scope/handler/SimpleScopeHandler.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/scope/handler/SimpleScopeHandler.java
index 54093d01..3f19d549 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/scope/handler/SimpleScopeHandler.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/scope/handler/SimpleScopeHandler.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.scope.handler;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/scope/handler/support/AbstractScopeHandler.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/scope/handler/support/AbstractScopeHandler.java
index 64e2a637..ff89c57f 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/scope/handler/support/AbstractScopeHandler.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/scope/handler/support/AbstractScopeHandler.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.scope.handler.support;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/scope/handler/support/ScopeHandler.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/scope/handler/support/ScopeHandler.java
index b148db48..890a26db 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/scope/handler/support/ScopeHandler.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/scope/handler/support/ScopeHandler.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.scope.handler.support;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/services/OAuthRegisteredService.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/services/OAuthRegisteredService.java
index 8fb6ad3c..03a13175 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/services/OAuthRegisteredService.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/services/OAuthRegisteredService.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2015. Center for Open Science
+ *
  * Licensed to Apereo under one or more contributor license
  * agreements. See the NOTICE file distributed with this work
  * for additional information regarding copyright ownership.
@@ -35,7 +37,7 @@
  * @author Misagh Moayyed
  * @author Michael Haselton
  * @author Longze Chen
- * @since 4.1.5
+ * @since 4.0.0
  */
 public final class OAuthRegisteredService extends OSFRegisteredService {
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/ticket/support/OAuthDelegatingExpirationPolicy.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/ticket/support/OAuthDelegatingExpirationPolicy.java
index eaa4bce6..672bade5 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/ticket/support/OAuthDelegatingExpirationPolicy.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/ticket/support/OAuthDelegatingExpirationPolicy.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.ticket.support;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/AbstractToken.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/AbstractToken.java
index 18697150..a81fbac8 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/AbstractToken.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/AbstractToken.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.token;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/AccessToken.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/AccessToken.java
index de0c120b..ea335d99 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/AccessToken.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/AccessToken.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.token;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/AccessTokenImpl.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/AccessTokenImpl.java
index e0f63a42..847f5594 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/AccessTokenImpl.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/AccessTokenImpl.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.token;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/AuthorizationCode.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/AuthorizationCode.java
index efdbbd2b..1cb1408d 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/AuthorizationCode.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/AuthorizationCode.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.token;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/AuthorizationCodeImpl.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/AuthorizationCodeImpl.java
index 53ff4d69..e6767c70 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/AuthorizationCodeImpl.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/AuthorizationCodeImpl.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.token;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/InvalidTokenException.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/InvalidTokenException.java
index 0db6e78a..6aff44f4 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/InvalidTokenException.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/InvalidTokenException.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.token;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/RefreshToken.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/RefreshToken.java
index 78249bad..ebb7f20b 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/RefreshToken.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/RefreshToken.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.token;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/RefreshTokenImpl.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/RefreshTokenImpl.java
index 516c4458..bfd8b7c2 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/RefreshTokenImpl.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/RefreshTokenImpl.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.token;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/Token.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/Token.java
index ade73386..aff03282 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/Token.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/Token.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.token;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/TokenType.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/TokenType.java
index 8a09512f..42653740 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/TokenType.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/TokenType.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.token;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/registry/JpaTokenRegistry.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/registry/JpaTokenRegistry.java
index 06cce555..daeed922 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/registry/JpaTokenRegistry.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/registry/JpaTokenRegistry.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.token.registry;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/registry/TokenRegistry.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/registry/TokenRegistry.java
index e8fc7949..06827ee6 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/registry/TokenRegistry.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/token/registry/TokenRegistry.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.token.registry;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20AuthorizeCallbackActionController.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20AuthorizeCallbackActionController.java
index 0df3a4b4..c72fa896 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20AuthorizeCallbackActionController.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20AuthorizeCallbackActionController.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.web;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20AuthorizeCallbackController.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20AuthorizeCallbackController.java
index 01ab3db7..18c1e44f 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20AuthorizeCallbackController.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20AuthorizeCallbackController.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2015. Center for Open Science
+ *
  * Licensed to Apereo under one or more contributor license
  * agreements. See the NOTICE file distributed with this work
  * for additional information regarding copyright ownership.
@@ -67,7 +69,7 @@
  * @author Jerome Leleu
  * @author Michael Haselton
  * @author Longze Chen
- * @since 4.1.5
+ * @since 3.5.0
  */
 public final class OAuth20AuthorizeCallbackController extends AbstractController {
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20AuthorizeController.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20AuthorizeController.java
index 39b29c7c..371f0ce7 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20AuthorizeController.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20AuthorizeController.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2015. Center for Open Science
+ *
  * Licensed to Apereo under one or more contributor license
  * agreements. See the NOTICE file distributed with this work
  * for additional information regarding copyright ownership.
@@ -48,7 +50,7 @@
  * @author Jerome Leleu
  * @author Michael Haselton
  * @author Longze Chen
- * @since 4.1.5
+ * @since 3.5.0
  */
 public final class OAuth20AuthorizeController extends AbstractController {
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20MetadataClientController.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20MetadataClientController.java
index 2f4e4dd7..884c5c99 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20MetadataClientController.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20MetadataClientController.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.web;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20MetadataPrincipalController.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20MetadataPrincipalController.java
index 7a2f4ef4..3d4d180c 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20MetadataPrincipalController.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20MetadataPrincipalController.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.web;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20ProfileController.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20ProfileController.java
index 427f0770..fe7c40ee 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20ProfileController.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20ProfileController.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2015. Center for Open Science
+ *
  * Licensed to Apereo under one or more contributor license
  * agreements. See the NOTICE file distributed with this work
  * for additional information regarding copyright ownership.
@@ -59,7 +61,7 @@
  * @author Jerome Leleu
  * @author Michael Haselton
  * @author Longze Chen
- * @since 4.1.5
+ * @since 3.5.0
  */
 public final class OAuth20ProfileController extends AbstractController {
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20RevokeClientPrincipalTokensController.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20RevokeClientPrincipalTokensController.java
index c51bac3a..2d1883f0 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20RevokeClientPrincipalTokensController.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20RevokeClientPrincipalTokensController.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.web;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20RevokeClientTokensController.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20RevokeClientTokensController.java
index 374e5337..da4226c9 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20RevokeClientTokensController.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20RevokeClientTokensController.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.web;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20RevokeTokenController.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20RevokeTokenController.java
index 976e6316..fdaaae7e 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20RevokeTokenController.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20RevokeTokenController.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.web;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20ServiceValidateController.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20ServiceValidateController.java
index d2dae7c9..38d46331 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20ServiceValidateController.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20ServiceValidateController.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.web;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20TokenAuthorizationCodeController.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20TokenAuthorizationCodeController.java
index f6ee6485..aebb9b36 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20TokenAuthorizationCodeController.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20TokenAuthorizationCodeController.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.web;
 
@@ -61,7 +58,6 @@
  * {@link CentralOAuthService#grantOfflineAccessToken} with a new service ticket generated from the ticket granting
  * ticket of the OFFLINE refresh token.
  *
- * @author Jerome Leleu
  * @author Michael Haselton
  * @author Longze Chen
  * @since 4.1.5
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20TokenRefreshTokenController.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20TokenRefreshTokenController.java
index b243ec74..61ec5905 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20TokenRefreshTokenController.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20TokenRefreshTokenController.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.web;
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20WrapperController.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20WrapperController.java
index 210b11cb..d8689ffb 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20WrapperController.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20WrapperController.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2015. Center for Open Science
+ *
  * Licensed to Apereo under one or more contributor license
  * agreements. See the NOTICE file distributed with this work
  * for additional information regarding copyright ownership.
@@ -50,7 +52,7 @@
  * @author Jerome Leleu
  * @author Michael Haselton
  * @author Longze Chen
- * @since 4.1.5
+ * @since 3.5.0
  */
 public final class OAuth20WrapperController extends BaseOAuthWrapperController implements InitializingBean {
 
diff --git a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/view/OAuthCas30ResponseView.java b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/view/OAuthCas30ResponseView.java
index c6198f78..d31288eb 100644
--- a/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/view/OAuthCas30ResponseView.java
+++ b/cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/view/OAuthCas30ResponseView.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jasig.cas.support.oauth.web.view;
 
diff --git a/cas-server-support-osf/pom.xml b/cas-server-support-osf/pom.xml
index f9f164a5..4ab51176 100755
--- a/cas-server-support-osf/pom.xml
+++ b/cas-server-support-osf/pom.xml
@@ -1,4 +1,6 @@
 <!--
+  ~ Copyright (c) 2015. Center for Open Science
+  ~
   ~ Licensed to Apereo under one or more contributor license
   ~ agreements. See the NOTICE file distributed with this work
   ~ for additional information regarding copyright ownership.
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/daos/OpenScienceFrameworkDao.java b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/daos/OpenScienceFrameworkDao.java
index 1c987c68..71f147db 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/daos/OpenScienceFrameworkDao.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/daos/OpenScienceFrameworkDao.java
@@ -1,22 +1,18 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2016. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package io.cos.cas.adaptors.postgres.daos;
 
 import io.cos.cas.adaptors.postgres.models.OpenScienceFrameworkApiOauth2Application;
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/daos/OpenScienceFrameworkDaoImpl.java b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/daos/OpenScienceFrameworkDaoImpl.java
index b3e6b588..6437a13d 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/daos/OpenScienceFrameworkDaoImpl.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/daos/OpenScienceFrameworkDaoImpl.java
@@ -1,22 +1,18 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2016. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package io.cos.cas.adaptors.postgres.daos;
 
 import io.cos.cas.adaptors.postgres.models.OpenScienceFrameworkApiOauth2Application;
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/handlers/OpenScienceFrameworkAuthenticationHandler.java b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/handlers/OpenScienceFrameworkAuthenticationHandler.java
index ca51f8f2..f2b7469f 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/handlers/OpenScienceFrameworkAuthenticationHandler.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/handlers/OpenScienceFrameworkAuthenticationHandler.java
@@ -1,22 +1,18 @@
 /*
- * Licensed to Jasig under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Jasig licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2016. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package io.cos.cas.adaptors.postgres.handlers;
 
 import java.nio.charset.StandardCharsets;
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/handlers/OpenScienceFrameworkInstitutionHandler.java b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/handlers/OpenScienceFrameworkInstitutionHandler.java
index 7872f330..1f4bfed1 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/handlers/OpenScienceFrameworkInstitutionHandler.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/handlers/OpenScienceFrameworkInstitutionHandler.java
@@ -1,22 +1,18 @@
 /*
- * Licensed to Jasig under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Jasig licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2016. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package io.cos.cas.adaptors.postgres.handlers;
 
 import io.cos.cas.adaptors.postgres.daos.OpenScienceFrameworkDaoImpl;
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/handlers/OpenScienceFrameworkPersonalAccessTokenHandler.java b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/handlers/OpenScienceFrameworkPersonalAccessTokenHandler.java
index 242decde..2a98cdf7 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/handlers/OpenScienceFrameworkPersonalAccessTokenHandler.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/handlers/OpenScienceFrameworkPersonalAccessTokenHandler.java
@@ -1,22 +1,18 @@
 /*
- * Licensed to Jasig under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Jasig licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2016. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package io.cos.cas.adaptors.postgres.handlers;
 
 import io.cos.cas.adaptors.postgres.daos.OpenScienceFrameworkDaoImpl;
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/handlers/OpenScienceFrameworkScopeHandler.java b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/handlers/OpenScienceFrameworkScopeHandler.java
index 4eebc6f6..51be7e5b 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/handlers/OpenScienceFrameworkScopeHandler.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/handlers/OpenScienceFrameworkScopeHandler.java
@@ -1,22 +1,18 @@
 /*
- * Licensed to Jasig under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Jasig licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2016. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package io.cos.cas.adaptors.postgres.handlers;
 
 import io.cos.cas.adaptors.postgres.daos.OpenScienceFrameworkDaoImpl;
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkApiOauth2Application.java b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkApiOauth2Application.java
index 9f7e03cd..06ff673f 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkApiOauth2Application.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkApiOauth2Application.java
@@ -1,22 +1,18 @@
 /*
- * Licensed to Jasig under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Jasig licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2016. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package io.cos.cas.adaptors.postgres.models;
 
 import javax.persistence.Column;
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkApiOauth2PersonalAccessToken.java b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkApiOauth2PersonalAccessToken.java
index b47c7c8e..e1cc1275 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkApiOauth2PersonalAccessToken.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkApiOauth2PersonalAccessToken.java
@@ -1,22 +1,18 @@
 /*
- * Licensed to Jasig under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Jasig licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2016. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package io.cos.cas.adaptors.postgres.models;
 
 import javax.persistence.Column;
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkApiOauth2Scope.java b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkApiOauth2Scope.java
index 8360c0af..b77695cb 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkApiOauth2Scope.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkApiOauth2Scope.java
@@ -1,22 +1,18 @@
 /*
- * Licensed to Jasig under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Jasig licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2016. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package io.cos.cas.adaptors.postgres.models;
 
 import javax.persistence.Column;
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkApiOauth2TokenScope.java b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkApiOauth2TokenScope.java
index 467a666c..c1526363 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkApiOauth2TokenScope.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkApiOauth2TokenScope.java
@@ -1,22 +1,18 @@
 /*
- * Licensed to Jasig under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Jasig licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2018. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package io.cos.cas.adaptors.postgres.models;
 
 import javax.persistence.Column;
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkDjangoContentTypeId.java b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkDjangoContentTypeId.java
index be57e7b0..d73e4952 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkDjangoContentTypeId.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkDjangoContentTypeId.java
@@ -1,22 +1,18 @@
 /*
- * Licensed to Jasig under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Jasig licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2016. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package io.cos.cas.adaptors.postgres.models;
 
 import javax.persistence.Column;
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkEmail.java b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkEmail.java
index 0a1c265a..f6ca45fd 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkEmail.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkEmail.java
@@ -1,22 +1,18 @@
 /*
- * Licensed to Jasig under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Jasig licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2017. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package io.cos.cas.adaptors.postgres.models;
 
 import javax.persistence.Column;
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkGuid.java b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkGuid.java
index c80554de..9a107b01 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkGuid.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkGuid.java
@@ -1,22 +1,18 @@
 /*
- * Licensed to Jasig under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Jasig licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2016. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package io.cos.cas.adaptors.postgres.models;
 
 import javax.persistence.Column;
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkInstitution.java b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkInstitution.java
index f7e00c26..8b424864 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkInstitution.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkInstitution.java
@@ -1,22 +1,18 @@
 /*
- * Licensed to Jasig under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Jasig licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2016. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package io.cos.cas.adaptors.postgres.models;
 
 import io.cos.cas.adaptors.postgres.types.DelegationProtocol;
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkTimeBasedOneTimePassword.java b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkTimeBasedOneTimePassword.java
index d9c3aa9d..6e529e6f 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkTimeBasedOneTimePassword.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkTimeBasedOneTimePassword.java
@@ -1,22 +1,18 @@
 /*
- * Licensed to Jasig under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Jasig licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2016. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package io.cos.cas.adaptors.postgres.models;
 
 import org.apache.commons.codec.binary.Base32;
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkUser.java b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkUser.java
index c2824dd1..faceb683 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkUser.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/models/OpenScienceFrameworkUser.java
@@ -1,22 +1,18 @@
 /*
- * Licensed to Jasig under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Jasig licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2016. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package io.cos.cas.adaptors.postgres.models;
 
 import javax.persistence.Column;
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/types/DelegationProtocol.java b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/types/DelegationProtocol.java
index 91af5a9d..97a8db37 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/types/DelegationProtocol.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/types/DelegationProtocol.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2017. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package io.cos.cas.adaptors.postgres.types;
 
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/types/StringListUserType.java b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/types/StringListUserType.java
index 91d8ae7c..53aa7472 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/types/StringListUserType.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/adaptors/postgres/types/StringListUserType.java
@@ -1,22 +1,18 @@
 /*
- * Licensed to Jasig under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Jasig licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2016. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package io.cos.cas.adaptors.postgres.types;
 
 import org.hibernate.HibernateException;
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/authentication/InvalidVerificationKeyException.java b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/InvalidVerificationKeyException.java
index 03782e50..a1bb7a67 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/authentication/InvalidVerificationKeyException.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/InvalidVerificationKeyException.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2018. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package io.cos.cas.authentication;
 
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/authentication/LoginNotAllowedException.java b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/LoginNotAllowedException.java
index d48480c1..2add2e69 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/authentication/LoginNotAllowedException.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/LoginNotAllowedException.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package io.cos.cas.authentication;
 
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/authentication/OneTimePasswordFailedLoginException.java b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/OneTimePasswordFailedLoginException.java
index 13f9405d..1f492ae7 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/authentication/OneTimePasswordFailedLoginException.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/OneTimePasswordFailedLoginException.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package io.cos.cas.authentication;
 
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/authentication/OneTimePasswordRequiredException.java b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/OneTimePasswordRequiredException.java
index 621cf464..1d72d4e4 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/authentication/OneTimePasswordRequiredException.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/OneTimePasswordRequiredException.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package io.cos.cas.authentication;
 
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/authentication/OpenScienceFrameworkCredential.java b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/OpenScienceFrameworkCredential.java
index 0b0fa4c6..9e1fcb01 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/authentication/OpenScienceFrameworkCredential.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/OpenScienceFrameworkCredential.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package io.cos.cas.authentication;
 
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/authentication/RemoteUserFailedLoginException.java b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/RemoteUserFailedLoginException.java
index 2bd6cee8..333ed340 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/authentication/RemoteUserFailedLoginException.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/RemoteUserFailedLoginException.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2016. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package io.cos.cas.authentication;
 
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/authentication/ShouldNotHappenException.java b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/ShouldNotHappenException.java
index adf979c7..1aae9e46 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/authentication/ShouldNotHappenException.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/ShouldNotHappenException.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2016. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package io.cos.cas.authentication;
 
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/authentication/exceptions/CasClientLoginException.java b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/exceptions/CasClientLoginException.java
new file mode 100644
index 00000000..7dda9ae8
--- /dev/null
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/exceptions/CasClientLoginException.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2019. Center for Open Science
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cos.cas.authentication.exceptions;
+
+/**
+ * The CAS Client Login Exception.
+ *
+ * This is the special login exception class for authentication failures during delegated client login via
+ * {@link org.jasig.cas.support.pac4j.web.flow.ClientAction} and {@link org.pac4j.cas.client.CasClient}.
+ *
+ * @author Longze Chen
+ * @since 4.1.5
+ */
+public class CasClientLoginException extends DelegatedLoginException {
+
+    /** Unique id for serialization. */
+    private static final long serialVersionUID = -7180107167551919266L;
+
+    /**
+     * Instantiate a new {@link CasClientLoginException} with no detail message.
+     */
+    public CasClientLoginException() {
+        super();
+    }
+
+    /**
+     * Instantiate a new {@link CasClientLoginException} with the specified detail message.
+     *
+     * @param msg the detail message
+     */
+    public CasClientLoginException(final String msg) {
+        super(msg);
+    }
+}
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/authentication/exceptions/DelegatedLoginException.java b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/exceptions/DelegatedLoginException.java
new file mode 100644
index 00000000..ce2238be
--- /dev/null
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/exceptions/DelegatedLoginException.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2019. Center for Open Science
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cos.cas.authentication.exceptions;
+
+import javax.security.auth.login.FailedLoginException;
+
+/**
+ * The Delegated Login Exception.
+ *
+ * This is a generic login exception for authentication via delegated client.
+ *
+ * @author Longze Chen
+ * @since 4.1.5
+ */
+public class DelegatedLoginException extends FailedLoginException {
+
+    /** Unique id for serialization. */
+    private static final long serialVersionUID = 2120800337731452548L;
+
+    /**
+     * Instantiate a new {@link DelegatedLoginException} with no detail message.
+     */
+    public DelegatedLoginException() {
+        super();
+    }
+
+    /**
+     * Instantiate a new {@link DelegatedLoginException} with the specified detail message.
+     *
+     * @param msg the detail message
+     */
+    public DelegatedLoginException(final String msg) {
+        super(msg);
+    }
+}
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/authentication/exceptions/OrcidClientLoginException.java b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/exceptions/OrcidClientLoginException.java
new file mode 100644
index 00000000..73ca6e15
--- /dev/null
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/exceptions/OrcidClientLoginException.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2019. Center for Open Science
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cos.cas.authentication.exceptions;
+
+/**
+ * The ORCiD Client Login Exception.
+ *
+ * This is the special login exception class for authentication failures during delegated client login via
+ * {@link org.jasig.cas.support.pac4j.web.flow.ClientAction} and {@link org.pac4j.oauth.client.OrcidClient}.
+ *
+ * @author Longze Chen
+ * @since 4.1.5
+ */
+public class OrcidClientLoginException extends DelegatedLoginException {
+
+    /** Unique id for serialization. */
+    private static final long serialVersionUID = 2120800337731452548L;
+
+    /**
+     * Instantiate a new {@link OrcidClientLoginException} with no detail message.
+     */
+    public OrcidClientLoginException() {
+        super();
+    }
+
+    /**
+     * Instantiate a new {@link OrcidClientLoginException} with the specified detail message.
+     *
+     * @param msg the detail message
+     */
+    public OrcidClientLoginException(final String msg) {
+        super(msg);
+    }
+}
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/authentication/handler/support/OpenScienceFrameworkPrincipalFromRequestRemoteUserNonInteractiveCredentialsAction.java b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/handler/support/OpenScienceFrameworkPrincipalFromRequestRemoteUserNonInteractiveCredentialsAction.java
index 21c8dded..3613eb37 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/authentication/handler/support/OpenScienceFrameworkPrincipalFromRequestRemoteUserNonInteractiveCredentialsAction.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/handler/support/OpenScienceFrameworkPrincipalFromRequestRemoteUserNonInteractiveCredentialsAction.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package io.cos.cas.authentication.handler.support;
 
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/authentication/oath/Totp.java b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/oath/Totp.java
index 4059da28..8db02a46 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/authentication/oath/Totp.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/oath/Totp.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2015. Center for Open Science
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package io.cos.cas.authentication.oath;
 
 import javax.crypto.Mac;
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/authentication/oath/TotpUtils.java b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/oath/TotpUtils.java
index 75061ebc..3c4ab2cb 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/authentication/oath/TotpUtils.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/oath/TotpUtils.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2015. Center for Open Science
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package io.cos.cas.authentication.oath;
 
 import org.apache.commons.codec.binary.Base32;
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/authentication/principal/OpenScienceFrameworkAuthenticationMetaDataPopulator.java b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/principal/OpenScienceFrameworkAuthenticationMetaDataPopulator.java
index c60782ea..ed58a335 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/authentication/principal/OpenScienceFrameworkAuthenticationMetaDataPopulator.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/authentication/principal/OpenScienceFrameworkAuthenticationMetaDataPopulator.java
@@ -1,22 +1,18 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2016. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package io.cos.cas.authentication.principal;
 
 import io.cos.cas.authentication.OpenScienceFrameworkCredential;
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/services/MergingServiceRegistryDao.java b/cas-server-support-osf/src/main/java/io/cos/cas/services/MergingServiceRegistryDao.java
index 4b8f2db3..15ad97e3 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/services/MergingServiceRegistryDao.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/services/MergingServiceRegistryDao.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package io.cos.cas.services;
 
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/services/OpenScienceFrameworkServiceRegistryDao.java b/cas-server-support-osf/src/main/java/io/cos/cas/services/OpenScienceFrameworkServiceRegistryDao.java
index bc76292c..f2b2e874 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/services/OpenScienceFrameworkServiceRegistryDao.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/services/OpenScienceFrameworkServiceRegistryDao.java
@@ -1,22 +1,18 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package io.cos.cas.services;
 
 import io.cos.cas.adaptors.postgres.daos.OpenScienceFrameworkDaoImpl;
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/web/flow/OpenScienceFrameworkAuthenticationExceptionHandler.java b/cas-server-support-osf/src/main/java/io/cos/cas/web/flow/OpenScienceFrameworkAuthenticationExceptionHandler.java
index edbdbc95..6111cd62 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/web/flow/OpenScienceFrameworkAuthenticationExceptionHandler.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/web/flow/OpenScienceFrameworkAuthenticationExceptionHandler.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package io.cos.cas.web.flow;
 
@@ -23,6 +20,9 @@
 import java.util.List;
 import java.util.Set;
 
+import io.cos.cas.authentication.exceptions.CasClientLoginException;
+import io.cos.cas.authentication.exceptions.DelegatedLoginException;
+import io.cos.cas.authentication.exceptions.OrcidClientLoginException;
 import io.cos.cas.authentication.InvalidVerificationKeyException;
 import io.cos.cas.authentication.LoginNotAllowedException;
 import io.cos.cas.authentication.OneTimePasswordFailedLoginException;
@@ -87,6 +87,13 @@ public class OpenScienceFrameworkAuthenticationExceptionHandler extends Authenti
         DEFAULT_ERROR_LIST.add(OneTimePasswordRequiredException.class);
     }
 
+    // Customized exceptions for delegated login
+    static {
+        DEFAULT_ERROR_LIST.add(DelegatedLoginException.class);
+        DEFAULT_ERROR_LIST.add(OrcidClientLoginException.class);
+        DEFAULT_ERROR_LIST.add(CasClientLoginException.class);
+    }
+
     // Exceptions that should count against the login rate limiting
     static {
         THROTTLE_INCREASE_SET.add(FailedLoginException.class.getSimpleName());                // Wrong password
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/web/flow/OpenScienceFrameworkInstitutionLoginHandler.java b/cas-server-support-osf/src/main/java/io/cos/cas/web/flow/OpenScienceFrameworkInstitutionLoginHandler.java
index 1a1790c6..1366c0e7 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/web/flow/OpenScienceFrameworkInstitutionLoginHandler.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/web/flow/OpenScienceFrameworkInstitutionLoginHandler.java
@@ -1,22 +1,18 @@
 /*
- * Licensed to Jasig under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Jasig licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2016. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package io.cos.cas.web.flow;
 
 import io.cos.cas.adaptors.postgres.handlers.OpenScienceFrameworkInstitutionHandler;
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/web/flow/OpenScienceFrameworkLoginHandler.java b/cas-server-support-osf/src/main/java/io/cos/cas/web/flow/OpenScienceFrameworkLoginHandler.java
index ad3cc928..154d8566 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/web/flow/OpenScienceFrameworkLoginHandler.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/web/flow/OpenScienceFrameworkLoginHandler.java
@@ -1,22 +1,18 @@
 /*
- * Licensed to Jasig under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Jasig licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2016. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package io.cos.cas.web.flow;
 
 import com.google.gson.Gson;
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/web/flow/OpenScienceFrameworkTerminateSessionAction.java b/cas-server-support-osf/src/main/java/io/cos/cas/web/flow/OpenScienceFrameworkTerminateSessionAction.java
index 27be21cd..40d5fbe5 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/web/flow/OpenScienceFrameworkTerminateSessionAction.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/web/flow/OpenScienceFrameworkTerminateSessionAction.java
@@ -1,22 +1,18 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2016. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package io.cos.cas.web.flow;
 
 import io.cos.cas.adaptors.postgres.handlers.OpenScienceFrameworkInstitutionHandler;
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/web/flow/OpenScienceFrameworkTicketGrantingTicketCheckAction.java b/cas-server-support-osf/src/main/java/io/cos/cas/web/flow/OpenScienceFrameworkTicketGrantingTicketCheckAction.java
index 272658da..b6bfd144 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/web/flow/OpenScienceFrameworkTicketGrantingTicketCheckAction.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/web/flow/OpenScienceFrameworkTicketGrantingTicketCheckAction.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2015. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package io.cos.cas.web.flow;
 
diff --git a/cas-server-support-osf/src/main/java/io/cos/cas/web/support/OpenScienceFrameworkCookieRetrievingCookieGenerator.java b/cas-server-support-osf/src/main/java/io/cos/cas/web/support/OpenScienceFrameworkCookieRetrievingCookieGenerator.java
index 6f57a313..5e6f00a0 100644
--- a/cas-server-support-osf/src/main/java/io/cos/cas/web/support/OpenScienceFrameworkCookieRetrievingCookieGenerator.java
+++ b/cas-server-support-osf/src/main/java/io/cos/cas/web/support/OpenScienceFrameworkCookieRetrievingCookieGenerator.java
@@ -1,20 +1,17 @@
 /*
- * Licensed to Apereo under one or more contributor license
- * agreements. See the NOTICE file distributed with this work
- * for additional information regarding copyright ownership.
- * Apereo licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License.  You may obtain a
- * copy of the License at the following location:
+ * Copyright (c) 2016. Center for Open Science
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package io.cos.cas.web.support;
 
diff --git a/cas-server-support-osf/src/main/java/org/jasig/cas/support/pac4j/authentication/handler/support/AbstractClientAuthenticationHandler.java b/cas-server-support-osf/src/main/java/org/jasig/cas/support/pac4j/authentication/handler/support/AbstractClientAuthenticationHandler.java
new file mode 100644
index 00000000..6e1c4510
--- /dev/null
+++ b/cas-server-support-osf/src/main/java/org/jasig/cas/support/pac4j/authentication/handler/support/AbstractClientAuthenticationHandler.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2019. Center for Open Science
+ *
+ * Licensed to Apereo under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work
+ * for additional information regarding copyright ownership.
+ * Apereo licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License.  You may obtain a
+ * copy of the License at the following location:
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jasig.cas.support.pac4j.authentication.handler.support;
+
+import io.cos.cas.authentication.exceptions.DelegatedLoginException;
+
+import org.jasig.cas.authentication.Credential;
+import org.jasig.cas.authentication.HandlerResult;
+import org.jasig.cas.authentication.handler.support.AbstractPreAndPostProcessingAuthenticationHandler;
+import org.jasig.cas.authentication.principal.DefaultPrincipalFactory;
+import org.jasig.cas.authentication.principal.PrincipalFactory;
+import org.jasig.cas.support.pac4j.authentication.principal.ClientCredential;
+
+import org.pac4j.core.client.Client;
+import org.pac4j.core.client.Clients;
+import org.pac4j.core.context.J2EContext;
+import org.pac4j.core.context.WebContext;
+import org.pac4j.core.credentials.Credentials;
+import org.pac4j.core.exception.TechnicalException;
+import org.pac4j.core.profile.UserProfile;
+
+import org.springframework.webflow.context.ExternalContextHolder;
+import org.springframework.webflow.context.servlet.ServletExternalContext;
+
+import java.security.GeneralSecurityException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotNull;
+
+/**
+ * The Abstract Client Authentication Handler.
+ *
+ * This class is a generic handler for authentication delegated to an auth client, implementing the authentication
+ * method {@link AbstractPreAndPostProcessingAuthenticationHandler#doAuthentication(Credential)}. It uses the auth
+ * client and provides it with the client credentials in order to get the user profile returned by the provider for
+ * an authenticated user.
+ *
+ * @author Jerome Leleu
+ * @author Longze Chen
+ * @since 4.1.0
+ */
+@SuppressWarnings("unchecked")
+public abstract class AbstractClientAuthenticationHandler extends AbstractPreAndPostProcessingAuthenticationHandler {
+
+    /** The factory to create the principal type. **/
+    @NotNull
+    protected PrincipalFactory principalFactory = new DefaultPrincipalFactory();
+
+    /** The clients for authentication. */
+    @NotNull
+    private final Clients clients;
+
+    /**
+     * Instantiate a new {@link AbstractClientAuthenticationHandler} and define the clients.
+     *
+     * @param theClients the clients for authentication
+     */
+    public AbstractClientAuthenticationHandler(final Clients theClients) {
+        this.clients = theClients;
+    }
+
+    /**
+     * {@inheritDoc}
+     **/
+    @Override
+    public final boolean supports(final Credential credential) {
+        return credential != null && ClientCredential.class.isAssignableFrom(credential.getClass());
+    }
+
+    /**
+     * {@inheritDoc}
+     **/
+    @Override
+    protected HandlerResult doAuthentication(final Credential credential) throws GeneralSecurityException {
+
+        // Construct a specific client credential from a general credential
+        final ClientCredential clientCredentials = (ClientCredential) credential;
+        logger.debug("clientCredentials : {}", clientCredentials);
+
+        // Retrieve the client name found in the client credential
+        final Credentials credentials = clientCredentials.getCredentials();
+        final String clientName = credentials.getClientName();
+        logger.debug("clientName : {}", clientName);
+
+        // Attempt to load the client from defined clients
+        final Client<Credentials, UserProfile> client;
+        try {
+            client = this.clients.findClient(clientName);
+            logger.debug("client : {}", client);
+        } catch (final TechnicalException e) {
+            logger.error("Invalid client: {}", clientName);
+            throw new DelegatedLoginException("Invalid client: " + clientName);
+        }
+
+        // Create the web context
+        final ServletExternalContext servletExternalContext
+                = (ServletExternalContext) ExternalContextHolder.getExternalContext();
+        final HttpServletRequest request = (HttpServletRequest) servletExternalContext.getNativeRequest();
+        final HttpServletResponse response = (HttpServletResponse) servletExternalContext.getNativeResponse();
+        final WebContext webContext = new J2EContext(request, response);
+
+        // Attempt to retrieve the user profile
+        final UserProfile userProfile;
+        try {
+            userProfile = client.getUserProfile(credentials, webContext);
+            logger.debug("userProfile : {}", userProfile);
+        } catch (final TechnicalException e) {
+            logger.error("Failed to retrieve user profile: client = {}, error = {}", clientName, e.getMessage());
+            throw new DelegatedLoginException(e.getMessage());
+        }
+
+        // If successful, create and return a handler result; otherwise, throw a delegated login exception.
+        if (userProfile != null) {
+            return createResult(clientCredentials, userProfile);
+        }
+        logger.error("Provider did not produce a user profile: client = {}", clientName);
+        throw new DelegatedLoginException("Provider did not produce a user profile for: " + clientCredentials);
+    }
+
+    /**
+     * Build the handler result.
+     *
+     * @param credentials the provided credentials
+     * @param profile the retrieved user profile
+     * @return the built handler result
+     * @throws GeneralSecurityException on authentication failure
+     */
+    protected abstract HandlerResult createResult(
+            final ClientCredential credentials,
+            final UserProfile profile
+    ) throws GeneralSecurityException;
+
+    /**
+     * Set the principal factory.
+     *
+     * @param principalFactory the principal factory
+     */
+    public void setPrincipalFactory(final PrincipalFactory principalFactory) {
+        this.principalFactory = principalFactory;
+    }
+}
diff --git a/cas-server-support-osf/src/main/java/org/jasig/cas/support/pac4j/authentication/handler/support/ClientAuthenticationHandler.java b/cas-server-support-osf/src/main/java/org/jasig/cas/support/pac4j/authentication/handler/support/ClientAuthenticationHandler.java
new file mode 100644
index 00000000..0acea055
--- /dev/null
+++ b/cas-server-support-osf/src/main/java/org/jasig/cas/support/pac4j/authentication/handler/support/ClientAuthenticationHandler.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2019. Center for Open Science
+ *
+ * Licensed to Apereo under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work
+ * for additional information regarding copyright ownership.
+ * Apereo licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License.  You may obtain a
+ * copy of the License at the following location:
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jasig.cas.support.pac4j.authentication.handler.support;
+
+import io.cos.cas.authentication.exceptions.DelegatedLoginException;
+
+import org.apache.commons.lang3.StringUtils;
+
+import org.jasig.cas.authentication.BasicCredentialMetaData;
+import org.jasig.cas.authentication.DefaultHandlerResult;
+import org.jasig.cas.authentication.HandlerResult;
+import org.jasig.cas.support.pac4j.authentication.principal.ClientCredential;
+
+import org.pac4j.core.client.Clients;
+import org.pac4j.core.profile.UserProfile;
+
+import java.security.GeneralSecurityException;
+
+/**
+ * The Client Authentication Handler.
+ *
+ * This class is a specialized handler which builds the authenticated user directly from the retrieved user profile.
+ *
+ * @author Jerome Leleu
+ * @author Longze Chen
+ * @since 3.5.0
+ */
+public class ClientAuthenticationHandler extends AbstractClientAuthenticationHandler {
+
+    /** Whether to use the typed identifier (default) or just the identifier. */
+    private boolean typedIdUsed = true;
+
+    /**
+     * Instantiate a new {@link ClientAuthenticationHandler} and define the clients.
+     *
+     * @param theClients the clients for authentication
+     */
+    public ClientAuthenticationHandler(final Clients theClients) {
+        super(theClients);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected HandlerResult createResult(
+            final ClientCredential credentials,
+            final UserProfile profile
+    ) throws GeneralSecurityException {
+
+        final String id = typedIdUsed ? profile.getTypedId() : profile.getId();
+        if (StringUtils.isNotBlank(id)) {
+            try {
+                credentials.setUserProfile(profile);
+                credentials.setTypedIdUsed(typedIdUsed);
+                return new DefaultHandlerResult(
+                        this,
+                        new BasicCredentialMetaData(credentials),
+                        this.principalFactory.createPrincipal(id, profile.getAttributes()));
+            } catch (final Exception e) {
+                logger.error("Failed to create handler result for profile: id = {}, error = {}", id, e.getMessage());
+                throw new DelegatedLoginException(e.getMessage());
+            }
+        }
+        logger.error("No identifier found for user profile");
+        throw new DelegatedLoginException("No identifier found for this user profile: " + profile);
+    }
+
+    public boolean isTypedIdUsed() {
+        return typedIdUsed;
+    }
+
+    public void setTypedIdUsed(final boolean typedIdUsed) {
+        this.typedIdUsed = typedIdUsed;
+    }
+}
diff --git a/cas-server-support-osf/src/main/java/org/jasig/cas/support/pac4j/web/flow/ClientAction.java b/cas-server-support-osf/src/main/java/org/jasig/cas/support/pac4j/web/flow/ClientAction.java
new file mode 100644
index 00000000..885b33b2
--- /dev/null
+++ b/cas-server-support-osf/src/main/java/org/jasig/cas/support/pac4j/web/flow/ClientAction.java
@@ -0,0 +1,328 @@
+/*
+ * Copyright (c) 2019. Center for Open Science
+ *
+ * Licensed to Apereo under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work
+ * for additional information regarding copyright ownership.
+ * Apereo licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License.  You may obtain a
+ * copy of the License at the following location:
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jasig.cas.support.pac4j.web.flow;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+
+import com.google.common.collect.ImmutableSet;
+
+import io.cos.cas.authentication.exceptions.CasClientLoginException;
+import io.cos.cas.authentication.exceptions.DelegatedLoginException;
+import io.cos.cas.authentication.exceptions.OrcidClientLoginException;
+
+import org.apache.commons.lang3.StringUtils;
+
+import org.jasig.cas.authentication.AuthenticationException;
+import org.jasig.cas.authentication.principal.Service;
+import org.jasig.cas.authentication.principal.WebApplicationService;
+import org.jasig.cas.CentralAuthenticationService;
+import org.jasig.cas.support.pac4j.authentication.principal.ClientCredential;
+import org.jasig.cas.ticket.TicketGrantingTicket;
+import org.jasig.cas.web.support.WebUtils;
+
+import org.pac4j.cas.client.CasClient;
+import org.pac4j.core.client.BaseClient;
+import org.pac4j.core.client.Client;
+import org.pac4j.core.client.Clients;
+import org.pac4j.core.client.Mechanism;
+import org.pac4j.core.context.J2EContext;
+import org.pac4j.core.context.WebContext;
+import org.pac4j.core.credentials.Credentials;
+import org.pac4j.core.exception.CredentialsException;
+import org.pac4j.core.exception.RequiresHttpAction;
+import org.pac4j.core.exception.TechnicalException;
+import org.pac4j.core.profile.CommonProfile;
+import org.pac4j.core.profile.ProfileHelper;
+import org.pac4j.oauth.client.OrcidClient;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.webflow.action.AbstractAction;
+import org.springframework.webflow.context.ExternalContext;
+import org.springframework.webflow.context.ExternalContextHolder;
+import org.springframework.webflow.core.collection.LocalAttributeMap;
+import org.springframework.webflow.execution.Event;
+import org.springframework.webflow.execution.RequestContext;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import javax.validation.constraints.NotNull;
+
+/**
+ * The Client Action.
+ *
+ * This class takes care of the role of CAS who serves as an client of a given auth protocol.
+ *
+ * This class represents an action to put at the beginning of the web flow. Before any authentication, redirection
+ * urls are computed for the different clients defined as well as the theme, locale, method and service are saved
+ * into the web session. After authentication, appropriate information are expected on this callback url to finish
+ * the authentication process with the provider.
+ *
+ * @author Jerome Leleu
+ * @author Longze Chen
+ * @since 3.5.0
+ */
+@SuppressWarnings({ "unchecked", "rawtypes" })
+public final class ClientAction extends AbstractAction {
+
+    /** Constant for the service parameter. */
+    public static final String SERVICE = "service";
+
+    /** Constant for the theme parameter. */
+    public static final String THEME = "theme";
+
+    /** Constant for the locale parameter. */
+    public static final String LOCALE = "locale";
+
+    /** Constant for the method parameter. */
+    public static final String METHOD = "method";
+
+    /** Constant for the name of failed auth event. */
+    private static final String AUTHENTICATION_FAILURE = "authenticationFailure";
+
+    /** Supported protocols. */
+    private static final Set<Mechanism> SUPPORTED_PROTOCOLS = ImmutableSet.of(
+            Mechanism.CAS_PROTOCOL,
+            Mechanism.OAUTH_PROTOCOL,
+            Mechanism.OPENID_PROTOCOL,
+            Mechanism.SAML_PROTOCOL,
+            Mechanism.OPENID_CONNECT_PROTOCOL
+    );
+
+    /** The logger. */
+    private final Logger logger = LoggerFactory.getLogger(ClientAction.class);
+
+    /** The clients used for authentication. */
+    @NotNull
+    private final Clients clients;
+
+    /** The service for CAS authentication. */
+    @NotNull
+    private final CentralAuthenticationService centralAuthenticationService;
+
+    /**
+     * Instantiate a new {@link ClientAction}.
+     *
+     * @param theCentralAuthenticationService the service for CAS authentication
+     * @param theClients the clients for authentication
+     */
+    public ClientAction(
+            final CentralAuthenticationService theCentralAuthenticationService,
+            final Clients theClients
+    ) {
+        this.centralAuthenticationService = theCentralAuthenticationService;
+        this.clients = theClients;
+        ProfileHelper.setKeepRawData(true);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected Event doExecute(final RequestContext context) throws Exception {
+
+        final HttpServletRequest request = WebUtils.getHttpServletRequest(context);
+        final HttpServletResponse response = WebUtils.getHttpServletResponse(context);
+        final HttpSession session = request.getSession();
+
+        // Create a new web context
+        final WebContext webContext = new J2EContext(request, response);
+
+        // Get the client name
+        final String clientName = request.getParameter(this.clients.getClientNameParameter());
+        logger.debug("clientName: {}", clientName);
+
+        // In order for the main CAS login web flow to handle exceptions from pac4j's delegated login, we must apply
+        // a try-n-catch block to the rest of the code. TODO: wrap the code inside the block with a method.
+        try {
+
+            // If `client_name` is not in the request params, this is not an authentication. Prepare the login context
+            // with clients info and go to the original start point of the CAS login web flow.
+            if (StringUtils.isBlank(clientName)) {
+                prepareForLoginPage(context);
+                return error();
+            }
+
+            // If `client_name` found in the request parameter, this is an authentication. Verify the client and the
+            // protocol; retrieve credentials and session parameters; and attempt to authenticate.
+            // 1. Retrieve the client
+            final BaseClient<Credentials, CommonProfile> client;
+            try {
+                client = (BaseClient<Credentials, CommonProfile>) this.clients.findClient(clientName);
+                logger.debug("client: {}", client);
+            } catch (final TechnicalException e) {
+                logger.error("Invalid client: {}", clientName);
+                throw new DelegatedLoginException("Invalid client: " + clientName);
+            }
+            // 2. Check supported protocols
+            final Mechanism mechanism = client.getMechanism();
+            if (!SUPPORTED_PROTOCOLS.contains(mechanism)) {
+                logger.error("Invalid mechanism: client = {}", clientName);
+                throw new TechnicalException("Only CAS, OAuth, OpenID and SAML protocols are supported: " + client);
+            }
+            // 3. Retrieve credentials
+            final Credentials credentials;
+            try {
+                credentials = client.getCredentials(webContext);
+                logger.debug("credentials: {}", credentials);
+            } catch (final RequiresHttpAction e) {
+                // Requires HTTP action: client redirection
+                logger.debug("requires http action: {}", e.toString());
+                response.flushBuffer();
+                final ExternalContext externalContext = ExternalContextHolder.getExternalContext();
+                externalContext.recordResponseComplete();
+                return new Event(this, "stop");
+            } catch (final CredentialsException e) {
+                logger.error("Failed to retrieve the credentials: client = {}", clientName);
+                throw createClientSpecificDelegatedLoginException(client.getClass().getSimpleName(), e);
+            }
+            // 4. Retrieve saved parameters from the web session
+            final Service service = (Service) session.getAttribute(SERVICE);
+            context.getFlowScope().put(SERVICE, service);
+            logger.debug("retrieve service: {}", service);
+            if (service != null) {
+                request.setAttribute(SERVICE, service.getId());
+            }
+            restoreRequestAttribute(request, session, THEME);
+            restoreRequestAttribute(request, session, LOCALE);
+            restoreRequestAttribute(request, session, METHOD);
+
+            if (credentials != null) {
+                // 5. Attempt to authenticate if the credential is not null.
+                try {
+                    final TicketGrantingTicket tgt = this.centralAuthenticationService
+                            .createTicketGrantingTicket(new ClientCredential(credentials));
+                    WebUtils.putTicketGrantingTicketInScopes(context, tgt);
+                    return success();
+                } catch (final Exception e) {
+                    logger.error("Failed to authenticate the credentials: client = {}", clientName);
+                    throw createClientSpecificDelegatedLoginException(client.getClass().getSimpleName(), e);
+                }
+            } else {
+                // Otherwise, abort the authentication: prepare the login context with clients info and then go to the
+                // original start point of the CAS login web flow.
+                prepareForLoginPage(context);
+                return error();
+            }
+
+        } catch (final Exception e) {
+            // If any exception occurs during the client authentication process, return the specialized event which
+            // will allow the CAS authentication exception handler to handle the exception gracefully.
+            final Map<String, Class<? extends Exception>> failures = new LinkedHashMap<>();
+            failures.put(e.getClass().getSimpleName(), e.getClass());
+            logger.error("Client action failed unexpectedly: client = {}, error = {}", clientName, e.getMessage());
+            return getEventFactorySupport().event(
+                    this,
+                    AUTHENTICATION_FAILURE,
+                    new LocalAttributeMap<>("error", new AuthenticationException(failures))
+            );
+        }
+    }
+
+    /**
+     * Prepare the data for the login page.
+     *
+     * @param context the current web flow context
+     */
+    protected void prepareForLoginPage(final RequestContext context) {
+
+        final HttpServletRequest request = WebUtils.getHttpServletRequest(context);
+        final HttpServletResponse response = WebUtils.getHttpServletResponse(context);
+        final HttpSession session = request.getSession();
+
+        // Create a new web context.
+        final WebContext webContext = new J2EContext(request, response);
+
+        // Save service and other parameters in the web session.
+        final WebApplicationService service = WebUtils.getService(context);
+        logger.debug("save service: {}", service);
+        session.setAttribute(SERVICE, service);
+        saveRequestParameter(request, session, THEME);
+        saveRequestParameter(request, session, LOCALE);
+        saveRequestParameter(request, session, METHOD);
+
+        // Generate redirection (login) URLs for all clients and store them in the flow scope of the web context.
+        for (final Client client : this.clients.findAllClients()) {
+            final String key = client.getName() + "Url";
+            final BaseClient baseClient = (BaseClient) client;
+            final String redirectionUrl = baseClient.getRedirectionUrl(webContext);
+            logger.debug("{} -> {}", key, redirectionUrl);
+            context.getFlowScope().put(key, redirectionUrl);
+        }
+    }
+
+    /**
+     * Restore an attribute in web session as an attribute in request.
+     *
+     * @param request the HTTP request
+     * @param session the HTTP session
+     * @param name the name of the parameter
+     */
+    private void restoreRequestAttribute(
+            final HttpServletRequest request,
+            final HttpSession session,
+            final String name
+    ) {
+        final String value = (String) session.getAttribute(name);
+        request.setAttribute(name, value);
+    }
+
+    /**
+     * Save a request parameter in the web session.
+     *
+     * @param request the HTTP request
+     * @param session the HTTP session
+     * @param name the name of the parameter
+     */
+    private void saveRequestParameter(
+            final HttpServletRequest request,
+            final HttpSession session,
+            final String name
+    ) {
+        final String value = request.getParameter(name);
+        if (value != null) {
+            session.setAttribute(name, value);
+        }
+    }
+
+    /**
+     * Throw client specific exceptions for delegated authentication failures.
+     *
+     * @param clientClassSimpleName the simple name of the class of the client
+     * @param e the original exception
+     * @return a client specific exception
+     */
+    private DelegatedLoginException createClientSpecificDelegatedLoginException(
+            final String clientClassSimpleName,
+            final Exception e
+    ) {
+        if (OrcidClient.class.getSimpleName().equals(clientClassSimpleName)) {
+            return new OrcidClientLoginException(e.getMessage());
+        } else if (CasClient.class.getSimpleName().equals(clientClassSimpleName)) {
+            return new CasClientLoginException(e.getMessage());
+        }
+        return new DelegatedLoginException(e.getMessage());
+    }
+}
diff --git a/cas-server-support-osf/src/main/java/org/jasig/cas/web/support/AbstractThrottledSubmissionHandlerInterceptorAdapter.java b/cas-server-support-osf/src/main/java/org/jasig/cas/web/support/AbstractThrottledSubmissionHandlerInterceptorAdapter.java
index 57492355..c772b719 100644
--- a/cas-server-support-osf/src/main/java/org/jasig/cas/web/support/AbstractThrottledSubmissionHandlerInterceptorAdapter.java
+++ b/cas-server-support-osf/src/main/java/org/jasig/cas/web/support/AbstractThrottledSubmissionHandlerInterceptorAdapter.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2018. Center for Open Science
+ *
  * Licensed to Apereo under one or more contributor license
  * agreements. See the NOTICE file distributed with this work
  * for additional information regarding copyright ownership.
@@ -41,8 +43,9 @@
 /**
  * Abstract implementation of the handler that has all of the logic.
  *
+ * @author Scott Battaglia
  * @author Longze Chen
- * @since 4.1.5
+ * @since 3.3.5
  */
 public abstract class AbstractThrottledSubmissionHandlerInterceptorAdapter
         extends HandlerInterceptorAdapter implements InitializingBean {
diff --git a/cas-server-support-osf/src/main/java/org/pac4j/oauth/client/OrcidClient.java b/cas-server-support-osf/src/main/java/org/pac4j/oauth/client/OrcidClient.java
index 3e078579..a38c85d6 100644
--- a/cas-server-support-osf/src/main/java/org/pac4j/oauth/client/OrcidClient.java
+++ b/cas-server-support-osf/src/main/java/org/pac4j/oauth/client/OrcidClient.java
@@ -1,54 +1,68 @@
 /*
-  Copyright 2012 - 2015 pac4j organization
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+ * Copyright (c) 2016. Center for Open Science
+ *
+ * Copyright 2012 - 2015 pac4j organization
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.pac4j.oauth.client;
 
 import org.apache.http.HttpStatus;
+
 import org.pac4j.core.context.WebContext;
 import org.pac4j.core.exception.HttpCommunicationException;
 import org.pac4j.oauth.client.exception.OAuthCredentialsException;
 import org.pac4j.oauth.profile.OAuthAttributesDefinitions;
-import org.pac4j.oauth.profile.XmlHelper;
 import org.pac4j.oauth.profile.orcid.OrcidAttributesDefinition;
 import org.pac4j.oauth.profile.orcid.OrcidProfile;
+import org.pac4j.oauth.profile.XmlHelper;
+
 import org.scribe.builder.api.OrcidApi20;
 import org.scribe.exceptions.OAuthException;
 import org.scribe.model.OAuthConfig;
+import org.scribe.model.ProxyOAuthRequest;
+import org.scribe.model.Response;
 import org.scribe.model.SignatureType;
 import org.scribe.model.Token;
 import org.scribe.oauth.ProxyOAuth20ServiceImpl;
 import org.scribe.tokens.OrcidToken;
-import org.scribe.model.ProxyOAuthRequest;
-import org.scribe.model.Response;
-
 
 /**
- * <p>This class is the OAuth client to authenticate users in ORCiD.</p>
- * <p>It returns a {@link org.pac4j.oauth.profile.orcid.OrcidProfile}.</p>
- * <p>More information at http://support.orcid.org/knowledgebase/articles/175079-tutorial-retrieve-data-from-an-orcid-record-with</p>
+ * The ORCiD Client.
+ *
+ * This class is the OAuth 2.0 client to authenticate users via ORCiD by authorization.
  *
  * @author Jens Tinglev
  * @author Michael Haselton
  * @author Longze Chen
  * @see org.pac4j.oauth.profile.orcid.OrcidProfile
- * @since 1.7.1
+ * @since 1.6.0
  */
 public class OrcidClient extends BaseOAuth20Client<OrcidProfile> {
 
-    /** The default scope. */
-    protected static final String DEFAULT_SCOPE = "/orcid-profile/read-limited";
+    /**
+     * The default scope.
+     *
+     * OSF CAS uses the "/authenticate" scope for the purpose of authentication only. According to ORCiD API docs, this
+     * scope is used when the client system will collect the ORCID iD but does not need access to read-limited data or
+     * will use the ORCID system as an authentication provider. This scope is available on the Member or Public API.
+     * For more information about ORCiD scopes, refer to https://members.orcid.org/api/oauth/orcid-scopes.
+     *
+     * In addition, "pac4j" version of the ORCiD OAuth 2.0 client implementation must use the 3-legged OAuth and the
+     * "/authenticate" scope is such a 3-legged scope. For more information on 2-legged and 3-legged OAuth, refer to
+     * https://members.orcid.org/api/oauth/2legged-oauth and https://members.orcid.org/api/oauth/3legged-oauth.
+     */
+    protected static final String DEFAULT_SCOPE = "/authenticate";
 
     /** The scope. */
     protected String scope = DEFAULT_SCOPE;
@@ -57,7 +71,7 @@ public class OrcidClient extends BaseOAuth20Client<OrcidProfile> {
     protected Boolean member = Boolean.TRUE;
 
     /**
-     * Create an instance of `OrcidClient` with given `key` and `secret`.
+     * Instantiate a new {@link OrcidClient}.
      *
      * @param key the key
      * @param secret the secret
@@ -69,7 +83,7 @@ public OrcidClient(final String key, final String secret) {
     }
 
     /**
-     * Create an instance of `OrcidClient`.
+     * Instantiate a new {@link OrcidClient}.
      */
     public OrcidClient() {
         setTokenAsHeader(true);
@@ -100,6 +114,11 @@ protected boolean hasBeenCancelled(final WebContext context) {
     /**
      * Get the oauth url to retrieve user profile.
      *
+     * This method overrides itself, and here are the customizations:
+     *
+     * 1. Replaces API 1.1 with API 2.0
+     * 2. Add the option to use the free public API if {@link #member} is {@code false}
+     *
      * @param accessToken the access token
      * @return profile uri
      * @throws OAuthException if wrong token type
@@ -107,8 +126,11 @@ protected boolean hasBeenCancelled(final WebContext context) {
     @Override
     protected String getProfileUrl(final Token accessToken) {
         if (accessToken instanceof OrcidToken) {
-            return String.format("https://%s.orcid.org/v2.0/%s/record",
-                    (this.getMember() ? "api" : "pub"), ((OrcidToken) accessToken).getOrcid());
+            return String.format(
+                    "https://%s.orcid.org/v2.0/%s/record",
+                    this.getMember() ? "api" : "pub",
+                    ((OrcidToken) accessToken).getOrcid()
+            );
         } else {
             throw new OAuthException("Token in getProfileUrl is not an OrcidToken");
         }
@@ -122,14 +144,7 @@ protected void internalInit() {
         super.internalInit();
         this.service = new ProxyOAuth20ServiceImpl(
                 new OrcidApi20(),
-                new OAuthConfig(
-                        this.key,
-                        this.secret,
-                        this.callbackUrl,
-                        SignatureType.Header,
-                        this.getScope(),
-                        null
-                ),
+                new OAuthConfig(this.key, this.secret, this.callbackUrl, SignatureType.Header, this.getScope(), null),
                 this.connectTimeout,
                 this.readTimeout,
                 this.proxyHost, this.proxyPort,
@@ -167,20 +182,26 @@ public void setMember(final Boolean member) {
     }
 
     /**
-     * Extract user profile.
+     * Extract the user profile from the profile response.
+     *
+     * This method replaces itself and here are the customizations:
+     *
+     * 1. Set the raw ORCiD ID as the profile ID
+     * 2. Build the profile using normalized attributes so they can be successfully released to OSF
      *
-     * @param body the body
+     * @param body the response body
      * @return the profile
      */
     @Override
     protected OrcidProfile extractUserProfile(final String body) {
+
         final OrcidProfile profile = new OrcidProfile();
         profile.setId(XmlHelper.get(body, OrcidAttributesDefinition.ORCID));
+
         for(final String attribute : OAuthAttributesDefinitions.orcidDefinition.getAllAttributes()) {
             final String value = XmlHelper.get(body, attribute);
             switch (attribute) {
                 case OrcidAttributesDefinition.NORMALIZED_FAMILY_NAME:
-                    break;
                 case OrcidAttributesDefinition.NORMALIZED_GIVEN_NAME:
                     break;
                 case OrcidAttributesDefinition.FAMILY_NAME:
@@ -198,8 +219,9 @@ protected OrcidProfile extractUserProfile(final String body) {
     }
 
     /**
-     * Create a new `OrcidClient`.
-     * @return the new cient
+     * Create a new {@link OrcidClient}.
+     *
+     * @return the new client
      */
     @Override
     protected OrcidClient newClient() {
@@ -211,21 +233,35 @@ protected OrcidClient newClient() {
     /**
      * Make a request to get the data of the authenticated user for the provider.
      *
+     * This method overrides {@link BaseOAuthClient#sendRequestForData(Token, String)}. Here are the customizations:
+     *
+     * 1. No longer appends the access token as a query parameter to the URL.
+     * 2. Always includes the access token using the "Authorization" header.
+     * 3. Improved the way how log messages are built.
+     * 4. Use interface constants {@link HttpStatus#SC_OK} instead of number literals.
+     *
      * @param accessToken the access token
      * @param dataUrl url of the data
      * @return the user data response
      * @throws HttpCommunicationException if fails to retrieve data
      */
     @Override
-    protected String sendRequestForData(final Token accessToken, final String dataUrl) {
+    protected String sendRequestForData(
+            final Token accessToken,
+            final String dataUrl
+    ) throws HttpCommunicationException {
+
         logger.debug("accessToken : {} / dataUrl : {}", accessToken, dataUrl);
         final long t0 = System.currentTimeMillis();
         final ProxyOAuthRequest request = createProxyRequest(dataUrl);
+        if (accessToken != null) {
+            request.addHeader("Authorization", "Bearer " + accessToken.getToken());
+        }
         final Response response = request.send();
         final int code = response.getCode();
         final String body = response.getBody();
         final long t1 = System.currentTimeMillis();
-        logger.debug(String.format("Request took : {} ms for : {} ", (t1 - t0), dataUrl));
+        logger.debug("Request took : {} ms for : {} ", (t1 - t0), dataUrl);
         logger.debug("response code : {} / response body : {}", code, body);
         if (code != HttpStatus.SC_OK) {
             logger.error("Failed to get data, code : {} / body : {}", code, body);
diff --git a/cas-server-support-osf/src/main/java/org/pac4j/oauth/profile/orcid/OrcidAttributesDefinition.java b/cas-server-support-osf/src/main/java/org/pac4j/oauth/profile/orcid/OrcidAttributesDefinition.java
index 3567ecad..27818090 100644
--- a/cas-server-support-osf/src/main/java/org/pac4j/oauth/profile/orcid/OrcidAttributesDefinition.java
+++ b/cas-server-support-osf/src/main/java/org/pac4j/oauth/profile/orcid/OrcidAttributesDefinition.java
@@ -1,17 +1,19 @@
 /*
-  Copyright 2012 - 2015 pac4j organization
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+ * Copyright (c) 2018. Center for Open Science
+ *
+ * Copyright 2012 - 2015 pac4j organization
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.pac4j.oauth.profile.orcid;
 
@@ -24,7 +26,7 @@
  * @author Jens Tinglev
  * @author Michael Haselton
  * @author Longze Chen
- * @since 1.7.1
+ * @since 1.6.0
  */
 public class OrcidAttributesDefinition extends OAuthAttributesDefinition {
 
diff --git a/cas-server-support-osf/src/main/java/org/scribe/builder/api/OrcidApi20.java b/cas-server-support-osf/src/main/java/org/scribe/builder/api/OrcidApi20.java
index 446f971e..c1b5ca76 100644
--- a/cas-server-support-osf/src/main/java/org/scribe/builder/api/OrcidApi20.java
+++ b/cas-server-support-osf/src/main/java/org/scribe/builder/api/OrcidApi20.java
@@ -1,17 +1,19 @@
 /*
-  Copyright 2012 - 2015 pac4j organization
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+ * Copyright (c) 2016. Center for Open Science
+ *
+ * Copyright 2012 - 2015 pac4j organization
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.scribe.builder.api;
 
@@ -27,12 +29,12 @@
  * @author Jens Tinglev
  * @author Michael Haselton
  * @author Longze Chen
- * @since 1.7.1
+ * @since 1.6.0
  */
 public class OrcidApi20 extends DefaultApi20 {
 
     /** The authorization url. */
-    private static final String AUTH_URL = "https://www.orcid.org/oauth/authorize";
+    private static final String AUTH_URL = "https://orcid.org/oauth/authorize";
 
     /** The token exchange url. */
     private static final String TOKEN_URL = "https://orcid.org/oauth/token";
diff --git a/cas-server-webapp/pom.xml b/cas-server-webapp/pom.xml
index 1b39e88f..5114fd7e 100755
--- a/cas-server-webapp/pom.xml
+++ b/cas-server-webapp/pom.xml
@@ -1,4 +1,6 @@
 <!--
+  ~ Copyright (c) 2015. Center for Open Science
+  ~
   ~ Licensed to Apereo under one or more contributor license
   ~ agreements. See the NOTICE file distributed with this work
   ~ for additional information regarding copyright ownership.
diff --git a/cas-server-webapp/src/main/resources/messages.properties b/cas-server-webapp/src/main/resources/messages.properties
index c28d662f..a2680c2a 100644
--- a/cas-server-webapp/src/main/resources/messages.properties
+++ b/cas-server-webapp/src/main/resources/messages.properties
@@ -1,5 +1,6 @@
-#Welcome Screen Messages
-
+# Welcome Screen Messages
+#
+# Copyright (c) 2015. Center for Open Science
 #
 # Licensed to Apereo under one or more contributor license
 # agreements. See the NOTICE file distributed with this work
@@ -100,6 +101,20 @@ authenticationFailure.FailedLoginException=The email or password you entered is
 authenticationFailure.OneTimePasswordRequiredException=
 authenticationFailure.OneTimePasswordFailedLoginException=The passcode you entered is incorrect.
 authenticationFailure.UNKNOWN=Invalid credentials.
+# Delegated login failure messages
+screen.delegatedloginfailure.generic.header=Delegated authentication error
+screen.delegatedloginfailure.generic.message=Your request cannot be completed at this time. Please \
+  <a style="white-space: nowrap" href="{0}">return to OSF</a> and try again later. If this issue persists, please \
+  contact <a style="white-space: nowrap" href="mailto:support@osf.io">Support</a> for help.
+screen.delegatedloginfailure.cas.header=Institution login error
+screen.delegatedloginfailure.cas.message=Your request cannot be completed at this time. Please \
+  <a style="white-space: nowrap" href="{0}">return to OSF</a> and try again later.</br></br>If the issue persists, \
+  check with your institution to verify your account is entitled to authenticate to OSF.</br></br>If you believe this \
+  is in error, please contact <a style="white-space: nowrap" href="mailto:support@osf.io">Support</a> for help.
+screen.delegatedloginfailure.orcid.header=ORCID login error
+screen.delegatedloginfailure.orcid.message=Your request cannot be completed at this time. Please \
+  <a style="white-space: nowrap" href="{0}">return to OSF</a> and try again later. If this issue persists, please \
+  contact <a style="white-space: nowrap" href="mailto:support@osf.io">Support</a> for help.
 
 INVALID_REQUEST_PROXY='pgt' and 'targetService' parameters are both required
 INVALID_TICKET_SPEC=Ticket failed validation specification.  Possible errors could include attempting to validate a Proxy Ticket via a Service Ticket validator, or not complying with the renew true request.
@@ -166,7 +181,7 @@ screen.institution.login.select.error.message=You must select an institution.
 
 # Sign in through OSF
 screen.osf.login.message=Sign in with your OSF account to continue
-screen.osf.login.message.error=Oops! Something went wrong
+screen.osf.login.message.error=Oops! Something went wrong ...
 
 # Two-factor Authentication
 screen.2fa.login.heading=Two-factor authentication
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/cas-servlet.xml b/cas-server-webapp/src/main/webapp/WEB-INF/cas-servlet.xml
index 3c32cb52..ad028c8a 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/cas-servlet.xml
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/cas-servlet.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
+    Copyright (c) 2015. Center for Open Science
+
     Licensed to Apereo under one or more contributor license
     agreements. See the NOTICE file distributed with this work
     for additional information regarding copyright ownership.
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/crash/commands/oauth.groovy b/cas-server-webapp/src/main/webapp/WEB-INF/crash/commands/oauth.groovy
index 39c1d94e..9991851b 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/crash/commands/oauth.groovy
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/crash/commands/oauth.groovy
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2016. Center for Open Science
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import org.crsh.cli.Command;
 
 import org.apache.commons.io.FileUtils;
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/README.md b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/README.md
new file mode 100644
index 00000000..4b5f920d
--- /dev/null
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/README.md
@@ -0,0 +1,25 @@
+### INTRODUCTION
+
+The spring-configuration directory is a "convention-over-configuration" option for CAS developers and deployers. It allows you to drop a Spring XML configuration file into this directory and have CAS automatically find it (after the typical application restart). It eliminates the need for you to register that file in the `web.xml`, which should already have set `contextConfigLocation` to `/WEB-INF/spring-configuration/*.xml`.
+
+```xml
+<context-param>
+    <param-name>contextConfigLocation</param-name>
+    <param-value>
+        /WEB-INF/spring-configuration/*.xml
+        classpath*:/META-INF/spring/*.xml
+    </param-value>
+</context-param>
+```
+
+### ADVANTAGES
+
+By automatically breaking the configuration into smaller "bite-sized" pieces you can easily override small components of CAS without worrying about merging huge pieces of configurations files together later. The configuration-over-convention option also allows you to add new configuration options without editing existing configuration files. This should make tracking changes and maintaining local modifications easier.
+
+### GOTCHAS AND THINGS TO WATCH OUT FOR
+
+If you name a local bean and an existing bean the same thing, there will be a major collision. Deployment will fail. The sky will fall! (okay that last part isn't true). Spring will be merging all of these files together so every bean must have unique names.  The only way around this is if you override the file completely. (i.e. override the ticketRegistry.xml allows you to re-use the "ticketRegistry" id.) In addition, if there is a typographical/XML parsing error in a file, the application will not deploy.
+
+### References
+
+[Here](https://github.com/apereo/cas/blob/4.1.x/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/README.txt) is the original Spring configuration `README.txt` for [Apereo CAS 4.1.x](https://apereo.github.io/cas/4.1.x/index.html).
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/auditTrailManager.xml b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/auditTrailManager.xml
index af587f5b..570e9d17 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/auditTrailManager.xml
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/auditTrailManager.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Licensed to Jasig under one or more contributor license
-    agreements. See the NOTICE file distributed with this work
-    for additional information regarding copyright ownership.
-    Jasig licenses this file to you under the Apache License,
-    Version 2.0 (the "License"); you may not use this file
-    except in compliance with the License.  You may obtain a
-    copy of the License at the following location:
+    Copyright (c) 2015. Center for Open Science
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
 
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/authenticationDelegation.xml b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/authenticationDelegation.xml
index 9795822e..53633597 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/authenticationDelegation.xml
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/authenticationDelegation.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-Licensed to Apereo under one or more contributor license
-agreements. See the NOTICE file distributed with this work
-for additional information regarding copyright ownership.
-Apereo licenses this file to you under the Apache License,
-Version 2.0 (the "License"); you may not use this file
-except in compliance with the License.  You may obtain a
-copy of the License at the following location:
+    Copyright (c) 2015. Center for Open Science
 
-http://www.apache.org/licenses/LICENSE-2.0
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
 
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
 -->
 <beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/authenticationManager.xml b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/authenticationManager.xml
index 6827169b..c3096daa 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/authenticationManager.xml
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/authenticationManager.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Licensed to Jasig under one or more contributor license
-    agreements. See the NOTICE file distributed with this work
-    for additional information regarding copyright ownership.
-    Jasig licenses this file to you under the Apache License,
-    Version 2.0 (the "License"); you may not use this file
-    except in compliance with the License.  You may obtain a
-    copy of the License at the following location:
+    Copyright (c) 2015. Center for Open Science
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
 
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/dataSource.xml b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/dataSource.xml
index d3b1272d..5a03b889 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/dataSource.xml
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/dataSource.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Licensed to Jasig under one or more contributor license
-    agreements. See the NOTICE file distributed with this work
-    for additional information regarding copyright ownership.
-    Jasig licenses this file to you under the Apache License,
-    Version 2.0 (the "License"); you may not use this file
-    except in compliance with the License.  You may obtain a
-    copy of the License at the following location:
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+    Copyright (c) 2015. Center for Open Science
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/filters.xml b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/filters.xml
index 643bb731..37097d00 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/filters.xml
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/filters.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+
+    Copyright (c) 2015. Center for Open Science
+
+
     Licensed to Apereo under one or more contributor license
     agreements. See the NOTICE file distributed with this work
     for additional information regarding copyright ownership.
@@ -7,13 +11,16 @@
     Version 2.0 (the "License"); you may not use this file
     except in compliance with the License.  You may obtain a
     copy of the License at the following location:
+
       http://www.apache.org/licenses/LICENSE-2.0
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
+
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -45,4 +52,4 @@
             </bean>
         </property>
     </bean>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/healthCheckMonitor.xml b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/healthCheckMonitor.xml
index 011ec944..801e03e0 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/healthCheckMonitor.xml
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/healthCheckMonitor.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Licensed to Jasig under one or more contributor license
-    agreements. See the NOTICE file distributed with this work
-    for additional information regarding copyright ownership.
-    Jasig licenses this file to you under the Apache License,
-    Version 2.0 (the "License"); you may not use this file
-    except in compliance with the License.  You may obtain a
-    copy of the License at the following location:
+    Copyright (c) 2015. Center for Open Science
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
 
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/loginManager.xml b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/loginManager.xml
index 131f7802..6021a560 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/loginManager.xml
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/loginManager.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Licensed to Jasig under one or more contributor license
-    agreements. See the NOTICE file distributed with this work
-    for additional information regarding copyright ownership.
-    Jasig licenses this file to you under the Apache License,
-    Version 2.0 (the "License"); you may not use this file
-    except in compliance with the License.  You may obtain a
-    copy of the License at the following location:
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+    Copyright (c) 2016. Center for Open Science
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/loginRateLimiting.xml b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/loginRateLimiting.xml
index 44627dc2..ccd9d2c0 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/loginRateLimiting.xml
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/loginRateLimiting.xml
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
-    Licensed to Apereo under one or more contributor license
-    agreements. See the NOTICE file distributed with this work
-    for additional information regarding copyright ownership.
-    Apereo licenses this file to you under the Apache License,
-    Version 2.0 (the "License"); you may not use this file
-    except in compliance with the License.  You may obtain a
-    copy of the License at the following location:
-      http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
 
+    Copyright (c) 2018. Center for Open Science
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:p="http://www.springframework.org/schema/p"
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/oAuthApplicationContext.xml b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/oAuthApplicationContext.xml
index 165f8b1f..a18fd58b 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/oAuthApplicationContext.xml
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/oAuthApplicationContext.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Licensed to Apereo under one or more contributor license
-    agreements. See the NOTICE file distributed with this work
-    for additional information regarding copyright ownership.
-    Apereo licenses this file to you under the Apache License,
-    Version 2.0 (the "License"); you may not use this file
-    except in compliance with the License.  You may obtain a
-    copy of the License at the following location:
+    Copyright (c) 2015. Center for Open Science
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
 
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
 -->
 <beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/oAuthPersonalTokenManager.xml b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/oAuthPersonalTokenManager.xml
index 1c637412..b0440630 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/oAuthPersonalTokenManager.xml
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/oAuthPersonalTokenManager.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Licensed to Apereo under one or more contributor license
-    agreements. See the NOTICE file distributed with this work
-    for additional information regarding copyright ownership.
-    Apereo licenses this file to you under the Apache License,
-    Version 2.0 (the "License"); you may not use this file
-    except in compliance with the License.  You may obtain a
-    copy of the License at the following location:
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+    Copyright (c) 2015. Center for Open Science
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/oAuthScopeManager.xml b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/oAuthScopeManager.xml
index 344a9deb..d0d625dd 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/oAuthScopeManager.xml
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/oAuthScopeManager.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Licensed to Apereo under one or more contributor license
-    agreements. See the NOTICE file distributed with this work
-    for additional information regarding copyright ownership.
-    Apereo licenses this file to you under the Apache License,
-    Version 2.0 (the "License"); you may not use this file
-    except in compliance with the License.  You may obtain a
-    copy of the License at the following location:
+    Copyright (c) 2015. Center for Open Science
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
 
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/oAuthTokenRegistry.xml b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/oAuthTokenRegistry.xml
index aa617162..9d8293eb 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/oAuthTokenRegistry.xml
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/oAuthTokenRegistry.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Licensed to Apereo under one or more contributor license
-    agreements. See the NOTICE file distributed with this work
-    for additional information regarding copyright ownership.
-    Apereo licenses this file to you under the Apache License,
-    Version 2.0 (the "License"); you may not use this file
-    except in compliance with the License.  You may obtain a
-    copy of the License at the following location:
+    Copyright (c) 2015. Center for Open Science
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
 
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/oAuthUniqueIdGenerators.xml b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/oAuthUniqueIdGenerators.xml
index 441a9ef2..d58d44b2 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/oAuthUniqueIdGenerators.xml
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/oAuthUniqueIdGenerators.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
+    Copyright (c) 2015. Center for Open Science
+
     Licensed to Apereo under one or more contributor license
     agreements. See the NOTICE file distributed with this work
     for additional information regarding copyright ownership.
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/propertyFileConfigurer.xml b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/propertyFileConfigurer.xml
index 2907951f..f00f6040 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/propertyFileConfigurer.xml
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/propertyFileConfigurer.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
+    Copyright (c) 2015. Center for Open Science
+
     Licensed to Apereo under one or more contributor license
     agreements. See the NOTICE file distributed with this work
     for additional information regarding copyright ownership.
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/protocolViewsConfiguration.xml b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/protocolViewsConfiguration.xml
index 88386d04..16de523d 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/protocolViewsConfiguration.xml
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/protocolViewsConfiguration.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+
+    Copyright (c) 2015. Center for Open Science
+
     Licensed to Apereo under one or more contributor license
     agreements. See the NOTICE file distributed with this work
     for additional information regarding copyright ownership.
@@ -7,13 +10,16 @@
     Version 2.0 (the "License"); you may not use this file
     except in compliance with the License.  You may obtain a
     copy of the License at the following location:
+
       http://www.apache.org/licenses/LICENSE-2.0
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
+
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/serviceRegistryDao.xml b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/serviceRegistryDao.xml
index 4a0f7dab..e7d35b8a 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/serviceRegistryDao.xml
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/serviceRegistryDao.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
+    Copyright (c) 2015. Center for Open Science
+
     Licensed to Apereo under one or more contributor license
     agreements. See the NOTICE file distributed with this work
     for additional information regarding copyright ownership.
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/ticketExpirationPolicies.xml b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/ticketExpirationPolicies.xml
index 5c57f5d8..6aa36de8 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/ticketExpirationPolicies.xml
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/ticketExpirationPolicies.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
+    Copyright (c) 2015. Center for Open Science
+
     Licensed to Apereo under one or more contributor license
     agreements. See the NOTICE file distributed with this work
     for additional information regarding copyright ownership.
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/ticketGrantingTicketCookieGenerator.xml b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/ticketGrantingTicketCookieGenerator.xml
index 40cb2309..419b593a 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/ticketGrantingTicketCookieGenerator.xml
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/ticketGrantingTicketCookieGenerator.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
+    Copyright (c) 2015. Center for Open Science
+
     Licensed to Apereo under one or more contributor license
     agreements. See the NOTICE file distributed with this work
     for additional information regarding copyright ownership.
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/ticketRegistry.xml b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/ticketRegistry.xml
index a9e0ec49..642ead84 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/ticketRegistry.xml
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/ticketRegistry.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
+    Copyright (c) 2015. Center for Open Science
+
     Licensed to Apereo under one or more contributor license
     agreements. See the NOTICE file distributed with this work
     for additional information regarding copyright ownership.
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/authorizationFailure.jsp b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/authorizationFailure.jsp
index 62745af9..49b77a65 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/authorizationFailure.jsp
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/authorizationFailure.jsp
@@ -1,4 +1,7 @@
 <%--
+
+    Copyright (c) 2018. Center for Open Science
+
     Licensed to Apereo under one or more contributor license
     agreements. See the NOTICE file distributed with this work
     for additional information regarding copyright ownership.
@@ -6,13 +9,16 @@
     Version 2.0 (the "License"); you may not use this file
     except in compliance with the License.  You may obtain a
     copy of the License at the following location:
+
       http://www.apache.org/licenses/LICENSE-2.0
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
+
 --%>
 
 <jsp:directive.include file="default/ui/includes/top.jsp"/>
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casAccountDisabledView.jsp b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casAccountDisabledView.jsp
index 31a4c66d..eb5beddd 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casAccountDisabledView.jsp
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casAccountDisabledView.jsp
@@ -1,5 +1,7 @@
 <%--
 
+    Copyright (c) 2016. Center for Open Science
+
     Licensed to Apereo under one or more contributor license
     agreements. See the NOTICE file distributed with this work
     for additional information regarding copyright ownership.
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casGenericSuccessView.jsp b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casGenericSuccessView.jsp
index 16098af8..273d9c6c 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casGenericSuccessView.jsp
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casGenericSuccessView.jsp
@@ -1,5 +1,7 @@
 <%--
 
+    Copyright (c) 2015. Center for Open Science
+
     Licensed to Apereo under one or more contributor license
     agreements. See the NOTICE file distributed with this work
     for additional information regarding copyright ownership.
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casInstitutionLoginView.jsp b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casInstitutionLoginView.jsp
index f9612327..1ba6ab54 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casInstitutionLoginView.jsp
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casInstitutionLoginView.jsp
@@ -1,21 +1,18 @@
 <%--
 
-    Licensed to Apereo under one or more contributor license
-    agreements. See the NOTICE file distributed with this work
-    for additional information regarding copyright ownership.
-    Apereo licenses this file to you under the Apache License,
-    Version 2.0 (the "License"); you may not use this file
-    except in compliance with the License.  You may obtain a
-    copy of the License at the following location:
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+    Copyright (c) 2016. Center for Open Science
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
 --%>
 
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casInvalidVerificationKeyView.jsp b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casInvalidVerificationKeyView.jsp
index 3a1663a8..79cbef52 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casInvalidVerificationKeyView.jsp
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casInvalidVerificationKeyView.jsp
@@ -1,21 +1,18 @@
 <%--
 
-    Licensed to Apereo under one or more contributor license
-    agreements. See the NOTICE file distributed with this work
-    for additional information regarding copyright ownership.
-    Apereo licenses this file to you under the Apache License,
-    Version 2.0 (the "License"); you may not use this file
-    except in compliance with the License.  You may obtain a
-    copy of the License at the following location:
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+    Copyright (c) 2018. Center for Open Science
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
 --%>
 
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casLoginNotAllowedView.jsp b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casLoginNotAllowedView.jsp
index 5beee4b1..d5fa4844 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casLoginNotAllowedView.jsp
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casLoginNotAllowedView.jsp
@@ -1,21 +1,18 @@
 <%--
 
-    Licensed to Apereo under one or more contributor license
-    agreements. See the NOTICE file distributed with this work
-    for additional information regarding copyright ownership.
-    Apereo licenses this file to you under the Apache License,
-    Version 2.0 (the "License"); you may not use this file
-    except in compliance with the License.  You may obtain a
-    copy of the License at the following location:
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+    Copyright (c) 2015. Center for Open Science
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
 --%>
 
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casLoginView.jsp b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casLoginView.jsp
index e110f711..a1e10439 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casLoginView.jsp
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casLoginView.jsp
@@ -1,5 +1,7 @@
 <%--
 
+    Copyright (c) 2015. Center for Open Science
+
     Licensed to Apereo under one or more contributor license
     agreements. See the NOTICE file distributed with this work
     for additional information regarding copyright ownership.
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casLogoutView.jsp b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casLogoutView.jsp
index 4fbe202a..8188a428 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casLogoutView.jsp
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casLogoutView.jsp
@@ -1,5 +1,7 @@
 <%--
 
+    Copyright (c) 2016. Center for Open Science
+
     Licensed to Apereo under one or more contributor license
     agreements. See the NOTICE file distributed with this work
     for additional information regarding copyright ownership.
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casOrcidLoginRedirectView.jsp b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casOrcidLoginRedirectView.jsp
index 8f185a7f..ceea3e7c 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casOrcidLoginRedirectView.jsp
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casOrcidLoginRedirectView.jsp
@@ -1,21 +1,18 @@
 <%--
 
-    Licensed to Apereo under one or more contributor license
-    agreements. See the NOTICE file distributed with this work
-    for additional information regarding copyright ownership.
-    Apereo licenses this file to you under the Apache License,
-    Version 2.0 (the "License"); you may not use this file
-    except in compliance with the License.  You may obtain a
-    copy of the License at the following location:
+    Copyright (c) 2018. Center for Open Science
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
 
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
 --%>
 
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casOtpLoginView.jsp b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casOtpLoginView.jsp
index 011003a3..f35c8fcf 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casOtpLoginView.jsp
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casOtpLoginView.jsp
@@ -1,21 +1,18 @@
 <%--
 
-    Licensed to Apereo under one or more contributor license
-    agreements. See the NOTICE file distributed with this work
-    for additional information regarding copyright ownership.
-    Apereo licenses this file to you under the Apache License,
-    Version 2.0 (the "License"); you may not use this file
-    except in compliance with the License.  You may obtain a
-    copy of the License at the following location:
+    Copyright (c) 2015. Center for Open Science
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
 
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
 --%>
 
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casRemoteUserFailedLoginView.jsp b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casRemoteUserFailedLoginView.jsp
index 177f49ac..15ab6e31 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casRemoteUserFailedLoginView.jsp
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casRemoteUserFailedLoginView.jsp
@@ -1,21 +1,18 @@
 <%--
 
-    Licensed to Apereo under one or more contributor license
-    agreements. See the NOTICE file distributed with this work
-    for additional information regarding copyright ownership.
-    Apereo licenses this file to you under the Apache License,
-    Version 2.0 (the "License"); you may not use this file
-    except in compliance with the License.  You may obtain a
-    copy of the License at the following location:
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+    Copyright (c) 2016. Center for Open Science
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
 --%>
 
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casShouldNotHappenView.jsp b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casShouldNotHappenView.jsp
index 8c21c4ed..3e04f44f 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casShouldNotHappenView.jsp
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/casShouldNotHappenView.jsp
@@ -1,21 +1,18 @@
 <%--
 
-    Licensed to Apereo under one or more contributor license
-    agreements. See the NOTICE file distributed with this work
-    for additional information regarding copyright ownership.
-    Apereo licenses this file to you under the Apache License,
-    Version 2.0 (the "License"); you may not use this file
-    except in compliance with the License.  You may obtain a
-    copy of the License at the following location:
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+    Copyright (c) 2016. Center for Open Science
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
 --%>
 
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/delegatedLoginCasErrorView.jsp b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/delegatedLoginCasErrorView.jsp
new file mode 100644
index 00000000..67aea8e2
--- /dev/null
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/delegatedLoginCasErrorView.jsp
@@ -0,0 +1,41 @@
+<%--
+
+    Copyright (c) 2019. Center for Open Science
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+--%>
+
+<%-- Delegated login exception page: CAS client --%>
+
+<jsp:directive.include file="includes/top.jsp"/>
+
+<spring:message code="screen.osf.login.message.error" var="errorDescription"/>
+<script>
+    description = document.getElementById("description");
+    if (description != null) {
+        description.innerHTML = "<br><br>${errorDescription}";
+    }
+</script>
+
+<div id="msg" class="errors">
+    <h2><spring:message code="screen.delegatedloginfailure.cas.header"/></h2>
+    <p><spring:message code="screen.delegatedloginfailure.cas.message" arguments="${osfUrl}"/></p>
+</div>
+
+<c:set var="linkSignIn" value="false"/>
+<c:set var="linkSignOut" value="false"/>
+<c:set var="linkCreateAccount" value="false"/>
+<c:set var="linkBackToOsf" value="false"/>
+
+<jsp:directive.include file="includes/bottom.jsp"/>
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/delegatedLoginGenericErrorView.jsp b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/delegatedLoginGenericErrorView.jsp
new file mode 100644
index 00000000..9a189574
--- /dev/null
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/delegatedLoginGenericErrorView.jsp
@@ -0,0 +1,41 @@
+<%--
+
+    Copyright (c) 2019. Center for Open Science
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+--%>
+
+<%-- Generic delegated login exception page --%>
+
+<jsp:directive.include file="includes/top.jsp"/>
+
+<spring:message code="screen.osf.login.message.error" var="errorDescription"/>
+<script>
+    description = document.getElementById("description");
+    if (description != null) {
+        description.innerHTML = "<br><br>${errorDescription}";
+    }
+</script>
+
+<div id="msg" class="errors">
+    <h2><spring:message code="screen.delegatedloginfailure.generic.header"/></h2>
+    <p><spring:message code="screen.delegatedloginfailure.generic.message" arguments="${osfUrl}"/></p>
+</div>
+
+<c:set var="linkSignIn" value="false"/>
+<c:set var="linkSignOut" value="false"/>
+<c:set var="linkCreateAccount" value="false"/>
+<c:set var="linkBackToOsf" value="false"/>
+
+<jsp:directive.include file="includes/bottom.jsp"/>
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/delegatedLoginOrcidErrorView.jsp b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/delegatedLoginOrcidErrorView.jsp
new file mode 100644
index 00000000..3bf1a833
--- /dev/null
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/delegatedLoginOrcidErrorView.jsp
@@ -0,0 +1,41 @@
+<%--
+
+    Copyright (c) 2019. Center for Open Science
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+--%>
+
+<%-- Delegated login exception page: ORCiD client --%>
+
+<jsp:directive.include file="includes/top.jsp"/>
+
+<spring:message code="screen.osf.login.message.error" var="errorDescription"/>
+<script>
+    description = document.getElementById("description");
+    if (description != null) {
+        description.innerHTML = "<br><br>${errorDescription}";
+    }
+</script>
+
+<div id="msg" class="errors">
+    <h2><spring:message code="screen.delegatedloginfailure.orcid.header"/></h2>
+    <p><spring:message code="screen.delegatedloginfailure.orcid.message" arguments="${osfUrl}"/></p>
+</div>
+
+<c:set var="linkSignIn" value="false"/>
+<c:set var="linkSignOut" value="false"/>
+<c:set var="linkCreateAccount" value="false"/>
+<c:set var="linkBackToOsf" value="false"/>
+
+<jsp:directive.include file="includes/bottom.jsp"/>
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/includes/bottom.jsp b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/includes/bottom.jsp
index 212bb0c4..f2873aec 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/includes/bottom.jsp
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/includes/bottom.jsp
@@ -1,5 +1,7 @@
 <%--
 
+    Copyright (c) 2015. Center for Open Science
+
     Licensed to Apereo under one or more contributor license
     agreements. See the NOTICE file distributed with this work
     for additional information regarding copyright ownership.
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/includes/top.jsp b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/includes/top.jsp
index e69c665f..2b99ac51 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/includes/top.jsp
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/default/ui/includes/top.jsp
@@ -1,5 +1,7 @@
 <%--
 
+    Copyright (c) 2015. Center for Open Science
+
     Licensed to Apereo under one or more contributor license
     agreements. See the NOTICE file distributed with this work
     for additional information regarding copyright ownership.
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/errors.jsp b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/errors.jsp
index a278187b..2c5a400b 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/errors.jsp
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/errors.jsp
@@ -1,5 +1,7 @@
 <%--
 
+    Copyright (c) 2018. Center for Open Science
+
     Licensed to Apereo under one or more contributor license
     agreements. See the NOTICE file distributed with this work
     for additional information regarding copyright ownership.
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/protocol/oauth/confirm.jsp b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/protocol/oauth/confirm.jsp
index 864cb49d..43d797ae 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/protocol/oauth/confirm.jsp
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/protocol/oauth/confirm.jsp
@@ -1,5 +1,7 @@
 <%--
 
+    Copyright (c) 2015. Center for Open Science
+
     Licensed to Apereo under one or more contributor license
     agreements. See the NOTICE file distributed with this work
     for additional information regarding copyright ownership.
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/protocol/oauth/oAuthFailureView.jsp b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/protocol/oauth/oAuthFailureView.jsp
index c90be541..2f6857e9 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/protocol/oauth/oAuthFailureView.jsp
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/view/jsp/protocol/oauth/oAuthFailureView.jsp
@@ -1,23 +1,21 @@
 <%--
 
-    Licensed to Apereo under one or more contributor license
-    agreements. See the NOTICE file distributed with this work
-    for additional information regarding copyright ownership.
-    Apereo licenses this file to you under the Apache License,
-    Version 2.0 (the "License"); you may not use this file
-    except in compliance with the License.  You may obtain a
-    copy of the License at the following location:
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+    Copyright (c) 2015. Center for Open Science
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
 --%>
+
 <jsp:directive.include file="../../default/ui/includes/top.jsp"/>
 
 <div id="msg" class="errors">
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/web.xml b/cas-server-webapp/src/main/webapp/WEB-INF/web.xml
index 128b0a37..5f466079 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
 
+    Copyright (c) 2015. Center for Open Science
+
     Licensed to Apereo under one or more contributor license
     agreements. See the NOTICE file distributed with this work
     for additional information regarding copyright ownership.
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/webflow/login/login-webflow.xml b/cas-server-webapp/src/main/webapp/WEB-INF/webflow/login/login-webflow.xml
index 9e6cdcad..669a64cb 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/webflow/login/login-webflow.xml
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/webflow/login/login-webflow.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
+    Copyright (c) 2015. Center for Open Science
+
     Licensed to Apereo under one or more contributor license
     agreements. See the NOTICE file distributed with this work
     for additional information regarding copyright ownership.
@@ -35,6 +37,7 @@
         <transition on="success" to="remoteAuthenticate" />
         <transition on="error" to="ticketGrantingTicketCheck" />
         <transition on="stop" to="stopWebflow" />
+        <transition on="authenticationFailure" to="handleAuthenticationFailure" />
     </action-state>
     <view-state id="stopWebflow" />
 
@@ -206,6 +209,10 @@
         <transition on="RemoteUserFailedLoginException" to="casRemoteUserFailedLoginView" />
         <transition on="OneTimePasswordRequiredException" to="casOtpLoginView"/>
         <transition on="OneTimePasswordFailedLoginException" to="casOtpLoginView"/>
+        <!-- Customized exceptions for delegated login -->
+        <transition on="DelegatedLoginException" to="delegatedLoginGenericErrorView" />
+        <transition on="CasClientLoginException" to="delegatedLoginCasErrorView"/>
+        <transition on="OrcidClientLoginException" to="delegatedLoginOrcidErrorView"/>
         <!-- Unhandled Exceptions -->
         <transition on="UNKNOWN" to="generateLoginTicket"/>
     </action-state>
@@ -279,6 +286,9 @@
     <end-state id="casShouldNotHappenView" view="casShouldNotHappenView" />
     <end-state id="casRemoteUserFailedLoginView" view="casRemoteUserFailedLoginView" />
     <end-state id="casInvalidVerificationKeyView" view="casInvalidVerificationKeyView" />
+    <end-state id="delegatedLoginGenericErrorView" view="delegatedLoginGenericErrorView" />
+    <end-state id="delegatedLoginCasErrorView" view="delegatedLoginCasErrorView" />
+    <end-state id="delegatedLoginOrcidErrorView" view="delegatedLoginOrcidErrorView" />
 
     <end-state id="postView" view="postResponseView">
         <on-entry>
diff --git a/cas-server-webapp/src/main/webapp/WEB-INF/webflow/logout/logout-webflow.xml b/cas-server-webapp/src/main/webapp/WEB-INF/webflow/logout/logout-webflow.xml
index 1a85678e..2108fc00 100644
--- a/cas-server-webapp/src/main/webapp/WEB-INF/webflow/logout/logout-webflow.xml
+++ b/cas-server-webapp/src/main/webapp/WEB-INF/webflow/logout/logout-webflow.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
+    Copyright (c) 2016. Center for Open Science
+
     Licensed to Apereo under one or more contributor license
     agreements. See the NOTICE file distributed with this work
     for additional information regarding copyright ownership.
diff --git a/cas-server-webapp/src/main/webapp/css/cas.css b/cas-server-webapp/src/main/webapp/css/cas.css
index 4dda829d..497c0a7f 100644
--- a/cas-server-webapp/src/main/webapp/css/cas.css
+++ b/cas-server-webapp/src/main/webapp/css/cas.css
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2015. Center for Open Science
+ *
  * Licensed to Apereo under one or more contributor license
  * agreements. See the NOTICE file distributed with this work
  * for additional information regarding copyright ownership.
diff --git a/cas-server-webapp/src/main/webapp/js/cas.js b/cas-server-webapp/src/main/webapp/js/cas.js
index 4af89257..f112166c 100644
--- a/cas-server-webapp/src/main/webapp/js/cas.js
+++ b/cas-server-webapp/src/main/webapp/js/cas.js
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2015. Center for Open Science
+ * Licensed to Apereo under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work
+ * for additional information regarding copyright ownership.
+ * Apereo licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License.  You may obtain a
+ * copy of the License at the following location:
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 head.ready(document, function() {
     head.load("https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js", loadjQueryUI);
diff --git a/cas-server-webapp/src/main/webapp/receptor.jsp b/cas-server-webapp/src/main/webapp/receptor.jsp
index c45bf140..67407701 100755
--- a/cas-server-webapp/src/main/webapp/receptor.jsp
+++ b/cas-server-webapp/src/main/webapp/receptor.jsp
@@ -1,3 +1,21 @@
+<%--
+
+    Copyright (c) 2015. Center for Open Science
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+--%>
+
 <%@page import="org.slf4j.Logger,org.slf4j.LoggerFactory" %>
 <%
 Logger logger = LoggerFactory.getLogger("org.jasig.cas.JSP");
diff --git a/etc/cas.properties b/etc/cas.properties
index 89e1f668..e578b977 100644
--- a/etc/cas.properties
+++ b/etc/cas.properties
@@ -1,4 +1,6 @@
 #
+# Copyright (c) 2015. Center for Open Science
+#
 # Licensed to Apereo under one or more contributor license
 # agreements. See the NOTICE file distributed with this work
 # for additional information regarding copyright ownership.
@@ -17,8 +19,6 @@
 # under the License.
 #
 
-
-
 ####
 #### OSF CAS
 ####
diff --git a/etc/institutions-auth.xsl b/etc/institutions-auth.xsl
index ad9f61f3..7d666aae 100644
--- a/etc/institutions-auth.xsl
+++ b/etc/institutions-auth.xsl
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2016. Center for Open Science
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
     <xsl:template match="/">
         <provider>
diff --git a/etc/log4j2.xml b/etc/log4j2.xml
index 1d519d4f..2fb7b191 100755
--- a/etc/log4j2.xml
+++ b/etc/log4j2.xml
@@ -2,6 +2,8 @@
 
 <!--
 
+    Copyright (c) 2015. Center for Open Science
+
     Licensed to Apereo under one or more contributor license
     agreements. See the NOTICE file distributed with this work
     for additional information regarding copyright ownership.
diff --git a/pom.xml b/pom.xml
index 9b37f4a0..1935fe30 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,6 @@
 <!--
+  ~ Copyright (c) 2015. Center for Open Science
+  ~
   ~ Licensed to Apereo under one or more contributor license
   ~ agreements. See the NOTICE file distributed with this work
   ~ for additional information regarding copyright ownership.