diff --git a/bsf-javadoc.patch b/bsf-javadoc.patch new file mode 100644 index 0000000..ea94aed --- /dev/null +++ b/bsf-javadoc.patch @@ -0,0 +1,123 @@ +--- bsf-2.4.0/src/org/apache/bsf/BSFEngine.java 2022-03-19 21:53:07.721111965 +0100 ++++ bsf-2.4.0/src/org/apache/bsf/BSFEngine.java 2022-03-19 21:59:41.811383819 +0100 +@@ -114,7 +114,7 @@ + /** + * This is used by an application to compile a value-returning expression. + * The expr may be string or some other type, depending on the language. +- * The generated code is dumped into the CodeBuffer. ++ * The generated code is dumped into the CodeBuffer. + * + * @param source (context info) the source of this expression + * (e.g., filename) +@@ -136,7 +136,7 @@ + /** + * This is used by an application to compile some script. The + * script may be string or some other type, depending on the +- * language. The generated code is dumped into the CodeBuffer. ++ * language. The generated code is dumped into the CodeBuffer. + * + * @param source (context info) the source of this script + * (e.g., filename) +--- bsf-2.4.0/src/org/apache/bsf/BSFManager.java 2022-03-19 21:53:07.721111965 +0100 ++++ bsf-2.4.0/src/org/apache/bsf/BSFManager.java 2022-03-19 22:00:25.391638418 +0100 +@@ -228,7 +228,7 @@ + + /** + * Compile the application of the given anonymous function of the given +- * language to the given parameters into the given CodeBuffer. ++ * language to the given parameters into the given CodeBuffer. + * + * @param lang language identifier + * @param source (context info) the source of this expression +@@ -279,7 +279,7 @@ + + /** + * Compile the given expression of the given language into the given +- * CodeBuffer. ++ * CodeBuffer. + * + * @param lang language identifier + * @param source (context info) the source of this expression +@@ -322,7 +322,7 @@ + + /** + * Compile the given script of the given language into the given +- * CodeBuffer. ++ * CodeBuffer. + * + * @param lang language identifier + * @param source (context info) the source of this script +--- bsf-2.4.0/src/org/apache/bsf/engines/javascript/JavaScriptEngine.java 2022-03-19 21:53:07.721111965 +0100 ++++ bsf-2.4.0/src/org/apache/bsf/engines/javascript/JavaScriptEngine.java 2022-03-19 21:54:50.465693150 +0100 +@@ -41,7 +41,7 @@ + * The original version of this code was first written by Adam Peller + * for use in LotusXSL. Sanjiva took his code and adapted it for BSF. + * +- * @author Adam Peller ++ * @author Adam Peller <peller@lotus.com> + * @author Sanjiva Weerawarana + * @author Matthew J. Duftler + * @author Norris Boyd +--- bsf-2.4.0/src/org/apache/bsf/util/BSFEngineImpl.java 2022-03-19 21:53:07.721111965 +0100 ++++ bsf-2.4.0/src/org/apache/bsf/util/BSFEngineImpl.java 2022-03-19 21:55:30.569919997 +0100 +@@ -28,7 +28,6 @@ + * This is a base implementation of the BSFEngine interface which + * engine implementations may choose to extend to get the basic + * methods of the interface implemented. +- *

+ * + * @author Sanjiva Weerawarana + * @author Olivier Gruber (added original debugging support) +--- bsf-2.4.0/src/org/apache/bsf/util/BSFFunctions.java 2022-03-19 21:53:07.721111965 +0100 ++++ bsf-2.4.0/src/org/apache/bsf/util/BSFFunctions.java 2022-03-19 21:55:46.218008509 +0100 +@@ -24,7 +24,7 @@ + * This is a utility that engine implementors may use as the Java + * object they expose in the scripting language as "bsf". This has + * essentially a subset of the methods in BSFManager plus some +- * stuff from the utils. Currently used by Javascript (Rhino) & BML. ++ * stuff from the utils. Currently used by Javascript (Rhino) & BML. + * + * @author Sanjiva Weerawarana + */ +--- bsf-2.4.0/src/org/apache/bsf/util/cf/CFDriver.java 2022-03-19 21:53:07.721111965 +0100 ++++ bsf-2.4.0/src/org/apache/bsf/util/cf/CFDriver.java 2022-03-19 22:02:02.892204773 +0100 +@@ -52,18 +52,18 @@ + * A driver for CodeFormatter. + *

+ * Usage: +- *

++	*

+ 	*  java org.apache.cf.CFDriver [args]
+-	*

++	*
+ 	*    args:
+-	*

++	*
+ 	*      [-in      fileName]   default: <STDIN>
+ 	*      [-out     fileName]   default: <STDOUT>
+ 	*      [-maxLine   length]   default: 74
+ 	*      [-step        size]   default: 2
+ 	*      [-delim      group]   default: (+
+ 	*      [-sdelim     group]   default: ,
+-	*

++	*
+ */ + public static void main(String[] argv) + { +--- bsf-2.4.0/src/org/apache/bsf/util/event/EventAdapterRegistry.java 2022-03-19 21:53:07.721111965 +0100 ++++ bsf-2.4.0/src/org/apache/bsf/util/event/EventAdapterRegistry.java 2022-03-19 21:59:08.155186817 +0100 +@@ -30,12 +30,11 @@ + * and if it doesn't find one looks for a standard implementation of + * that adapter in the org.apache.bsf.util.event.adapters package with a + * standard naming convention. The naming convention it assumes is the +- * following: for event listener type a.b.c.FooListener, ++ * following: for event listener type a.b.c.FooListener, + * it loads an adapter of type +- * org.apache.bsf.util.event.adapters.a_b_c_FooAdapter. ++ * org.apache.bsf.util.event.adapters.a_b_c_FooAdapter. + * If both the loading and the dynamic generation fail, then a + * null is returned. +- *

+ * + * @author Sanjiva Weerawarana + * @author Matthew J. Duftler diff --git a/bsf.spec b/bsf.spec index cad6b37..ddc7498 100644 --- a/bsf.spec +++ b/bsf.spec @@ -1,7 +1,7 @@ # # spec file for package bsf # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,6 +29,7 @@ Source1000: http://www.apache.org/dist/commons/bsf/source/%{name}-src-%{vers Source1001: bsf.keyring Patch0: build-file.patch Patch1: build.properties.patch +Patch2: bsf-javadoc.patch BuildRequires: ant BuildRequires: apache-commons-logging BuildRequires: fdupes @@ -85,6 +86,7 @@ Framework. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 find -name \*.jar -delete %build