[xmlsectool] branch main updated: GEN-269 - Replace code header

Scott Cantor cantor.2 at osu.edu
Tue Aug 1 17:43:37 UTC 2023 

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository xmlsectool.

View the commit online:
http://git.shibboleth.net/view/?p=xmlsectool.git;a=commit;h=83fcc8c5b135a54ff2afb7b5176fb6834ad2834c

The following commit(s) were added to refs/heads/main by this push:
     new 83fcc8c  GEN-269 - Replace code header
83fcc8c is described below

commit 83fcc8c5b135a54ff2afb7b5176fb6834ad2834c
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Aug 1 13:43:34 2023 -0400

    GEN-269 - Replace code header
    
    https://shibboleth.atlassian.net/browse/GEN-269
    
    Relocated checkstyle.
---
 .checkstyle                                              |  2 +-
 .gitignore                                               | 16 +++-------------
 checkstyle.xml => resources/checkstyle/checkstyle.xml    |  2 +-
 .../shibboleth/tool/xmlsectool/CommandLineArguments.java |  9 +++------
 .../net/shibboleth/tool/xmlsectool/CredentialHelper.java | 15 ++++++---------
 .../net/shibboleth/tool/xmlsectool/DigestChoice.java     |  9 +++------
 .../shibboleth/tool/xmlsectool/DisallowedAlgorithms.java |  9 +++------
 .../tool/xmlsectool/InitializationSupport.java           |  9 +++------
 .../java/net/shibboleth/tool/xmlsectool/ReturnCode.java  |  9 +++------
 .../net/shibboleth/tool/xmlsectool/SchemaValidator.java  |  9 +++------
 .../net/shibboleth/tool/xmlsectool/SignatureHelper.java  |  9 +++------
 .../java/net/shibboleth/tool/xmlsectool/Terminator.java  |  9 +++------
 .../java/net/shibboleth/tool/xmlsectool/XMLSecTool.java  |  9 +++------
 .../net/shibboleth/tool/xmlsectool/package-info.java     |  9 +++------
 .../java/net/shibboleth/tool/xmlsectool/BaseTest.java    |  9 +++------
 .../tool/xmlsectool/CommandLineArgumentsTest.java        |  9 +++------
 .../java/net/shibboleth/tool/xmlsectool/XSTJ51Test.java  |  9 +++------
 .../java/net/shibboleth/tool/xmlsectool/XSTJ59Test.java  |  9 +++------
 .../java/net/shibboleth/tool/xmlsectool/XSTJ69Test.java  |  9 +++------
 19 files changed, 56 insertions(+), 114 deletions(-)

diff --git a/.checkstyle b/.checkstyle
index 5ef9989..5ceb584 100644
--- a/.checkstyle
+++ b/.checkstyle
@@ -2,7 +2,7 @@
 
 <fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
 
-    <local-check-config name="Shibboleth Checkstyle" location="checkstyle.xml" type="project" description="">
+    <local-check-config name="Shibboleth Checkstyle" location="/resources/checkstyle/checkstyle.xml" type="project" description="">
         <additional-data name="cache-file" value="true"/>
         <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
         <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
diff --git a/.gitignore b/.gitignore
index 716a7e7..960b59e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,13 @@
 # A simulation of Subversion default ignores, generated by reposurgeon.
-*.o
-*.lo
-*.la
-*.al
-*.libs
-*.so
-*.so.[0-9]*
-*.a
-*.pyc
-*.pyo
-*.rej
 *~
 *.#*
 .*.swp
 .DS_store
 # Simulated Subversion default ignores end here
 # The contents of the svn:ignore property on the branch root.
-/test-output
-/target
+test-output
+target
 .classpath
 .project
 .settings
+.vscode
diff --git a/checkstyle.xml b/resources/checkstyle/checkstyle.xml
similarity index 83%
rename from checkstyle.xml
rename to resources/checkstyle/checkstyle.xml
index 68c57c0..f456c13 100644
--- a/checkstyle.xml
+++ b/resources/checkstyle/checkstyle.xml
@@ -113,7 +113,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 cop [...]
+    <property name="header" value="/*\n * Licensed under the Apache License, Version 2.0 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *    http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, eit [...]
   </module>
   <module name="JavadocPackage"/>
   <module name="LineLength">
