Update to Build b28.

1 files changed, 0 insertions, 60 deletions

diff --git a/java/openjdk6/files/icedtea/security/20130618/javac_issue.patch b/java/openjdk6/files/icedtea/security/20130618/javac_issue.patch
deleted file mode 100644
index 0f1ee2dd2acf..000000000000
--- a/java/openjdk6/files/icedtea/security/20130618/javac_issue.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1371835374 18000
-# Node ID 471dd797c10d400a89503d94ab3832ab1cdb67ad
-# Parent  9892a997b49abd5ae9a5e1ec8fef1f93631f87ae
-Workaround javac issue
-
-diff --git a/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java b/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java
---- jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java
-+++ jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java
-@@ -207,7 +207,7 @@
-          * @param inclusiveNamespaces
-          * @throws CanonicalizationException
-          */
--        public byte[] engineCanonicalizeXPathNodeSet(Set xpathNodeSet,
-+        public byte[] engineCanonicalizeXPathNodeSet(Set<Node> xpathNodeSet,
-                         String inclusiveNamespaces) throws CanonicalizationException {
- 
- 
-diff --git a/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java b/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java
---- jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java
-+++ jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java
-@@ -97,7 +97,7 @@
-    List nodeFilter;
- 
-    boolean _includeComments;
--   Set _xpathNodeSet = null;
-+   Set<Node> _xpathNodeSet = null;
-    /**
-     * The node to be skiped/excluded from the DOM tree
-     * in subtree canonicalizations.
-@@ -130,7 +130,7 @@
-     * @param xpathNodeSet
-     * @throws CanonicalizationException
-     */
--   public byte[] engineCanonicalizeXPathNodeSet(Set xpathNodeSet)
-+   public byte[] engineCanonicalizeXPathNodeSet(Set<Node> xpathNodeSet)
-            throws CanonicalizationException {
-            this._xpathNodeSet = xpathNodeSet;
-            return engineCanonicalizeXPathNodeSetInternal(XMLUtils.getOwnerDocument(this._xpathNodeSet));
-diff --git a/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java b/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java
---- jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java
-+++ jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java
-@@ -48,6 +48,7 @@
- import com.sun.org.apache.xml.internal.security.transforms.Transform;
- import org.w3c.dom.Document;
- import org.w3c.dom.Element;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
- 
- public abstract class ApacheCanonicalizer extends TransformService {
-@@ -119,7 +120,7 @@
-         }
- 
-         try {
--            Set nodeSet = null;
-+            Set<Node> nodeSet = null;
-             if (data instanceof ApacheData) {
-                 XMLSignatureInput in =
-                     ((ApacheData) data).getXMLSignatureInput();