[java-support] 01/02: JPAR-60 - Fix trailing spaces in license headers and Checkstyle config
Tom Zeller
tzeller at dragonacea.biz
Wed Sep 21 13:27:16 EDT 2016
This is an automated email from the git hooks/post-receive script.
tzeller pushed a commit to branch master
in repository java-support.
View the commit online:
http://git.shibboleth.net/view/?p=java-support.git;a=commit;h=0e68d1a175da1195d4a9b810f96c51c4be66b1d9
commit 0e68d1a175da1195d4a9b810f96c51c4be66b1d9
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Wed Sep 21 12:24:14 2016 -0500
JPAR-60 - Fix trailing spaces in license headers and Checkstyle config
---
checkstyle.xml | 2 +-
.../utilities/java/support/annotation/Duration.java | 8 ++++----
.../java/support/annotation/ParameterName.java | 8 ++++----
.../utilities/java/support/annotation/Prototype.java | 8 ++++----
.../java/support/annotation/constraint/Live.java | 8 ++++----
.../java/support/annotation/constraint/Negative.java | 8 ++++----
.../java/support/annotation/constraint/NonNegative.java | 8 ++++----
.../java/support/annotation/constraint/NonPositive.java | 8 ++++----
.../support/annotation/constraint/NonnullAfterInit.java | 8 ++++----
.../support/annotation/constraint/NonnullElements.java | 8 ++++----
.../java/support/annotation/constraint/NotEmpty.java | 8 ++++----
.../java/support/annotation/constraint/NotLive.java | 8 ++++----
.../support/annotation/constraint/NullableElements.java | 8 ++++----
.../java/support/annotation/constraint/Positive.java | 8 ++++----
.../annotation/constraint/ThreadSafeAfterInit.java | 8 ++++----
.../support/annotation/constraint/Unmodifiable.java | 8 ++++----
.../support/annotation/constraint/package-info.java | 8 ++++----
.../utilities/java/support/annotation/package-info.java | 8 ++++----
.../utilities/java/support/codec/Base64Support.java | 8 ++++----
.../utilities/java/support/codec/HTMLEncoder.java | 9 +++++----
.../utilities/java/support/codec/StringDigester.java | 8 ++++----
.../utilities/java/support/codec/package-info.java | 8 ++++----
.../java/support/collection/ClassIndexedSet.java | 8 ++++----
.../support/collection/ClassToInstanceMultiMap.java | 8 ++++----
.../java/support/collection/CollectionSupport.java | 8 ++++----
.../java/support/collection/IndexingObjectStore.java | 8 ++++----
.../java/support/collection/IterableSupport.java | 8 ++++----
.../utilities/java/support/collection/LazyList.java | 8 ++++----
.../utilities/java/support/collection/LazyMap.java | 8 ++++----
.../utilities/java/support/collection/LazySet.java | 8 ++++----
.../collection/LockableClassToInstanceMultiMap.java | 8 ++++----
.../utilities/java/support/collection/Pair.java | 8 ++++----
.../java/support/collection/ValueTypeIndexedMap.java | 8 ++++----
.../utilities/java/support/collection/package-info.java | 8 ++++----
.../AbstractIdentifiableInitializableComponent.java | 8 ++++----
.../AbstractIdentifiedInitializableComponent.java | 8 ++++----
.../component/AbstractInitializableComponent.java | 8 ++++----
.../utilities/java/support/component/Component.java | 8 ++++----
.../component/ComponentInitializationException.java | 8 ++++----
.../java/support/component/ComponentSupport.java | 8 ++++----
.../support/component/DestroyedComponentException.java | 8 ++++----
.../java/support/component/DestructableComponent.java | 8 ++++----
.../java/support/component/IdentifiableComponent.java | 8 ++++----
.../java/support/component/IdentifiedComponent.java | 8 ++++----
.../java/support/component/InitializableComponent.java | 8 ++++----
.../component/UninitializedComponentException.java | 8 ++++----
.../java/support/component/UnmodifiableComponent.java | 8 ++++----
.../component/UnmodifiableComponentException.java | 8 ++++----
.../utilities/java/support/component/package-info.java | 8 ++++----
.../httpclient/FileCachingHttpClientBuilder.java | 8 ++++----
.../java/support/httpclient/HttpClientBuilder.java | 8 ++++----
.../java/support/httpclient/HttpClientSupport.java | 8 ++++----
.../java/support/httpclient/IdleConnectionSweeper.java | 8 ++++----
.../httpclient/InMemoryCachingHttpClientBuilder.java | 8 ++++----
.../java/support/httpclient/RequestConnectionClose.java | 8 ++++----
.../java/support/httpclient/TLSSocketFactory.java | 8 ++++----
.../support/httpclient/TLSSocketFactoryBuilder.java | 8 ++++----
.../utilities/java/support/httpclient/package-info.java | 8 ++++----
.../java/support/logic/AbstractTriStatePredicate.java | 8 ++++----
.../utilities/java/support/logic/AllMatchPredicate.java | 8 ++++----
.../utilities/java/support/logic/AnyMatchPredicate.java | 8 ++++----
.../logic/CaseInsensitiveStringMatchPredicate.java | 8 ++++----
.../utilities/java/support/logic/Constraint.java | 8 ++++----
.../support/logic/ConstraintViolationException.java | 8 ++++----
.../utilities/java/support/logic/FunctionSupport.java | 8 ++++----
.../utilities/java/support/logic/PredicateSupport.java | 8 ++++----
.../java/support/logic/StrategyIndirectedPredicate.java | 8 ++++----
.../java/support/logic/TransformAndCheckFunction.java | 8 ++++----
.../java/support/logic/TrimOrNullStringFunction.java | 8 ++++----
.../utilities/java/support/logic/package-info.java | 8 ++++----
.../utilities/java/support/net/BasicURLComparator.java | 8 ++++----
.../java/support/net/CookieBufferingFilter.java | 8 ++++----
.../utilities/java/support/net/CookieManager.java | 8 ++++----
.../support/net/HttpServletRequestResponseContext.java | 8 ++++----
.../utilities/java/support/net/HttpServletSupport.java | 8 ++++----
.../shibboleth/utilities/java/support/net/IPRange.java | 8 ++++----
.../java/support/net/RequestResponseContextFilter.java | 8 ++++----
.../java/support/net/SimpleURLCanonicalizer.java | 8 ++++----
.../support/net/ThreadLocalHttpServletRequestProxy.java | 8 ++++----
.../net/ThreadLocalHttpServletResponseProxy.java | 8 ++++----
.../utilities/java/support/net/URIComparator.java | 8 ++++----
.../utilities/java/support/net/URIException.java | 8 ++++----
.../utilities/java/support/net/URISupport.java | 8 ++++----
.../utilities/java/support/net/URLBuilder.java | 8 ++++----
.../utilities/java/support/net/package-info.java | 8 ++++----
.../java/support/primitive/LangBearingString.java | 8 ++++----
.../java/support/primitive/LazilyFormattedString.java | 8 ++++----
.../utilities/java/support/primitive/ObjectSupport.java | 8 ++++----
.../utilities/java/support/primitive/StringSupport.java | 8 ++++----
.../utilities/java/support/primitive/package-info.java | 8 ++++----
.../utilities/java/support/resolver/CriteriaSet.java | 8 ++++----
.../utilities/java/support/resolver/Criterion.java | 8 ++++----
.../support/resolver/CriterionPredicateRegistry.java | 8 ++++----
.../utilities/java/support/resolver/Resolver.java | 8 ++++----
.../java/support/resolver/ResolverException.java | 8 ++++----
.../java/support/resolver/ResolverSupport.java | 8 ++++----
.../utilities/java/support/resolver/package-info.java | 8 ++++----
.../utilities/java/support/resource/Resource.java | 8 ++++----
.../utilities/java/support/resource/package-info.java | 8 ++++----
.../java/support/scripting/EvaluableScript.java | 8 ++++----
.../utilities/java/support/scripting/package-info.java | 8 ++++----
.../utilities/java/support/security/AccessControl.java | 8 ++++----
.../java/support/security/AccessControlService.java | 8 ++++----
.../support/security/BasicAccessControlService.java | 8 ++++----
.../java/support/security/BasicKeystoreKeyStrategy.java | 8 ++++----
.../support/security/BasicKeystoreKeyStrategyTool.java | 8 ++++----
.../java/support/security/DataExpiredException.java | 8 ++++----
.../utilities/java/support/security/DataSealer.java | 8 ++++----
.../java/support/security/DataSealerException.java | 8 ++++----
.../java/support/security/DataSealerKeyStrategy.java | 8 ++++----
.../security/DelegatingAccessControlService.java | 8 ++++----
.../java/support/security/IPRangeAccessControl.java | 8 ++++----
.../support/security/IdentifierGenerationStrategy.java | 8 ++++----
.../java/support/security/KeyNotFoundException.java | 8 ++++----
.../security/RandomIdentifierGenerationStrategy.java | 8 ++++----
.../SecureRandomIdentifierGenerationStrategy.java | 8 ++++----
.../security/SelfSignedCertificateGenerator.java | 8 ++++----
.../security/Type4UUIDIdentifierGenerationStrategy.java | 8 ++++----
.../utilities/java/support/security/package-info.java | 8 ++++----
.../java/support/service/AbstractReloadableService.java | 8 ++++----
.../java/support/service/ReloadableService.java | 8 ++++----
.../java/support/service/ServiceException.java | 8 ++++----
.../java/support/service/ServiceableComponent.java | 8 ++++----
.../utilities/java/support/service/package-info.java | 9 +++++----
.../utilities/java/support/velocity/SLF4JLogChute.java | 8 ++++----
.../utilities/java/support/velocity/Template.java | 8 ++++----
.../utilities/java/support/velocity/VelocityEngine.java | 8 ++++----
.../utilities/java/support/velocity/package-info.java | 8 ++++----
.../utilities/java/support/xml/AttributeSupport.java | 8 ++++----
.../utilities/java/support/xml/BasicParserPool.java | 8 ++++----
.../utilities/java/support/xml/ClasspathResolver.java | 8 ++++----
.../utilities/java/support/xml/DOMTypeSupport.java | 8 ++++----
.../utilities/java/support/xml/ElementSupport.java | 8 ++++----
.../utilities/java/support/xml/LoggingErrorHandler.java | 8 ++++----
.../utilities/java/support/xml/NamespaceSupport.java | 8 ++++----
.../utilities/java/support/xml/ParserPool.java | 8 ++++----
.../utilities/java/support/xml/QNameSupport.java | 8 ++++----
.../utilities/java/support/xml/SchemaBuilder.java | 8 ++++----
.../utilities/java/support/xml/SerializeSupport.java | 8 ++++----
.../java/support/xml/SimpleNamespaceContext.java | 8 ++++----
.../utilities/java/support/xml/XMLConstants.java | 8 ++++----
.../utilities/java/support/xml/XMLParserException.java | 8 ++++----
.../shibboleth/utilities/java/support/xml/XMLSpace.java | 8 ++++----
.../utilities/java/support/xml/package-info.java | 8 ++++----
.../utilities/java/support/codec/Base64SupportTest.java | 8 ++++----
.../utilities/java/support/codec/HTMLEncoderTest.java | 9 +++++----
.../java/support/codec/StringDigesterTest.java | 8 ++++----
.../java/support/collection/ClassIndexedSetTest.java | 8 ++++----
.../support/collection/ClassToInstanceMultiMapTest.java | 8 ++++----
.../java/support/collection/CollectionTest.java | 8 ++++----
.../support/collection/IndexingObjectStoreTest.java | 8 ++++----
.../java/support/collection/IterableSupportTest.java | 8 ++++----
.../utilities/java/support/collection/LazyListTest.java | 8 ++++----
.../utilities/java/support/collection/LazyMapTest.java | 8 ++++----
.../utilities/java/support/collection/LazySetTest.java | 8 ++++----
.../utilities/java/support/collection/ListTest.java | 8 ++++----
.../utilities/java/support/collection/MapTest.java | 8 ++++----
.../utilities/java/support/collection/PairTest.java | 8 ++++----
.../support/collection/ValueTypeIndexedMapTest.java | 8 ++++----
.../AbstractIdentifiedInitializableComponentTest.java | 8 ++++----
.../component/AbstractInitializableComponentTest.java | 8 ++++----
.../java/support/component/ComponentSupportTest.java | 8 ++++----
.../java/support/httpclient/HttpClientBuilderTest.java | 17 +++++++++++++++++
.../support/httpclient/IdleConectionSweeperTest.java | 8 ++++----
.../java/support/logic/AllMatchPredicateTest.java | 8 ++++----
.../java/support/logic/AnyMatchPredicateTest.java | 8 ++++----
.../logic/CaseInsensitiveStringMatchPredicateTest.java | 8 ++++----
.../logic/ComponentInitializationExceptionFunction.java | 8 ++++----
.../ComponentInitializationExceptionPredicate.java | 8 ++++----
.../utilities/java/support/logic/ExceptionFunction.java | 8 ++++----
.../java/support/logic/ExceptionPredicate.java | 8 ++++----
.../support/logic/TransformAndCheckFunctionTest.java | 8 ++++----
.../support/logic/TrimOrNullStringFunctionTest.java | 8 ++++----
.../utilities/java/support/net/CookieManagerTest.java | 8 ++++----
.../net/HttpServletRequestResponseContextTest.java | 8 ++++----
.../java/support/net/HttpServletSupportTest.java | 8 ++++----
.../utilities/java/support/net/IPRangeTest.java | 17 +++++++++++++++++
.../support/net/RequestResponseContextFilterTest.java | 8 ++++----
.../java/support/net/SimpleURLCanonicalizerTest.java | 8 ++++----
.../net/ThreadLocalHttpServletRequestProxyTest.java | 8 ++++----
.../net/ThreadLocalHttpServletResponseProxyTest.java | 8 ++++----
.../utilities/java/support/net/URISupportTest.java | 8 ++++----
.../utilities/java/support/net/URLBuilderTest.java | 8 ++++----
.../support/primitive/LazilyFormattedStringTest.java | 8 ++++----
.../java/support/primitive/ObjectSupportTest.java | 8 ++++----
.../java/support/primitive/StringSupportTest.java | 8 ++++----
.../java/support/resolver/CriteriaSetTest.java | 8 ++++----
.../resolver/CriterionPredicateRegistryTest.java | 8 ++++----
.../java/support/resolver/EvaluableFooCriterion.java | 8 ++++----
.../support/resolver/EvaluableTestFooCriterion.java | 8 ++++----
.../shibboleth/utilities/java/support/resolver/Foo.java | 8 ++++----
.../utilities/java/support/resolver/FooPredicate.java | 8 ++++----
.../java/support/resolver/ResolverSupportTest.java | 8 ++++----
.../utilities/java/support/resolver/TestCriterion.java | 8 ++++----
.../java/support/resource/TestResourceConverter.java | 8 ++++----
.../java/support/scripting/EvaluableScriptTest.java | 8 ++++----
.../support/security/BasicKeystoreKeyStrategyTest.java | 8 ++++----
.../utilities/java/support/security/DataSealerTest.java | 8 ++++----
.../RandomIdentifierGenerationStrategyTest.java | 17 +++++++++++++++++
.../SecureRandomIdentifierGenerationStrategyTest.java | 17 +++++++++++++++++
.../Type4UUIDIdentifierGenerationStrategyTest.java | 17 +++++++++++++++++
.../java/support/xml/AttributeSupportTest.java | 8 ++++----
.../utilities/java/support/xml/BasicParserPoolTest.java | 8 ++++----
.../utilities/java/support/xml/DomTypeSupportTest.java | 8 ++++----
.../utilities/java/support/xml/ElementSupportTest.java | 8 ++++----
.../java/support/xml/NamespaceSupportTest.java | 8 ++++----
.../utilities/java/support/xml/QNameSupportTest.java | 8 ++++----
.../utilities/java/support/xml/SchemaBuilderTest.java | 8 ++++----
.../java/support/xml/SerializeSupportTest.java | 8 ++++----
.../java/support/xml/SimpleNamespaceContextTest.java | 8 ++++----
.../utilities/java/support/xml/XMLSpaceTest.java | 8 ++++----
211 files changed, 909 insertions(+), 821 deletions(-)
diff --git a/checkstyle.xml b/checkstyle.xml
index e08350c..32b206c 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -110,7 +110,7 @@
<property name="max" value="1000"/>
</module>
<module name="Header">
- <property name="header" value="/*\n * Licensed to the University Corporation for Advanced Internet Development, \n * Inc. (UCAID) under one or more contributor license agreements. See the \n * NOTICE file distributed with this work for additional information regarding\n * copyright ownership. The UCAID licenses this file to You under the Apache \n * License, Version 2.0 (the "License"); you may not use this file except in \n * compliance with the License. You may obtain a [...]
+ <property name="header" value="/*\n * Licensed to the University Corporation for Advanced Internet Development,\n * Inc. (UCAID) under one or more contributor license agreements. See the\n * NOTICE file distributed with this work for additional information regarding\n * copyright ownership. The UCAID licenses this file to You under the Apache\n * License, Version 2.0 (the "License"); you may not use this file except in\n * compliance with the License. You may obtain a cop [...]
</module>
<module name="JavadocPackage"/>
</module>
\ No newline at end of file
diff --git a/src/main/java/net/shibboleth/utilities/java/support/annotation/Duration.java b/src/main/java/net/shibboleth/utilities/java/support/annotation/Duration.java
index a99f331..429e918 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/annotation/Duration.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/annotation/Duration.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/annotation/ParameterName.java b/src/main/java/net/shibboleth/utilities/java/support/annotation/ParameterName.java
index 666ee15..d1b020b 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/annotation/ParameterName.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/annotation/ParameterName.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/annotation/Prototype.java b/src/main/java/net/shibboleth/utilities/java/support/annotation/Prototype.java
index 46230cc..63fd33b 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/annotation/Prototype.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/annotation/Prototype.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Live.java b/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Live.java
index 5b38a6f..6269aaa 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Live.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Live.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Negative.java b/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Negative.java
index c56b4b9..83a50df 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Negative.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Negative.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonNegative.java b/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonNegative.java
index 77b84a3..dc106a6 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonNegative.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonNegative.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonPositive.java b/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonPositive.java
index 1f45eb3..901cd96 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonPositive.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonPositive.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonnullAfterInit.java b/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonnullAfterInit.java
index e9d8e2b..395decd 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonnullAfterInit.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonnullAfterInit.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonnullElements.java b/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonnullElements.java
index 05e420b..28fa0f9 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonnullElements.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonnullElements.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NotEmpty.java b/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NotEmpty.java
index f90fe7d..3318c55 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NotEmpty.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NotEmpty.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NotLive.java b/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NotLive.java
index 0d97d9a..066ec1c 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NotLive.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NotLive.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NullableElements.java b/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NullableElements.java
index 304a436..660877d 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NullableElements.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NullableElements.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Positive.java b/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Positive.java
index 1fb840d..3e2d8e3 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Positive.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Positive.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/ThreadSafeAfterInit.java b/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/ThreadSafeAfterInit.java
index be5d735..c5af47f 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/ThreadSafeAfterInit.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/ThreadSafeAfterInit.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Unmodifiable.java b/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Unmodifiable.java
index 40f0d68..1f3f5f9 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Unmodifiable.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Unmodifiable.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/package-info.java b/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/package-info.java
index fda6d08..5423f09 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/package-info.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/package-info.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/annotation/package-info.java b/src/main/java/net/shibboleth/utilities/java/support/annotation/package-info.java
index ef9c85a..b396721 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/annotation/package-info.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/annotation/package-info.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/codec/Base64Support.java b/src/main/java/net/shibboleth/utilities/java/support/codec/Base64Support.java
index e39957d..1218ef5 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/codec/Base64Support.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/codec/Base64Support.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/codec/HTMLEncoder.java b/src/main/java/net/shibboleth/utilities/java/support/codec/HTMLEncoder.java
index 17ad6d9..b75d321 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/codec/HTMLEncoder.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/codec/HTMLEncoder.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
/**
* OWASP Enterprise Security API (ESAPI)
*
diff --git a/src/main/java/net/shibboleth/utilities/java/support/codec/StringDigester.java b/src/main/java/net/shibboleth/utilities/java/support/codec/StringDigester.java
index 88b29bf..d5d3c04 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/codec/StringDigester.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/codec/StringDigester.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/codec/package-info.java b/src/main/java/net/shibboleth/utilities/java/support/codec/package-info.java
index bedd237..760d3ee 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/codec/package-info.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/codec/package-info.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/collection/ClassIndexedSet.java b/src/main/java/net/shibboleth/utilities/java/support/collection/ClassIndexedSet.java
index 99fdb56..b86a13e 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/collection/ClassIndexedSet.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/collection/ClassIndexedSet.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMap.java b/src/main/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMap.java
index 4427aa9..729f084 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMap.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMap.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/collection/CollectionSupport.java b/src/main/java/net/shibboleth/utilities/java/support/collection/CollectionSupport.java
index 72d687f..24e1e14 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/collection/CollectionSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/collection/CollectionSupport.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStore.java b/src/main/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStore.java
index 4fc689a..44c0761 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStore.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStore.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/collection/IterableSupport.java b/src/main/java/net/shibboleth/utilities/java/support/collection/IterableSupport.java
index 1ad73a2..1639ff6 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/collection/IterableSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/collection/IterableSupport.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/collection/LazyList.java b/src/main/java/net/shibboleth/utilities/java/support/collection/LazyList.java
index ba2368b..729d23b 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/collection/LazyList.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/collection/LazyList.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/collection/LazyMap.java b/src/main/java/net/shibboleth/utilities/java/support/collection/LazyMap.java
index 46f20c1..803b1b4 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/collection/LazyMap.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/collection/LazyMap.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/collection/LazySet.java b/src/main/java/net/shibboleth/utilities/java/support/collection/LazySet.java
index 8bdfe42..1a87c05 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/collection/LazySet.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/collection/LazySet.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/collection/LockableClassToInstanceMultiMap.java b/src/main/java/net/shibboleth/utilities/java/support/collection/LockableClassToInstanceMultiMap.java
index 5d7d658..54935af 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/collection/LockableClassToInstanceMultiMap.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/collection/LockableClassToInstanceMultiMap.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/collection/Pair.java b/src/main/java/net/shibboleth/utilities/java/support/collection/Pair.java
index 800d4f1..0b70932 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/collection/Pair.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/collection/Pair.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/collection/ValueTypeIndexedMap.java b/src/main/java/net/shibboleth/utilities/java/support/collection/ValueTypeIndexedMap.java
index f3b5406..7fbe8f2 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/collection/ValueTypeIndexedMap.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/collection/ValueTypeIndexedMap.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/collection/package-info.java b/src/main/java/net/shibboleth/utilities/java/support/collection/package-info.java
index 47038c2..a8c3d19 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/collection/package-info.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/collection/package-info.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiableInitializableComponent.java b/src/main/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiableInitializableComponent.java
index 799207f..026c015 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiableInitializableComponent.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiableInitializableComponent.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiedInitializableComponent.java b/src/main/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiedInitializableComponent.java
index cc943fc..8ac4501 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiedInitializableComponent.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiedInitializableComponent.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/component/AbstractInitializableComponent.java b/src/main/java/net/shibboleth/utilities/java/support/component/AbstractInitializableComponent.java
index 294b45f..1945a4a 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/component/AbstractInitializableComponent.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/component/AbstractInitializableComponent.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/component/Component.java b/src/main/java/net/shibboleth/utilities/java/support/component/Component.java
index 2289374..c5b0170 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/component/Component.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/component/Component.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/component/ComponentInitializationException.java b/src/main/java/net/shibboleth/utilities/java/support/component/ComponentInitializationException.java
index 578365c..456de7f 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/component/ComponentInitializationException.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/component/ComponentInitializationException.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/component/ComponentSupport.java b/src/main/java/net/shibboleth/utilities/java/support/component/ComponentSupport.java
index 14cad1f..91dc369 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/component/ComponentSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/component/ComponentSupport.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/component/DestroyedComponentException.java b/src/main/java/net/shibboleth/utilities/java/support/component/DestroyedComponentException.java
index fbae687..00187d8 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/component/DestroyedComponentException.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/component/DestroyedComponentException.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/component/DestructableComponent.java b/src/main/java/net/shibboleth/utilities/java/support/component/DestructableComponent.java
index 0301477..9cb6583 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/component/DestructableComponent.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/component/DestructableComponent.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/component/IdentifiableComponent.java b/src/main/java/net/shibboleth/utilities/java/support/component/IdentifiableComponent.java
index a915ac9..1fe0cca 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/component/IdentifiableComponent.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/component/IdentifiableComponent.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/component/IdentifiedComponent.java b/src/main/java/net/shibboleth/utilities/java/support/component/IdentifiedComponent.java
index bbf80b6..3c6ed85 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/component/IdentifiedComponent.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/component/IdentifiedComponent.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/component/InitializableComponent.java b/src/main/java/net/shibboleth/utilities/java/support/component/InitializableComponent.java
index 9cb770c..8fe5f5c 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/component/InitializableComponent.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/component/InitializableComponent.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/component/UninitializedComponentException.java b/src/main/java/net/shibboleth/utilities/java/support/component/UninitializedComponentException.java
index 9b7f5e0..36bc224 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/component/UninitializedComponentException.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/component/UninitializedComponentException.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/component/UnmodifiableComponent.java b/src/main/java/net/shibboleth/utilities/java/support/component/UnmodifiableComponent.java
index 987dc37..27db0fd 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/component/UnmodifiableComponent.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/component/UnmodifiableComponent.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/component/UnmodifiableComponentException.java b/src/main/java/net/shibboleth/utilities/java/support/component/UnmodifiableComponentException.java
index 6d5b8f0..4369f74 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/component/UnmodifiableComponentException.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/component/UnmodifiableComponentException.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/component/package-info.java b/src/main/java/net/shibboleth/utilities/java/support/component/package-info.java
index 98aec1a..8ce8b33 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/component/package-info.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/component/package-info.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/httpclient/FileCachingHttpClientBuilder.java b/src/main/java/net/shibboleth/utilities/java/support/httpclient/FileCachingHttpClientBuilder.java
index 3f43e6b..ca662f8 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/httpclient/FileCachingHttpClientBuilder.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/httpclient/FileCachingHttpClientBuilder.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java b/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java
index 5de61e0..21949c7 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientSupport.java b/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientSupport.java
index f734261..2d948a5 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientSupport.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/httpclient/IdleConnectionSweeper.java b/src/main/java/net/shibboleth/utilities/java/support/httpclient/IdleConnectionSweeper.java
index ea14e7d..0f81584 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/httpclient/IdleConnectionSweeper.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/httpclient/IdleConnectionSweeper.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/httpclient/InMemoryCachingHttpClientBuilder.java b/src/main/java/net/shibboleth/utilities/java/support/httpclient/InMemoryCachingHttpClientBuilder.java
index 83af6b6..720648e 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/httpclient/InMemoryCachingHttpClientBuilder.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/httpclient/InMemoryCachingHttpClientBuilder.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/httpclient/RequestConnectionClose.java b/src/main/java/net/shibboleth/utilities/java/support/httpclient/RequestConnectionClose.java
index 4af05c2..b5fd373 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/httpclient/RequestConnectionClose.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/httpclient/RequestConnectionClose.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/httpclient/TLSSocketFactory.java b/src/main/java/net/shibboleth/utilities/java/support/httpclient/TLSSocketFactory.java
index b09648a..64d0360 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/httpclient/TLSSocketFactory.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/httpclient/TLSSocketFactory.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/httpclient/TLSSocketFactoryBuilder.java b/src/main/java/net/shibboleth/utilities/java/support/httpclient/TLSSocketFactoryBuilder.java
index a6727f0..bfef4a9 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/httpclient/TLSSocketFactoryBuilder.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/httpclient/TLSSocketFactoryBuilder.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/httpclient/package-info.java b/src/main/java/net/shibboleth/utilities/java/support/httpclient/package-info.java
index 2fba86b..06cb8ee 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/httpclient/package-info.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/httpclient/package-info.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/AbstractTriStatePredicate.java b/src/main/java/net/shibboleth/utilities/java/support/logic/AbstractTriStatePredicate.java
index e59e759..e322fe3 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/AbstractTriStatePredicate.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/AbstractTriStatePredicate.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/AllMatchPredicate.java b/src/main/java/net/shibboleth/utilities/java/support/logic/AllMatchPredicate.java
index 8ca3a1a..f3f1ef7 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/AllMatchPredicate.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/AllMatchPredicate.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/AnyMatchPredicate.java b/src/main/java/net/shibboleth/utilities/java/support/logic/AnyMatchPredicate.java
index 98eded2..ff46c4f 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/AnyMatchPredicate.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/AnyMatchPredicate.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/CaseInsensitiveStringMatchPredicate.java b/src/main/java/net/shibboleth/utilities/java/support/logic/CaseInsensitiveStringMatchPredicate.java
index 46d34c9..37e7919 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/CaseInsensitiveStringMatchPredicate.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/CaseInsensitiveStringMatchPredicate.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/Constraint.java b/src/main/java/net/shibboleth/utilities/java/support/logic/Constraint.java
index 5ef6d40..a659ad3 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/Constraint.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/Constraint.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/ConstraintViolationException.java b/src/main/java/net/shibboleth/utilities/java/support/logic/ConstraintViolationException.java
index e86eb45..e37977b 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/ConstraintViolationException.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/ConstraintViolationException.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/FunctionSupport.java b/src/main/java/net/shibboleth/utilities/java/support/logic/FunctionSupport.java
index e980127..d0c4a62 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/FunctionSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/FunctionSupport.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateSupport.java b/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateSupport.java
index 90510ed..4f6e764 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateSupport.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/StrategyIndirectedPredicate.java b/src/main/java/net/shibboleth/utilities/java/support/logic/StrategyIndirectedPredicate.java
index 3b0a2e1..3903887 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/StrategyIndirectedPredicate.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/StrategyIndirectedPredicate.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunction.java b/src/main/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunction.java
index 04e04ff..e16aa18 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunction.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunction.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunction.java b/src/main/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunction.java
index 7a8655d..325f30f 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunction.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunction.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/package-info.java b/src/main/java/net/shibboleth/utilities/java/support/logic/package-info.java
index 2c00767..2939ad3 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/package-info.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/package-info.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/BasicURLComparator.java b/src/main/java/net/shibboleth/utilities/java/support/net/BasicURLComparator.java
index 6c97115..a77f346 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/BasicURLComparator.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/BasicURLComparator.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java b/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java
index 100d9fa..bb9a63d 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/CookieManager.java b/src/main/java/net/shibboleth/utilities/java/support/net/CookieManager.java
index 59a7eae..9f7e84e 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/CookieManager.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/CookieManager.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletRequestResponseContext.java b/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletRequestResponseContext.java
index 8047e03..dac7f7f 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletRequestResponseContext.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletRequestResponseContext.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletSupport.java b/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletSupport.java
index 284c7d9..4b48c60 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletSupport.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/IPRange.java b/src/main/java/net/shibboleth/utilities/java/support/net/IPRange.java
index c5d091b..d39cf92 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/IPRange.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/IPRange.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilter.java b/src/main/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilter.java
index 2f38649..e2d91da 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilter.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilter.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/SimpleURLCanonicalizer.java b/src/main/java/net/shibboleth/utilities/java/support/net/SimpleURLCanonicalizer.java
index eef6bb7..a0352d4 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/SimpleURLCanonicalizer.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/SimpleURLCanonicalizer.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxy.java b/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxy.java
index 2b93fbe..eb3c7a2 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxy.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxy.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxy.java b/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxy.java
index 337c82f..1c66794 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxy.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxy.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/URIComparator.java b/src/main/java/net/shibboleth/utilities/java/support/net/URIComparator.java
index f638f6b..28e2dba 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/URIComparator.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/URIComparator.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/URIException.java b/src/main/java/net/shibboleth/utilities/java/support/net/URIException.java
index 3410a40..6994826 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/URIException.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/URIException.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/URISupport.java b/src/main/java/net/shibboleth/utilities/java/support/net/URISupport.java
index 4d37856..80c39a4 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/URISupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/URISupport.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/URLBuilder.java b/src/main/java/net/shibboleth/utilities/java/support/net/URLBuilder.java
index d7a2e52..cd40616 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/URLBuilder.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/URLBuilder.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/package-info.java b/src/main/java/net/shibboleth/utilities/java/support/net/package-info.java
index 24e4844..deb616a 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/package-info.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/package-info.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/primitive/LangBearingString.java b/src/main/java/net/shibboleth/utilities/java/support/primitive/LangBearingString.java
index 08fb532..07fb82d 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/primitive/LangBearingString.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/primitive/LangBearingString.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/primitive/LazilyFormattedString.java b/src/main/java/net/shibboleth/utilities/java/support/primitive/LazilyFormattedString.java
index f7ae7be..71ee334 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/primitive/LazilyFormattedString.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/primitive/LazilyFormattedString.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/primitive/ObjectSupport.java b/src/main/java/net/shibboleth/utilities/java/support/primitive/ObjectSupport.java
index b50f550..38b1580 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/primitive/ObjectSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/primitive/ObjectSupport.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/primitive/StringSupport.java b/src/main/java/net/shibboleth/utilities/java/support/primitive/StringSupport.java
index 3195089..39f2110 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/primitive/StringSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/primitive/StringSupport.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/primitive/package-info.java b/src/main/java/net/shibboleth/utilities/java/support/primitive/package-info.java
index d2144d8..92eef58 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/primitive/package-info.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/primitive/package-info.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/resolver/CriteriaSet.java b/src/main/java/net/shibboleth/utilities/java/support/resolver/CriteriaSet.java
index 55f9586..6e0bc4f 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/resolver/CriteriaSet.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/resolver/CriteriaSet.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/resolver/Criterion.java b/src/main/java/net/shibboleth/utilities/java/support/resolver/Criterion.java
index 8798eac..e7c8f41 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/resolver/Criterion.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/resolver/Criterion.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistry.java b/src/main/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistry.java
index 809f126..a27cc56 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistry.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistry.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/resolver/Resolver.java b/src/main/java/net/shibboleth/utilities/java/support/resolver/Resolver.java
index ed29b5f..d79f995 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/resolver/Resolver.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/resolver/Resolver.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/resolver/ResolverException.java b/src/main/java/net/shibboleth/utilities/java/support/resolver/ResolverException.java
index 9389e83..366bd1d 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/resolver/ResolverException.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/resolver/ResolverException.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/resolver/ResolverSupport.java b/src/main/java/net/shibboleth/utilities/java/support/resolver/ResolverSupport.java
index a1a4b19..d05bde7 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/resolver/ResolverSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/resolver/ResolverSupport.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/resolver/package-info.java b/src/main/java/net/shibboleth/utilities/java/support/resolver/package-info.java
index b29fc6b..67980ad 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/resolver/package-info.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/resolver/package-info.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/resource/Resource.java b/src/main/java/net/shibboleth/utilities/java/support/resource/Resource.java
index 1fd69b9..9bf3131 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/resource/Resource.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/resource/Resource.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/resource/package-info.java b/src/main/java/net/shibboleth/utilities/java/support/resource/package-info.java
index 769560a..1448fbb 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/resource/package-info.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/resource/package-info.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java b/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java
index 7c23e06..11bcdef 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/scripting/package-info.java b/src/main/java/net/shibboleth/utilities/java/support/scripting/package-info.java
index fb3c273..2547a5c 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/scripting/package-info.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/scripting/package-info.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/AccessControl.java b/src/main/java/net/shibboleth/utilities/java/support/security/AccessControl.java
index 48c95f2..a7ac9ad 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/AccessControl.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/AccessControl.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/AccessControlService.java b/src/main/java/net/shibboleth/utilities/java/support/security/AccessControlService.java
index 2c42a3c..08493a5 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/AccessControlService.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/AccessControlService.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/BasicAccessControlService.java b/src/main/java/net/shibboleth/utilities/java/support/security/BasicAccessControlService.java
index 214ed14..2844549 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/BasicAccessControlService.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/BasicAccessControlService.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategy.java b/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategy.java
index 3fe90de..7843e3f 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategy.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategy.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTool.java b/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTool.java
index b78555a..8a1cad0 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTool.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTool.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/DataExpiredException.java b/src/main/java/net/shibboleth/utilities/java/support/security/DataExpiredException.java
index 8d22095..2ff5aa1 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/DataExpiredException.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/DataExpiredException.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/DataSealer.java b/src/main/java/net/shibboleth/utilities/java/support/security/DataSealer.java
index 740b7e0..e106458 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/DataSealer.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/DataSealer.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/DataSealerException.java b/src/main/java/net/shibboleth/utilities/java/support/security/DataSealerException.java
index 7e3372a..2b214d2 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/DataSealerException.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/DataSealerException.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/DataSealerKeyStrategy.java b/src/main/java/net/shibboleth/utilities/java/support/security/DataSealerKeyStrategy.java
index 9e1f2e0..1db994f 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/DataSealerKeyStrategy.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/DataSealerKeyStrategy.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/DelegatingAccessControlService.java b/src/main/java/net/shibboleth/utilities/java/support/security/DelegatingAccessControlService.java
index 004cb8a..6b1c316 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/DelegatingAccessControlService.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/DelegatingAccessControlService.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/IPRangeAccessControl.java b/src/main/java/net/shibboleth/utilities/java/support/security/IPRangeAccessControl.java
index 8649634..c4709e7 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/IPRangeAccessControl.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/IPRangeAccessControl.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/IdentifierGenerationStrategy.java b/src/main/java/net/shibboleth/utilities/java/support/security/IdentifierGenerationStrategy.java
index d86c61d..fe85a52 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/IdentifierGenerationStrategy.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/IdentifierGenerationStrategy.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/KeyNotFoundException.java b/src/main/java/net/shibboleth/utilities/java/support/security/KeyNotFoundException.java
index 4356c09..ef6eaf1 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/KeyNotFoundException.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/KeyNotFoundException.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/RandomIdentifierGenerationStrategy.java b/src/main/java/net/shibboleth/utilities/java/support/security/RandomIdentifierGenerationStrategy.java
index 19a7600..a47919f 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/RandomIdentifierGenerationStrategy.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/RandomIdentifierGenerationStrategy.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/SecureRandomIdentifierGenerationStrategy.java b/src/main/java/net/shibboleth/utilities/java/support/security/SecureRandomIdentifierGenerationStrategy.java
index ebfdb4e..10d5307 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/SecureRandomIdentifierGenerationStrategy.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/SecureRandomIdentifierGenerationStrategy.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/SelfSignedCertificateGenerator.java b/src/main/java/net/shibboleth/utilities/java/support/security/SelfSignedCertificateGenerator.java
index dbd803b..cd32649 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/SelfSignedCertificateGenerator.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/SelfSignedCertificateGenerator.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/Type4UUIDIdentifierGenerationStrategy.java b/src/main/java/net/shibboleth/utilities/java/support/security/Type4UUIDIdentifierGenerationStrategy.java
index 8fd98be..29f27e8 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/Type4UUIDIdentifierGenerationStrategy.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/Type4UUIDIdentifierGenerationStrategy.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/package-info.java b/src/main/java/net/shibboleth/utilities/java/support/security/package-info.java
index f0a0430..d71028e 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/package-info.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/package-info.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java b/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java
index a5a0509..902f20d 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/service/ReloadableService.java b/src/main/java/net/shibboleth/utilities/java/support/service/ReloadableService.java
index 668ae68..c36e343 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/service/ReloadableService.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/service/ReloadableService.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/service/ServiceException.java b/src/main/java/net/shibboleth/utilities/java/support/service/ServiceException.java
index f259d52..0feffcd 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/service/ServiceException.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/service/ServiceException.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/service/ServiceableComponent.java b/src/main/java/net/shibboleth/utilities/java/support/service/ServiceableComponent.java
index a1b4147..cde95c5 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/service/ServiceableComponent.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/service/ServiceableComponent.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/service/package-info.java b/src/main/java/net/shibboleth/utilities/java/support/service/package-info.java
index 148d159..449065b 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/service/package-info.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/service/package-info.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
/**
* Service support for Shibbleth projects.<br/>
* A service is something reloads instances of serviceable components.
diff --git a/src/main/java/net/shibboleth/utilities/java/support/velocity/SLF4JLogChute.java b/src/main/java/net/shibboleth/utilities/java/support/velocity/SLF4JLogChute.java
index a856e2b..ae91ddb 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/velocity/SLF4JLogChute.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/velocity/SLF4JLogChute.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/velocity/Template.java b/src/main/java/net/shibboleth/utilities/java/support/velocity/Template.java
index df05b46..862beee 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/velocity/Template.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/velocity/Template.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/velocity/VelocityEngine.java b/src/main/java/net/shibboleth/utilities/java/support/velocity/VelocityEngine.java
index 6caba00..b1f917d 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/velocity/VelocityEngine.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/velocity/VelocityEngine.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/velocity/package-info.java b/src/main/java/net/shibboleth/utilities/java/support/velocity/package-info.java
index 75fc8cf..beb7024 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/velocity/package-info.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/velocity/package-info.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/AttributeSupport.java b/src/main/java/net/shibboleth/utilities/java/support/xml/AttributeSupport.java
index ca3f82c..62cbd92 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/AttributeSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/AttributeSupport.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java b/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java
index 3502014..a98c612 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/ClasspathResolver.java b/src/main/java/net/shibboleth/utilities/java/support/xml/ClasspathResolver.java
index 8568f45..3bea6ed 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/ClasspathResolver.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/ClasspathResolver.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/DOMTypeSupport.java b/src/main/java/net/shibboleth/utilities/java/support/xml/DOMTypeSupport.java
index 9c815f3..60b93de 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/DOMTypeSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/DOMTypeSupport.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/ElementSupport.java b/src/main/java/net/shibboleth/utilities/java/support/xml/ElementSupport.java
index e4c3b1f..c701c1c 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/ElementSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/ElementSupport.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/LoggingErrorHandler.java b/src/main/java/net/shibboleth/utilities/java/support/xml/LoggingErrorHandler.java
index 2ba70c9..4f4393c 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/LoggingErrorHandler.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/LoggingErrorHandler.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/NamespaceSupport.java b/src/main/java/net/shibboleth/utilities/java/support/xml/NamespaceSupport.java
index 56a3d18..77e7182 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/NamespaceSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/NamespaceSupport.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/ParserPool.java b/src/main/java/net/shibboleth/utilities/java/support/xml/ParserPool.java
index 19cba5e..726f25e 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/ParserPool.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/ParserPool.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/QNameSupport.java b/src/main/java/net/shibboleth/utilities/java/support/xml/QNameSupport.java
index b553fae..c3334df 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/QNameSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/QNameSupport.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/SchemaBuilder.java b/src/main/java/net/shibboleth/utilities/java/support/xml/SchemaBuilder.java
index 844d028..d946c37 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/SchemaBuilder.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/SchemaBuilder.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/SerializeSupport.java b/src/main/java/net/shibboleth/utilities/java/support/xml/SerializeSupport.java
index 352662d..7f49664 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/SerializeSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/SerializeSupport.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/SimpleNamespaceContext.java b/src/main/java/net/shibboleth/utilities/java/support/xml/SimpleNamespaceContext.java
index f77f981..a384e60 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/SimpleNamespaceContext.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/SimpleNamespaceContext.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/XMLConstants.java b/src/main/java/net/shibboleth/utilities/java/support/xml/XMLConstants.java
index 3165d7c..721b80a 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/XMLConstants.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/XMLConstants.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/XMLParserException.java b/src/main/java/net/shibboleth/utilities/java/support/xml/XMLParserException.java
index 01ffbc6..5fb9bf3 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/XMLParserException.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/XMLParserException.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/XMLSpace.java b/src/main/java/net/shibboleth/utilities/java/support/xml/XMLSpace.java
index fd14eb3..8dbbfa3 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/XMLSpace.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/XMLSpace.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/package-info.java b/src/main/java/net/shibboleth/utilities/java/support/xml/package-info.java
index beff3d1..470b932 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/package-info.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/package-info.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/codec/Base64SupportTest.java b/src/test/java/net/shibboleth/utilities/java/support/codec/Base64SupportTest.java
index e0997e5..74206f9 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/codec/Base64SupportTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/codec/Base64SupportTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/codec/HTMLEncoderTest.java b/src/test/java/net/shibboleth/utilities/java/support/codec/HTMLEncoderTest.java
index af41c81..e40ed83 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/codec/HTMLEncoderTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/codec/HTMLEncoderTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
/**
* OWASP Enterprise Security API (ESAPI)
*
diff --git a/src/test/java/net/shibboleth/utilities/java/support/codec/StringDigesterTest.java b/src/test/java/net/shibboleth/utilities/java/support/codec/StringDigesterTest.java
index 9497410..92d2f6f 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/codec/StringDigesterTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/codec/StringDigesterTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/collection/ClassIndexedSetTest.java b/src/test/java/net/shibboleth/utilities/java/support/collection/ClassIndexedSetTest.java
index dbd7f81..1957a6d 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/collection/ClassIndexedSetTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/collection/ClassIndexedSetTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMapTest.java b/src/test/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMapTest.java
index c49dc49..28f2724 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMapTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMapTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/collection/CollectionTest.java b/src/test/java/net/shibboleth/utilities/java/support/collection/CollectionTest.java
index 9377193..2c64006 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/collection/CollectionTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/collection/CollectionTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStoreTest.java b/src/test/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStoreTest.java
index cff4ed3..ddbdfc0 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStoreTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStoreTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/collection/IterableSupportTest.java b/src/test/java/net/shibboleth/utilities/java/support/collection/IterableSupportTest.java
index c151535..3ca3c9a 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/collection/IterableSupportTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/collection/IterableSupportTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/collection/LazyListTest.java b/src/test/java/net/shibboleth/utilities/java/support/collection/LazyListTest.java
index dc0089c..d1fa5bc 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/collection/LazyListTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/collection/LazyListTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/collection/LazyMapTest.java b/src/test/java/net/shibboleth/utilities/java/support/collection/LazyMapTest.java
index 64e8a2d..700dab4 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/collection/LazyMapTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/collection/LazyMapTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/collection/LazySetTest.java b/src/test/java/net/shibboleth/utilities/java/support/collection/LazySetTest.java
index 0ede1fc..121a64b 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/collection/LazySetTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/collection/LazySetTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/collection/ListTest.java b/src/test/java/net/shibboleth/utilities/java/support/collection/ListTest.java
index f5ef882..bcf2548 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/collection/ListTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/collection/ListTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/collection/MapTest.java b/src/test/java/net/shibboleth/utilities/java/support/collection/MapTest.java
index 9fb9583..2423247 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/collection/MapTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/collection/MapTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/collection/PairTest.java b/src/test/java/net/shibboleth/utilities/java/support/collection/PairTest.java
index d67adf1..e4623b5 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/collection/PairTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/collection/PairTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/collection/ValueTypeIndexedMapTest.java b/src/test/java/net/shibboleth/utilities/java/support/collection/ValueTypeIndexedMapTest.java
index 8108829..4b8ba3c 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/collection/ValueTypeIndexedMapTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/collection/ValueTypeIndexedMapTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiedInitializableComponentTest.java b/src/test/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiedInitializableComponentTest.java
index 02c9ef7..9414383 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiedInitializableComponentTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiedInitializableComponentTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/component/AbstractInitializableComponentTest.java b/src/test/java/net/shibboleth/utilities/java/support/component/AbstractInitializableComponentTest.java
index 041b201..d00f44d 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/component/AbstractInitializableComponentTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/component/AbstractInitializableComponentTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/component/ComponentSupportTest.java b/src/test/java/net/shibboleth/utilities/java/support/component/ComponentSupportTest.java
index e19e242..f40ab42 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/component/ComponentSupportTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/component/ComponentSupportTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilderTest.java b/src/test/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilderTest.java
index 974a324..eb4283a 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilderTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilderTest.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID 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
+ *
+ * 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 net.shibboleth.utilities.java.support.httpclient;
diff --git a/src/test/java/net/shibboleth/utilities/java/support/httpclient/IdleConectionSweeperTest.java b/src/test/java/net/shibboleth/utilities/java/support/httpclient/IdleConectionSweeperTest.java
index bc9cd24..037a2cc 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/httpclient/IdleConectionSweeperTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/httpclient/IdleConectionSweeperTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/logic/AllMatchPredicateTest.java b/src/test/java/net/shibboleth/utilities/java/support/logic/AllMatchPredicateTest.java
index 0c54438..ea36288 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/logic/AllMatchPredicateTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/logic/AllMatchPredicateTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/logic/AnyMatchPredicateTest.java b/src/test/java/net/shibboleth/utilities/java/support/logic/AnyMatchPredicateTest.java
index 222fa3d..41bcc0d 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/logic/AnyMatchPredicateTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/logic/AnyMatchPredicateTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/logic/CaseInsensitiveStringMatchPredicateTest.java b/src/test/java/net/shibboleth/utilities/java/support/logic/CaseInsensitiveStringMatchPredicateTest.java
index df2dfc7..9ecc3e0 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/logic/CaseInsensitiveStringMatchPredicateTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/logic/CaseInsensitiveStringMatchPredicateTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionFunction.java b/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionFunction.java
index 9091163..e2a2cc1 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionFunction.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionFunction.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionPredicate.java b/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionPredicate.java
index 66b884a..18c2d1d 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionPredicate.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionPredicate.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/logic/ExceptionFunction.java b/src/test/java/net/shibboleth/utilities/java/support/logic/ExceptionFunction.java
index 60d8f3d..0051b4b 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/logic/ExceptionFunction.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/logic/ExceptionFunction.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/logic/ExceptionPredicate.java b/src/test/java/net/shibboleth/utilities/java/support/logic/ExceptionPredicate.java
index f99ee8f..41cee75 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/logic/ExceptionPredicate.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/logic/ExceptionPredicate.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunctionTest.java b/src/test/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunctionTest.java
index a961f80..2bde74c 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunctionTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunctionTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunctionTest.java b/src/test/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunctionTest.java
index 9d7a71e..f272540 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunctionTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunctionTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/net/CookieManagerTest.java b/src/test/java/net/shibboleth/utilities/java/support/net/CookieManagerTest.java
index 406415e..5215f3b 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/net/CookieManagerTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/net/CookieManagerTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/net/HttpServletRequestResponseContextTest.java b/src/test/java/net/shibboleth/utilities/java/support/net/HttpServletRequestResponseContextTest.java
index 1237c44..d16ac16 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/net/HttpServletRequestResponseContextTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/net/HttpServletRequestResponseContextTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/net/HttpServletSupportTest.java b/src/test/java/net/shibboleth/utilities/java/support/net/HttpServletSupportTest.java
index 8dbac86..6d7e227 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/net/HttpServletSupportTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/net/HttpServletSupportTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/net/IPRangeTest.java b/src/test/java/net/shibboleth/utilities/java/support/net/IPRangeTest.java
index ab269f5..0d83835 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/net/IPRangeTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/net/IPRangeTest.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID 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
+ *
+ * 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 net.shibboleth.utilities.java.support.net;
diff --git a/src/test/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilterTest.java b/src/test/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilterTest.java
index 069f5fc..0ca6802 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilterTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilterTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/net/SimpleURLCanonicalizerTest.java b/src/test/java/net/shibboleth/utilities/java/support/net/SimpleURLCanonicalizerTest.java
index b4231e5..a7b3451 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/net/SimpleURLCanonicalizerTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/net/SimpleURLCanonicalizerTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxyTest.java b/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxyTest.java
index 1961bf1..12c5b6a 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxyTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxyTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxyTest.java b/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxyTest.java
index 3918fb5..76e5043 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxyTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxyTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/net/URISupportTest.java b/src/test/java/net/shibboleth/utilities/java/support/net/URISupportTest.java
index 914e70a..1f03400 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/net/URISupportTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/net/URISupportTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/net/URLBuilderTest.java b/src/test/java/net/shibboleth/utilities/java/support/net/URLBuilderTest.java
index 01affbb..7f1d77b 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/net/URLBuilderTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/net/URLBuilderTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/primitive/LazilyFormattedStringTest.java b/src/test/java/net/shibboleth/utilities/java/support/primitive/LazilyFormattedStringTest.java
index b5f9fff..3f08341 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/primitive/LazilyFormattedStringTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/primitive/LazilyFormattedStringTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/primitive/ObjectSupportTest.java b/src/test/java/net/shibboleth/utilities/java/support/primitive/ObjectSupportTest.java
index a2b211b..3a6ff22 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/primitive/ObjectSupportTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/primitive/ObjectSupportTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/primitive/StringSupportTest.java b/src/test/java/net/shibboleth/utilities/java/support/primitive/StringSupportTest.java
index 457d0cb..0c5c9ce 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/primitive/StringSupportTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/primitive/StringSupportTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/resolver/CriteriaSetTest.java b/src/test/java/net/shibboleth/utilities/java/support/resolver/CriteriaSetTest.java
index d3c9afb..3d09ad4 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/resolver/CriteriaSetTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/resolver/CriteriaSetTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistryTest.java b/src/test/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistryTest.java
index b912071..ffa2414 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistryTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistryTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/resolver/EvaluableFooCriterion.java b/src/test/java/net/shibboleth/utilities/java/support/resolver/EvaluableFooCriterion.java
index cfdb498..4296f7f 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/resolver/EvaluableFooCriterion.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/resolver/EvaluableFooCriterion.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/resolver/EvaluableTestFooCriterion.java b/src/test/java/net/shibboleth/utilities/java/support/resolver/EvaluableTestFooCriterion.java
index 5b010b3..8296e57 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/resolver/EvaluableTestFooCriterion.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/resolver/EvaluableTestFooCriterion.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/resolver/Foo.java b/src/test/java/net/shibboleth/utilities/java/support/resolver/Foo.java
index 63286c7..b82ffad 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/resolver/Foo.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/resolver/Foo.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/resolver/FooPredicate.java b/src/test/java/net/shibboleth/utilities/java/support/resolver/FooPredicate.java
index 5709406..0a093da 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/resolver/FooPredicate.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/resolver/FooPredicate.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/resolver/ResolverSupportTest.java b/src/test/java/net/shibboleth/utilities/java/support/resolver/ResolverSupportTest.java
index 9ea40af..717200c 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/resolver/ResolverSupportTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/resolver/ResolverSupportTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/resolver/TestCriterion.java b/src/test/java/net/shibboleth/utilities/java/support/resolver/TestCriterion.java
index 0b854db..fd9b5c0 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/resolver/TestCriterion.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/resolver/TestCriterion.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/resource/TestResourceConverter.java b/src/test/java/net/shibboleth/utilities/java/support/resource/TestResourceConverter.java
index 6d8af6a..e0dee42 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/resource/TestResourceConverter.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/resource/TestResourceConverter.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java b/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java
index b32e32c..b379ab6 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTest.java b/src/test/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTest.java
index a615a8e..97e6082 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/security/DataSealerTest.java b/src/test/java/net/shibboleth/utilities/java/support/security/DataSealerTest.java
index b10587a..1ef5e89 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/security/DataSealerTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/security/DataSealerTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/security/RandomIdentifierGenerationStrategyTest.java b/src/test/java/net/shibboleth/utilities/java/support/security/RandomIdentifierGenerationStrategyTest.java
index 397f1fb..1db7436 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/security/RandomIdentifierGenerationStrategyTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/security/RandomIdentifierGenerationStrategyTest.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID 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
+ *
+ * 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 net.shibboleth.utilities.java.support.security;
import java.util.HashSet;
diff --git a/src/test/java/net/shibboleth/utilities/java/support/security/SecureRandomIdentifierGenerationStrategyTest.java b/src/test/java/net/shibboleth/utilities/java/support/security/SecureRandomIdentifierGenerationStrategyTest.java
index 55ad9d3..5d926d3 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/security/SecureRandomIdentifierGenerationStrategyTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/security/SecureRandomIdentifierGenerationStrategyTest.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID 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
+ *
+ * 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 net.shibboleth.utilities.java.support.security;
diff --git a/src/test/java/net/shibboleth/utilities/java/support/security/Type4UUIDIdentifierGenerationStrategyTest.java b/src/test/java/net/shibboleth/utilities/java/support/security/Type4UUIDIdentifierGenerationStrategyTest.java
index 5b5c8e4..f4845d4 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/security/Type4UUIDIdentifierGenerationStrategyTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/security/Type4UUIDIdentifierGenerationStrategyTest.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID 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
+ *
+ * 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 net.shibboleth.utilities.java.support.security;
import java.util.HashSet;
diff --git a/src/test/java/net/shibboleth/utilities/java/support/xml/AttributeSupportTest.java b/src/test/java/net/shibboleth/utilities/java/support/xml/AttributeSupportTest.java
index 33e2f2b..0b8206a 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/xml/AttributeSupportTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/xml/AttributeSupportTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/xml/BasicParserPoolTest.java b/src/test/java/net/shibboleth/utilities/java/support/xml/BasicParserPoolTest.java
index 5a970c8..4feb4bc 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/xml/BasicParserPoolTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/xml/BasicParserPoolTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/xml/DomTypeSupportTest.java b/src/test/java/net/shibboleth/utilities/java/support/xml/DomTypeSupportTest.java
index c38953e..14b7ffa 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/xml/DomTypeSupportTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/xml/DomTypeSupportTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/xml/ElementSupportTest.java b/src/test/java/net/shibboleth/utilities/java/support/xml/ElementSupportTest.java
index 5dd5a89..fab0af3 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/xml/ElementSupportTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/xml/ElementSupportTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/xml/NamespaceSupportTest.java b/src/test/java/net/shibboleth/utilities/java/support/xml/NamespaceSupportTest.java
index 9b32be9..0d2a422 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/xml/NamespaceSupportTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/xml/NamespaceSupportTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/xml/QNameSupportTest.java b/src/test/java/net/shibboleth/utilities/java/support/xml/QNameSupportTest.java
index 648ed79..5fc14dd 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/xml/QNameSupportTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/xml/QNameSupportTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/xml/SchemaBuilderTest.java b/src/test/java/net/shibboleth/utilities/java/support/xml/SchemaBuilderTest.java
index c7a90b5..17dbd15 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/xml/SchemaBuilderTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/xml/SchemaBuilderTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/xml/SerializeSupportTest.java b/src/test/java/net/shibboleth/utilities/java/support/xml/SerializeSupportTest.java
index 390cd18..58ce9da 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/xml/SerializeSupportTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/xml/SerializeSupportTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/xml/SimpleNamespaceContextTest.java b/src/test/java/net/shibboleth/utilities/java/support/xml/SimpleNamespaceContextTest.java
index 4b53fd1..45103ba 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/xml/SimpleNamespaceContextTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/xml/SimpleNamespaceContextTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/test/java/net/shibboleth/utilities/java/support/xml/XMLSpaceTest.java b/src/test/java/net/shibboleth/utilities/java/support/xml/XMLSpaceTest.java
index 14f73e6..c902011 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/xml/XMLSpaceTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/xml/XMLSpaceTest.java
@@ -1,9 +1,9 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
* NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
+ * copyright ownership. The UCAID 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
*
* http://www.apache.org/licenses/LICENSE-2.0
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list