diff --git a/src/main/java/net/shibboleth/tool/xmlsectool/CommandLineArguments.java b/src/main/java/net/shibboleth/tool/xmlsectool/CommandLineArguments.java
index d693a62..405cd85 100644
--- a/src/main/java/net/shibboleth/tool/xmlsectool/CommandLineArguments.java
+++ b/src/main/java/net/shibboleth/tool/xmlsectool/CommandLineArguments.java
@@ -1,10 +1,7 @@
 /*
- * 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
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
  *    http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/main/java/net/shibboleth/tool/xmlsectool/CredentialHelper.java b/src/main/java/net/shibboleth/tool/xmlsectool/CredentialHelper.java
index d93f42b..810241b 100644
--- a/src/main/java/net/shibboleth/tool/xmlsectool/CredentialHelper.java
+++ b/src/main/java/net/shibboleth/tool/xmlsectool/CredentialHelper.java
@@ -1,10 +1,7 @@
 /*
- * 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
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
  *    http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -62,8 +59,8 @@ public final class CredentialHelper {
      * @throws CertificateException if there is a problem decoding the certificate
      * @throws KeyException if there is a problem decoding the private key
      */
-    protected static BasicX509Credential getFileBasedCredentials(final String keyFile, final String keyPassword,
-            final String certificateFile) throws KeyException, CertificateException {
+    @Nonnull protected static BasicX509Credential getFileBasedCredentials(final String keyFile,
+            final String keyPassword, final String certificateFile) throws KeyException, CertificateException {
         LOG.debug("Reading PEM/DER encoded credentials from the filesystem");
 
         // First, read the certificate
@@ -102,7 +99,7 @@ public final class CredentialHelper {
      * @throws IOException if there was a problem reading the keystore
      * @throws GeneralSecurityException if there was a problem 
      */
-    protected static BasicX509Credential getKeystoreCredential(final String keystorePath,
+    @Nonnull protected static BasicX509Credential getKeystoreCredential(final String keystorePath,
             final String keystorePassword, final String keystoreProvider, final String keystoreType,
             final String keyAlias, final String keyPassword) throws IOException,
             GeneralSecurityException {
diff --git a/src/main/java/net/shibboleth/tool/xmlsectool/DigestChoice.java b/src/main/java/net/shibboleth/tool/xmlsectool/DigestChoice.java
index 97ee405..8fca82e 100644
--- a/src/main/java/net/shibboleth/tool/xmlsectool/DigestChoice.java
+++ b/src/main/java/net/shibboleth/tool/xmlsectool/DigestChoice.java
@@ -1,10 +1,7 @@
 /*
- * 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
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
  *    http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/main/java/net/shibboleth/tool/xmlsectool/DisallowedAlgorithms.java b/src/main/java/net/shibboleth/tool/xmlsectool/DisallowedAlgorithms.java
index d505e6a..456da73 100644
--- a/src/main/java/net/shibboleth/tool/xmlsectool/DisallowedAlgorithms.java
+++ b/src/main/java/net/shibboleth/tool/xmlsectool/DisallowedAlgorithms.java
@@ -1,10 +1,7 @@
 /*
- * 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
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
  *    http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/main/java/net/shibboleth/tool/xmlsectool/InitializationSupport.java b/src/main/java/net/shibboleth/tool/xmlsectool/InitializationSupport.java
index 42c5ac2..d2dc7e7 100644
--- a/src/main/java/net/shibboleth/tool/xmlsectool/InitializationSupport.java
+++ b/src/main/java/net/shibboleth/tool/xmlsectool/InitializationSupport.java
@@ -1,10 +1,7 @@
 /*
- * 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
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
  *    http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/main/java/net/shibboleth/tool/xmlsectool/ReturnCode.java b/src/main/java/net/shibboleth/tool/xmlsectool/ReturnCode.java
index f9ebf4d..e1c20cf 100644
--- a/src/main/java/net/shibboleth/tool/xmlsectool/ReturnCode.java
+++ b/src/main/java/net/shibboleth/tool/xmlsectool/ReturnCode.java
@@ -1,10 +1,7 @@
 /*
- * 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
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
  *    http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/main/java/net/shibboleth/tool/xmlsectool/SchemaValidator.java b/src/main/java/net/shibboleth/tool/xmlsectool/SchemaValidator.java
index 9e8df41..1bbd456 100644
--- a/src/main/java/net/shibboleth/tool/xmlsectool/SchemaValidator.java
+++ b/src/main/java/net/shibboleth/tool/xmlsectool/SchemaValidator.java
@@ -1,10 +1,7 @@
 /*
- * 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
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
  *    http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/main/java/net/shibboleth/tool/xmlsectool/SignatureHelper.java b/src/main/java/net/shibboleth/tool/xmlsectool/SignatureHelper.java
index f30457c..9e435c7 100644
--- a/src/main/java/net/shibboleth/tool/xmlsectool/SignatureHelper.java
+++ b/src/main/java/net/shibboleth/tool/xmlsectool/SignatureHelper.java
@@ -1,10 +1,7 @@
 /*
- * 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
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
  *    http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/main/java/net/shibboleth/tool/xmlsectool/Terminator.java b/src/main/java/net/shibboleth/tool/xmlsectool/Terminator.java
index 87dbf79..f8bd14f 100644
--- a/src/main/java/net/shibboleth/tool/xmlsectool/Terminator.java
+++ b/src/main/java/net/shibboleth/tool/xmlsectool/Terminator.java
@@ -1,10 +1,7 @@
 /*
- * 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
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
  *    http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/main/java/net/shibboleth/tool/xmlsectool/XMLSecTool.java b/src/main/java/net/shibboleth/tool/xmlsectool/XMLSecTool.java
index 6f1a3d0..e20051d 100644
--- a/src/main/java/net/shibboleth/tool/xmlsectool/XMLSecTool.java
+++ b/src/main/java/net/shibboleth/tool/xmlsectool/XMLSecTool.java
@@ -1,10 +1,7 @@
 /*
- * 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
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
  *    http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/main/java/net/shibboleth/tool/xmlsectool/package-info.java b/src/main/java/net/shibboleth/tool/xmlsectool/package-info.java
index a268c2c..688900e 100644
--- a/src/main/java/net/shibboleth/tool/xmlsectool/package-info.java
+++ b/src/main/java/net/shibboleth/tool/xmlsectool/package-info.java
@@ -1,10 +1,7 @@
 /*
- * 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
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
  *    http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/java/net/shibboleth/tool/xmlsectool/BaseTest.java b/src/test/java/net/shibboleth/tool/xmlsectool/BaseTest.java
index 4884a12..1a63218 100644
--- a/src/test/java/net/shibboleth/tool/xmlsectool/BaseTest.java
+++ b/src/test/java/net/shibboleth/tool/xmlsectool/BaseTest.java
@@ -1,10 +1,7 @@
 /*
- * 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
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
  *    http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/java/net/shibboleth/tool/xmlsectool/CommandLineArgumentsTest.java b/src/test/java/net/shibboleth/tool/xmlsectool/CommandLineArgumentsTest.java
index 4c48149..99bf5ae 100644
--- a/src/test/java/net/shibboleth/tool/xmlsectool/CommandLineArgumentsTest.java
+++ b/src/test/java/net/shibboleth/tool/xmlsectool/CommandLineArgumentsTest.java
@@ -1,10 +1,7 @@
 /*
- * 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
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
  *    http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ51Test.java b/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ51Test.java
index 2272096..66654ce 100644
--- a/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ51Test.java
+++ b/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ51Test.java
@@ -1,10 +1,7 @@
 /*
- * 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
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
  *    http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ59Test.java b/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ59Test.java
index fd74706..b762cce 100644
--- a/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ59Test.java
+++ b/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ59Test.java
@@ -1,10 +1,7 @@
 /*
- * 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
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
  *    http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ69Test.java b/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ69Test.java
index c4b76cc..8ad8bdb 100644
--- a/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ69Test.java
+++ b/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ69Test.java
@@ -1,10 +1,7 @@
 /*
- * 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
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
  *    http://www.apache.org/licenses/LICENSE-2.0
  *

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

More information about the commits mailing list