Repository: apache/jena
Pull request #1436 (2022-07-08 14:22:06)

Cleanup
Clean up after PRs.



Patch:
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionRegistry.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionRegistry.java
index a0dcddb695..1d18f427ca 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionRegistry.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionRegistry.java
@@ -71,7 +71,7 @@ public class FunctionRegistry
     }
 
     /**
-     * Copies the origin registry into a new one, or makes a fresh instance if the specified registry is {@code null).
+     * Copies the origin registry into a new one, or makes a fresh instance if the specified registry is {@code null}.
      * @param from {@link FunctionRegistry } or {@code null}
      * @return {@link FunctionRegistry} a new instance
      */
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/PropertyFunctionRegistry.java b/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/PropertyFunctionRegistry.java
index c5fe8612fa..a977fa4c54 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/PropertyFunctionRegistry.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/PropertyFunctionRegistry.java
@@ -75,7 +75,7 @@ public class PropertyFunctionRegistry
     }
 
     /**
-     * Copies the origin registry into a new one, or makes a fresh instance if the specified registry is {@code null).
+     * Copies the origin registry into a new one, or makes a fresh instance if the specified registry is {@code null}.
      * @param from {@link PropertyFunctionRegistry} or {@code null}
      * @return {@link PropertyFunctionRegistry} a new instance
      */
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/service/ServiceExecutorRegistry.java b/jena-arq/src/main/java/org/apache/jena/sparql/service/ServiceExecutorRegistry.java
index 70b28eb16e..4e5d91a06f 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/service/ServiceExecutorRegistry.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/service/ServiceExecutorRegistry.java
@@ -116,7 +116,7 @@ public class ServiceExecutorRegistry
     }
 
     /**
-     * Copies the origin registry into a new one, or makes a fresh instance if the specified registry is {@code null).
+     * Copies the origin registry into a new one, or makes a fresh instance if the specified registry is {@code null}.
      * @param from {@link ServiceExecutorRegistry} or {@code null}
      * @return {@link ServiceExecutorRegistry} a new instance
      */
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/ContextUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/ContextUtils.java
index a5c6073028..f56c16f1c9 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/ContextUtils.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/ContextUtils.java
@@ -1,4 +1,21 @@
 package org.apache.jena.sparql.util;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 import org.apache.jena.sparql.function.FunctionRegistry;
 import org.apache.jena.sparql.pfunction.PropertyFunctionRegistry;
diff --git a/jena-fuseki2/examples/fuseki-jetty-https.xml b/jena-fuseki2/examples/fuseki-jetty-https.xml
index 399e0509f1..d617b5d2c8 100644
--- a/jena-fuseki2/examples/fuseki-jetty-https.xml
+++ b/jena-fuseki2/examples/fuseki-jetty-https.xml
@@ -1,6 +1,46 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "
-https://www.eclipse.org/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this 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.
+-->
+
+<!--
+Example Jetty - you will need to configure a certificate.
+
+** You will need to configure this example. **
+
+See "sslContextFactory" below.
+
+Use:
+   fuseki -jetty fuseki-jetty-https.xml ...
+
+   
+External references:
+
+Jetty documentation on SSL:
+   http://www.eclipse.org/jetty/documentation/current/configuring-ssl.html
+
+Oracle Java keytool
+   http://docs.oracle.com/javase/8/docs/technotes/tools/windows/keytool.html
+   
+Some more tools to help manage Java certificate store:
+   https://bitbucket.org/rvesse/java-ssl-helper/overview
+(external project Rob Vesse and Paul Heinlein / License: CC-BY-NC-SA)
+-->
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
     <Get name="ThreadPool">


Test patch:
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/util/TestContextUtils.java b/jena-arq/src/test/java/org/apache/jena/sparql/util/TestContextUtils.java
index 4ea8ba3dd0..028270a574 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/util/TestContextUtils.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/util/TestContextUtils.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.apache.jena.sparql.util;
 
 import org.apache.jena.graph.Node;