[rhino] 06/09: Reintroduced the deprecated exceptions used by htmlunit

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Jan 20 10:09:25 UTC 2017


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

ebourg-guest pushed a commit to branch master
in repository rhino.

commit 4fcabdf9be6abda450b25e105ff526e81b514e5b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jan 20 10:17:10 2017 +0100

    Reintroduced the deprecated exceptions used by htmlunit
---
 debian/changelog                                   |  5 +-
 .../06_preserve-backward-compatibility.patch       | 76 +++++++++++++++++++++-
 2 files changed, 77 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6ac5422..a658fdd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,9 +8,8 @@ rhino (1.7.7.1-1) UNRELEASED; urgency=medium
     - Require a Java 6 runtime or higher
     - Use the pom from the upstream sources to install the Maven artifacts,
       and relocate the old coordinates rhino:js to org.mozilla:rhino
-    - Reintroduced removed methods in the FunctionNode and ObjectProperty
-      classes to preserve the backward compatibility and fix build failures
-      in reverse dependencies.
+    - Reintroduced some removed classes and methods to preserve the backward
+      compatibility and fix build failures in reverse dependencies.
   * Removed the transitional package rhino-doc
   * Updated the man pages (Closes: #792243)
   * Build with the DH sequencer instead of CDBS
diff --git a/debian/patches/06_preserve-backward-compatibility.patch b/debian/patches/06_preserve-backward-compatibility.patch
index 3061a72..c996822 100644
--- a/debian/patches/06_preserve-backward-compatibility.patch
+++ b/debian/patches/06_preserve-backward-compatibility.patch
@@ -1,5 +1,6 @@
-Description: Reintroduces removed methods to preserve the backward compatibility.
+Description: Reintroduces removed classes and methods to preserve the backward compatibility.
  * Commit 9144b81 renamed isGetter/Setter methods, this breaks closure-compiler
+ * Commit 71468c9 removed deprecated exceptions still used by htmlunit/2.8-2
 Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/src/org/mozilla/javascript/ast/ObjectProperty.java
@@ -96,3 +97,76 @@ Forwarded: not-needed
      public void setFunctionIsNormalMethod() {
          functionForm = Form.METHOD;
      }
+--- /dev/null
++++ b/src/org/mozilla/javascript/ClassDefinitionException.java
+@@ -0,0 +1,22 @@
++
++/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
++ *
++ * This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
++// API class
++
++package org.mozilla.javascript;
++
++/**
++ * @deprecated The exception is no longer thrown by Rhino runtime as
++ * {@link EvaluatorException} is used instead.
++ */
++public class ClassDefinitionException extends RuntimeException
++{
++    static final long serialVersionUID = -5637830967241712746L;
++
++    public ClassDefinitionException(String detail) {
++        super(detail);
++    }
++}
+--- /dev/null
++++ b/src/org/mozilla/javascript/NotAFunctionException.java
+@@ -0,0 +1,20 @@
++
++/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
++ *
++ * This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
++// API class
++
++package org.mozilla.javascript;
++
++/**
++ * @deprecated The exception is no longer thrown by Rhino runtime as
++ * {@link EvaluatorException} is used instead.
++ */
++public class NotAFunctionException extends RuntimeException
++{
++    static final long serialVersionUID = 6461524852170711724L;
++
++    public NotAFunctionException() { }
++}
+--- /dev/null
++++ b/src/org/mozilla/javascript/PropertyException.java
+@@ -0,0 +1,22 @@
++/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
++ *
++ * This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
++
++// API class
++
++package org.mozilla.javascript;
++
++/**
++ * @deprecated This exception is no longer thrown by Rhino runtime.
++ */
++public class PropertyException extends RuntimeException
++{
++    static final long serialVersionUID = -8221564865490676219L;
++
++    public PropertyException(String detail) {
++        super(detail);
++    }
++
++}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/rhino.git



More information about the pkg-java-commits mailing list