[java-idp-plugin-scripting] branch main updated: GEN-269 - Replace code header
Scott Cantor
cantor.2 at osu.edu
Tue Aug 1 17:08:33 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-idp-plugin-scripting.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-scripting.git;a=commit;h=6fe8e8b14e3126283a78fb87efd2d5b3285a2b8c
The following commit(s) were added to refs/heads/main by this push:
new 6fe8e8b GEN-269 - Replace code header
6fe8e8b is described below
commit 6fe8e8b14e3126283a78fb87efd2d5b3285a2b8c
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Aug 1 13:08:30 2023 -0400
GEN-269 - Replace code header
https://shibboleth.atlassian.net/browse/GEN-269
---
.gitignore | 10 ++++------
.../idp/plugin/scripting/nashorn/jdk/NashornPlugin.java | 9 +++------
.../idp/plugin/scripting/nashorn/jdk/package-info.java | 9 +++------
resources/checkstyle/checkstyle.xml | 7 ++++++-
.../shibboleth/idp/plugin/scripting/rhino/RhinoEngine.java | 14 +++++---------
.../idp/plugin/scripting/rhino/RhinoFactory.java | 9 +++------
.../shibboleth/idp/plugin/scripting/rhino/RhinoPlugin.java | 9 +++------
.../idp/plugin/scripting/rhino/package-info.java | 9 +++------
.../shibboleth/idp/plugin/scripting/rhino/EngineTests.java | 9 +++------
.../idp/plugin/scripting/AbstractScriptEngine.java | 9 +++------
.../idp/plugin/scripting/AbstractScriptEngineFactory.java | 9 +++------
.../idp/plugin/scripting/RuntimeScriptingException.java | 9 +++------
.../net/shibboleth/idp/plugin/scripting/package-info.java | 9 +++------
13 files changed, 45 insertions(+), 76 deletions(-)
diff --git a/.gitignore b/.gitignore
index 38d066a..74605d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,8 @@
-*/target
*/test-output
*~
-*/.classpath
-*/.project
-*/.settings
-/.project
-/.settings
+.classpath
+.project
+.settings
+.vscode
*/bin/*
target
diff --git a/nashorn-jdk-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/jdk/NashornPlugin.java b/nashorn-jdk-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/jdk/NashornPlugin.java
index a4b1c05..9131af0 100644
--- a/nashorn-jdk-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/jdk/NashornPlugin.java
+++ b/nashorn-jdk-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/jdk/NashornPlugin.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/nashorn-jdk-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/jdk/package-info.java b/nashorn-jdk-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/jdk/package-info.java
index a53af32..83ed787 100644
--- a/nashorn-jdk-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/jdk/package-info.java
+++ b/nashorn-jdk-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/jdk/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/resources/checkstyle/checkstyle.xml b/resources/checkstyle/checkstyle.xml
index f3f13f6..f456c13 100644
--- a/resources/checkstyle/checkstyle.xml
+++ b/resources/checkstyle/checkstyle.xml
@@ -10,6 +10,11 @@
-->
<module name="Checker">
<property name="severity" value="warning"/>
+ <module name="SuppressWithPlainTextCommentFilter">
+ <property name="offCommentFormat" value="\bCheck[Ss]tyle:\s*([\w|]+)\s+OFF\b"/>
+ <property name="onCommentFormat" value="\bCheck[Ss]tyle:\s*([\w|]+)\s+ON\b"/>
+ <property name="checkFormat" value="$1"/>
+ </module>
<module name="TreeWalker">
<property name="tabWidth" value="4"/>
<module name="JavadocMethod"/>
@@ -108,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/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoEngine.java b/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoEngine.java
index 4c08e0b..1742343 100644
--- a/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoEngine.java
+++ b/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoEngine.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,7 +59,7 @@ public class RhinoEngine extends AbstractScriptEngine implements ScriptEngine, C
}
/** {@inheritDoc} */
- public CompiledScript compile(String script) throws ScriptException {
+ public CompiledScript compile(final String script) throws ScriptException {
assert script != null;
return new CompiledScriptImpl(script);
}
@@ -101,8 +98,7 @@ public class RhinoEngine extends AbstractScriptEngine implements ScriptEngine, C
}
final Object o = script.exec(ctx, scope);
return Context.jsToJava(o, Object.class);
- }
- finally {
+ } finally {
Context.exit();
}
diff --git a/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoFactory.java b/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoFactory.java
index 6bf026f..2d8048c 100644
--- a/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoFactory.java
+++ b/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoFactory.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/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoPlugin.java b/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoPlugin.java
index c8a725b..caa707c 100644
--- a/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoPlugin.java
+++ b/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoPlugin.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/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/package-info.java b/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/package-info.java
index 5ba2ab1..9e83965 100644
--- a/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/package-info.java
+++ b/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/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/rhino-impl/src/test/java/net/shibboleth/idp/plugin/scripting/rhino/EngineTests.java b/rhino-impl/src/test/java/net/shibboleth/idp/plugin/scripting/rhino/EngineTests.java
index de3fbc0..349cf60 100644
--- a/rhino-impl/src/test/java/net/shibboleth/idp/plugin/scripting/rhino/EngineTests.java
+++ b/rhino-impl/src/test/java/net/shibboleth/idp/plugin/scripting/rhino/EngineTests.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/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/AbstractScriptEngine.java b/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/AbstractScriptEngine.java
index 91654be..5651111 100644
--- a/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/AbstractScriptEngine.java
+++ b/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/AbstractScriptEngine.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/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/AbstractScriptEngineFactory.java b/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/AbstractScriptEngineFactory.java
index 7aa8444..f02ff11 100644
--- a/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/AbstractScriptEngineFactory.java
+++ b/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/AbstractScriptEngineFactory.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/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/RuntimeScriptingException.java b/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/RuntimeScriptingException.java
index 6f72391..46b7bdf 100644
--- a/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/RuntimeScriptingException.java
+++ b/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/RuntimeScriptingException.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/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/package-info.java b/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/package-info.java
index b910728..866a411 100644
--- a/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/package-info.java
+++ b/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/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
*
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list