[eclipselink] 04/08: Refresh patches

Andrew Ross rockclimb-guest at alioth.debian.org
Sun Oct 27 22:21:15 UTC 2013 

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

rockclimb-guest pushed a commit to branch master
in repository eclipselink.

commit 81411ced8326dcbeb3b2747365627e392f98d7ee
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date:   Fri Sep 27 23:12:10 2013 +0100

    Refresh patches
---
 debian/changelog                                 |    7 +
 debian/control                                   |    6 +-
 debian/patches/disable_antlr3_embedded_copy.diff |  169 +++++----
 debian/patches/disable_asm_embedded_copy.diff    |  407 +++++++++++-----------
 debian/patches/series                            |    5 +-
 debian/patches/typeparameters.patch              |    2 +-
 debian/regenerate-patches.sh                     |   32 ++
 7 files changed, 332 insertions(+), 296 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e8eaaac..d7326e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+eclipselink (2.5.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.4: no changes needed.
+
+ -- Andrew Ross <ubuntu at rossfamily.co.uk>  Fri, 27 Sep 2013 22:59:46 +0100
+
 eclipselink (2.1.3-2) unstable; urgency=low
 
   [ Miguel Landaeta ]
diff --git a/debian/control b/debian/control
index 36f8b65..6752dc6 100644
--- a/debian/control
+++ b/debian/control
@@ -11,9 +11,9 @@ Build-Depends: debhelper (>= 7.0.50), default-jdk, javahelper, ant,
  libgeronimo-javamail-1.4-spec-java,
  libgeronimo-jms-1.1-spec-java,
  libgeronimo-j2ee-connector-1.5-spec-java,
- libservlet3.0-java
+ libservlet3.0-java,
  aspectj, libsdo-api-java,
- libcdi-api-java, libjsr311-api-java
+ libcdi-api-java, libjsr311-api-java,
  libasm3-java, antlr3 (>= 3.2), default-jdk-doc
 Standards-Version: 3.9.4
 DM-Upload-Allowed: yes
@@ -30,7 +30,7 @@ Depends:
  libgeronimo-javamail-1.4-spec-java,
  libgeronimo-jms-1.1-spec-java,
  libgeronimo-j2ee-connector-1.5-spec-java,
- libcdi-api-java, libjsr311-api-java
+ libcdi-api-java, libjsr311-api-java,
  libasm3-java, antlr3 (>= 3.2), ${misc:Depends}
 Recommends: aspectj, libsdo-api-java, libservlet3.0-java
 Suggests: libeclipselink-java-doc (= ${binary:Version})
diff --git a/debian/patches/disable_antlr3_embedded_copy.diff b/debian/patches/disable_antlr3_embedded_copy.diff
index 3a11ef7..7d9a74e 100644
--- a/debian/patches/disable_antlr3_embedded_copy.diff
+++ b/debian/patches/disable_antlr3_embedded_copy.diff
@@ -1,14 +1,69 @@
---- a/about.html
-+++ b/about.html
-@@ -127,7 +127,7 @@
-   <p>The <a href="http://www.antlr.org/">ANTLR library</a> (<a href="http://www.antlr.org/license.html">license</a>)
-     is included within EclipseLink Project to enable parsing of the Java Persistence
-     Query language (JP QL). The ANTLR library is re-packaged within the project
--    in the org.eclipse.persistence.internal.libraries.antlr.* packages. </p>
-+    in the org.antlr.* packages. </p>
-   <p>The source is available with the project's subversion repository. The binaries
-     are distributed within the eclipselink.jar and in the org.eclipse.persistence.antlr_3.2.0.v*.jar
-     bundle.</p>
+Description: Remove references to ANTLR embedded copy 
+Author: Miguel Landaeta <miguel at miguel.cc>
+Bug-Debian: http://bugs.debian.org/581861
+Forwarded: no
+Last-Update: 2013-09-27
+
+--- a/org/eclipse/persistence/internal/oxm/record/json/JSONLexer.java
++++ b/org/eclipse/persistence/internal/oxm/record/json/JSONLexer.java
+@@ -12,7 +12,7 @@
+  ******************************************************************************/
+ package org.eclipse.persistence.internal.oxm.record.json;
+ 
+-import org.eclipse.persistence.internal.libraries.antlr.runtime.*;
++import org.antlr.runtime.*;
+ 
+ class JSONLexer extends Lexer {
+     public static final int EOF=-1;
+--- a/org/eclipse/persistence/internal/oxm/record/json/JSONReader.java
++++ b/org/eclipse/persistence/internal/oxm/record/json/JSONReader.java
+@@ -27,14 +27,14 @@
+ import javax.xml.namespace.QName;
+ 
+ import org.eclipse.persistence.exceptions.XMLMarshalException;
+-import org.eclipse.persistence.internal.libraries.antlr.runtime.ANTLRInputStream;
+-import org.eclipse.persistence.internal.libraries.antlr.runtime.ANTLRReaderStream;
+-import org.eclipse.persistence.internal.libraries.antlr.runtime.CharStream;
+-import org.eclipse.persistence.internal.libraries.antlr.runtime.RecognitionException;
+-import org.eclipse.persistence.internal.libraries.antlr.runtime.TokenRewriteStream;
+-import org.eclipse.persistence.internal.libraries.antlr.runtime.TokenStream;
+-import org.eclipse.persistence.internal.libraries.antlr.runtime.tree.CommonTree;
+-import org.eclipse.persistence.internal.libraries.antlr.runtime.tree.Tree;
++import org.antlr.runtime.ANTLRInputStream;
++import org.antlr.runtime.ANTLRReaderStream;
++import org.antlr.runtime.CharStream;
++import org.antlr.runtime.RecognitionException;
++import org.antlr.runtime.TokenRewriteStream;
++import org.antlr.runtime.TokenStream;
++import org.antlr.runtime.tree.CommonTree;
++import org.antlr.runtime.tree.Tree;
+ import org.eclipse.persistence.internal.oxm.CollectionGroupingElementNodeValue;
+ import org.eclipse.persistence.internal.oxm.Constants;
+ import org.eclipse.persistence.internal.oxm.ContainerValue;
+--- a/org/eclipse/persistence/internal/oxm/record/json/JSONParser.java
++++ b/org/eclipse/persistence/internal/oxm/record/json/JSONParser.java
+@@ -12,8 +12,8 @@
+  ******************************************************************************/
+ package org.eclipse.persistence.internal.oxm.record.json;
+ 
+-import org.eclipse.persistence.internal.libraries.antlr.runtime.*;
+-import org.eclipse.persistence.internal.libraries.antlr.runtime.tree.*;
++import org.antlr.runtime.*;
++import org.antlr.runtime.tree.*;
+ 
+ class JSONParser extends Parser {
+     public static final String[] tokenNames = new String[] {
+--- a/org/eclipse/persistence/internal/jpa/parsing/jpql/InvalidIdentifierStartException.java
++++ b/org/eclipse/persistence/internal/jpa/parsing/jpql/InvalidIdentifierStartException.java
+@@ -12,7 +12,7 @@
+  ******************************************************************************/  
+ package org.eclipse.persistence.internal.jpa.parsing.jpql;
+ 
+-import org.eclipse.persistence.internal.libraries.antlr.runtime.RecognitionException;
++import org.antlr.runtime.RecognitionException;
+ 
+ /*
+  * This is a custom Exception class that is thrown from ANTLR JPQL code when we 
 --- a/org/eclipse/persistence/internal/jpa/parsing/jpql/CaseInsensitiveANTLRStringStream.java
 +++ b/org/eclipse/persistence/internal/jpa/parsing/jpql/CaseInsensitiveANTLRStringStream.java
 @@ -12,7 +12,7 @@
@@ -31,30 +86,6 @@
  import org.eclipse.persistence.internal.jpa.parsing.jpql.antlr.JPQLLexer;
  
  /*
---- a/org/eclipse/persistence/internal/jpa/parsing/jpql/InvalidIdentifierException.java
-+++ b/org/eclipse/persistence/internal/jpa/parsing/jpql/InvalidIdentifierException.java
-@@ -12,8 +12,8 @@
-  ******************************************************************************/  
- package org.eclipse.persistence.internal.jpa.parsing.jpql;
- 
--import org.eclipse.persistence.internal.libraries.antlr.runtime.RecognitionException;
--import org.eclipse.persistence.internal.libraries.antlr.runtime.Token;
-+import org.antlr.runtime.RecognitionException;
-+import org.antlr.runtime.Token;
- 
- /**
-  * This is a custom Exception class that is thrown from ANTLR JPQL code when we 
---- a/org/eclipse/persistence/internal/jpa/parsing/jpql/InvalidIdentifierStartException.java
-+++ b/org/eclipse/persistence/internal/jpa/parsing/jpql/InvalidIdentifierStartException.java
-@@ -12,7 +12,7 @@
-  ******************************************************************************/  
- package org.eclipse.persistence.internal.jpa.parsing.jpql;
- 
--import org.eclipse.persistence.internal.libraries.antlr.runtime.RecognitionException;
-+import org.antlr.runtime.RecognitionException;
- 
- /*
-  * This is a custom Exception class that is thrown from ANTLR JPQL code when we 
 --- a/org/eclipse/persistence/internal/jpa/parsing/jpql/JPQLParser.java
 +++ b/org/eclipse/persistence/internal/jpa/parsing/jpql/JPQLParser.java
 @@ -15,21 +15,21 @@
@@ -102,17 +133,6 @@
  
      /** List of errors. */
      private List errors = new ArrayList();
---- a/org/eclipse/persistence/internal/jpa/parsing/jpql/antlr/JPQLLexer.java
-+++ b/org/eclipse/persistence/internal/jpa/parsing/jpql/antlr/JPQLLexer.java
-@@ -5,7 +5,7 @@
-     import org.eclipse.persistence.internal.jpa.parsing.jpql.InvalidIdentifierStartException;
- 
- 
--import org.eclipse.persistence.internal.libraries.antlr.runtime.*;
-+import org.antlr.runtime.*;
- 
- public class JPQLLexer extends Lexer {
-     public static final int EXPONENT=116;
 --- a/org/eclipse/persistence/internal/jpa/parsing/jpql/antlr/JPQLParser.java
 +++ b/org/eclipse/persistence/internal/jpa/parsing/jpql/antlr/JPQLParser.java
 @@ -9,7 +9,7 @@
@@ -137,52 +157,27 @@
  
  //eclipselink imports
  import org.eclipse.persistence.internal.jpa.parsing.jpql.CaseInsensitiveJPQLLexer;
---- a/org/eclipse/persistence/internal/oxm/record/json/JSONLexer.java
-+++ b/org/eclipse/persistence/internal/oxm/record/json/JSONLexer.java
-@@ -12,7 +12,7 @@
-  ******************************************************************************/
- package org.eclipse.persistence.internal.oxm.record.json;
- 
--import org.eclipse.persistence.internal.libraries.antlr.runtime.*;
-+import org.antlr.runtime.*;
+--- a/org/eclipse/persistence/internal/jpa/parsing/jpql/antlr/JPQLLexer.java
++++ b/org/eclipse/persistence/internal/jpa/parsing/jpql/antlr/JPQLLexer.java
+@@ -5,7 +5,7 @@
+     import org.eclipse.persistence.internal.jpa.parsing.jpql.InvalidIdentifierStartException;
  
- class JSONLexer extends Lexer {
-     public static final int EOF=-1;
---- a/org/eclipse/persistence/internal/oxm/record/json/JSONParser.java
-+++ b/org/eclipse/persistence/internal/oxm/record/json/JSONParser.java
-@@ -12,8 +12,8 @@
-  ******************************************************************************/
- package org.eclipse.persistence.internal.oxm.record.json;
  
 -import org.eclipse.persistence.internal.libraries.antlr.runtime.*;
--import org.eclipse.persistence.internal.libraries.antlr.runtime.tree.*;
 +import org.antlr.runtime.*;
-+import org.antlr.runtime.tree.*;
  
- class JSONParser extends Parser {
-     public static final String[] tokenNames = new String[] {
---- a/org/eclipse/persistence/internal/oxm/record/json/JSONReader.java
-+++ b/org/eclipse/persistence/internal/oxm/record/json/JSONReader.java
-@@ -27,14 +27,14 @@
- import javax.xml.namespace.QName;
+ public class JPQLLexer extends Lexer {
+     public static final int EXPONENT=116;
+--- a/org/eclipse/persistence/internal/jpa/parsing/jpql/InvalidIdentifierException.java
++++ b/org/eclipse/persistence/internal/jpa/parsing/jpql/InvalidIdentifierException.java
+@@ -12,8 +12,8 @@
+  ******************************************************************************/  
+ package org.eclipse.persistence.internal.jpa.parsing.jpql;
  
- import org.eclipse.persistence.exceptions.XMLMarshalException;
--import org.eclipse.persistence.internal.libraries.antlr.runtime.ANTLRInputStream;
--import org.eclipse.persistence.internal.libraries.antlr.runtime.ANTLRReaderStream;
--import org.eclipse.persistence.internal.libraries.antlr.runtime.CharStream;
 -import org.eclipse.persistence.internal.libraries.antlr.runtime.RecognitionException;
--import org.eclipse.persistence.internal.libraries.antlr.runtime.TokenRewriteStream;
--import org.eclipse.persistence.internal.libraries.antlr.runtime.TokenStream;
--import org.eclipse.persistence.internal.libraries.antlr.runtime.tree.CommonTree;
--import org.eclipse.persistence.internal.libraries.antlr.runtime.tree.Tree;
-+import org.antlr.runtime.ANTLRInputStream;
-+import org.antlr.runtime.ANTLRReaderStream;
-+import org.antlr.runtime.CharStream;
+-import org.eclipse.persistence.internal.libraries.antlr.runtime.Token;
 +import org.antlr.runtime.RecognitionException;
-+import org.antlr.runtime.TokenRewriteStream;
-+import org.antlr.runtime.TokenStream;
-+import org.antlr.runtime.tree.CommonTree;
-+import org.antlr.runtime.tree.Tree;
- import org.eclipse.persistence.internal.oxm.CollectionGroupingElementNodeValue;
- import org.eclipse.persistence.internal.oxm.Constants;
- import org.eclipse.persistence.internal.oxm.ContainerValue;
++import org.antlr.runtime.Token;
+ 
+ /**
+  * This is a custom Exception class that is thrown from ANTLR JPQL code when we 
diff --git a/debian/patches/disable_asm_embedded_copy.diff b/debian/patches/disable_asm_embedded_copy.diff
index 1d9043e..f298a22 100644
--- a/debian/patches/disable_asm_embedded_copy.diff
+++ b/debian/patches/disable_asm_embedded_copy.diff
@@ -1,80 +1,46 @@
---- a/org/eclipse/persistence/dynamic/DynamicClassWriter.java
-+++ b/org/eclipse/persistence/dynamic/DynamicClassWriter.java
-@@ -25,41 +25,41 @@
- import org.eclipse.persistence.internal.dynamic.DynamicEntityImpl;
- import org.eclipse.persistence.internal.dynamic.DynamicPropertiesManager;
- import org.eclipse.persistence.internal.helper.Helper;
+Description: Remove reference to ASM 1.5 embedded copy
+Author: Miguel Landaeta <miguel at miguel.cc>
+Forwarded: no
+Last-Update: 2013-09-27
+
+--- a/org/eclipse/persistence/internal/xr/XRClassWriter.java
++++ b/org/eclipse/persistence/internal/xr/XRClassWriter.java
+@@ -17,21 +17,21 @@
+ //EclipseLink imports
+ import org.eclipse.persistence.dynamic.DynamicClassLoader;
+ import org.eclipse.persistence.dynamic.DynamicClassWriter;
 -import org.eclipse.persistence.internal.libraries.asm.ClassWriter;
 -import org.eclipse.persistence.internal.libraries.asm.MethodVisitor;
--import org.eclipse.persistence.internal.libraries.asm.Type;
 +import org.objectweb.asm.ClassWriter;
 +import org.objectweb.asm.MethodVisitor;
-+import org.objectweb.asm.Type;
- 
  import static org.eclipse.persistence.internal.dynamic.DynamicPropertiesManager.PROPERTIES_MANAGER_FIELD;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.AASTORE;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_ENUM;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_FINAL;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_PRIVATE;
 -import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_PUBLIC;
 -import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_STATIC;
 -import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_SUPER;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_SYNTHETIC;
 -import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ALOAD;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ANEWARRAY;
 -import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ARETURN;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.BIPUSH;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.SIPUSH;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.CHECKCAST;
 -import static org.eclipse.persistence.internal.libraries.asm.Opcodes.DUP;
 -import static org.eclipse.persistence.internal.libraries.asm.Opcodes.GETSTATIC;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ICONST_0;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ICONST_1;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ICONST_2;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ICONST_3;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ICONST_4;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ICONST_5;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ILOAD;
 -import static org.eclipse.persistence.internal.libraries.asm.Opcodes.INVOKESPECIAL;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.INVOKESTATIC;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.INVOKEVIRTUAL;
 -import static org.eclipse.persistence.internal.libraries.asm.Opcodes.NEW;
 -import static org.eclipse.persistence.internal.libraries.asm.Opcodes.PUTSTATIC;
 -import static org.eclipse.persistence.internal.libraries.asm.Opcodes.RETURN;
 -import static org.eclipse.persistence.internal.libraries.asm.Opcodes.V1_5;
-+import static org.objectweb.asm.Opcodes.AASTORE;
-+import static org.objectweb.asm.Opcodes.ACC_ENUM;
-+import static org.objectweb.asm.Opcodes.ACC_FINAL;
-+import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
 +import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
 +import static org.objectweb.asm.Opcodes.ACC_STATIC;
 +import static org.objectweb.asm.Opcodes.ACC_SUPER;
-+import static org.objectweb.asm.Opcodes.ACC_SYNTHETIC;
 +import static org.objectweb.asm.Opcodes.ALOAD;
-+import static org.objectweb.asm.Opcodes.ANEWARRAY;
 +import static org.objectweb.asm.Opcodes.ARETURN;
-+import static org.objectweb.asm.Opcodes.BIPUSH;
-+import static org.objectweb.asm.Opcodes.SIPUSH;
-+import static org.objectweb.asm.Opcodes.CHECKCAST;
 +import static org.objectweb.asm.Opcodes.DUP;
 +import static org.objectweb.asm.Opcodes.GETSTATIC;
-+import static org.objectweb.asm.Opcodes.ICONST_0;
-+import static org.objectweb.asm.Opcodes.ICONST_1;
-+import static org.objectweb.asm.Opcodes.ICONST_2;
-+import static org.objectweb.asm.Opcodes.ICONST_3;
-+import static org.objectweb.asm.Opcodes.ICONST_4;
-+import static org.objectweb.asm.Opcodes.ICONST_5;
-+import static org.objectweb.asm.Opcodes.ILOAD;
 +import static org.objectweb.asm.Opcodes.INVOKESPECIAL;
-+import static org.objectweb.asm.Opcodes.INVOKESTATIC;
-+import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL;
 +import static org.objectweb.asm.Opcodes.NEW;
 +import static org.objectweb.asm.Opcodes.PUTSTATIC;
 +import static org.objectweb.asm.Opcodes.RETURN;
 +import static org.objectweb.asm.Opcodes.V1_5;
+ import static org.eclipse.persistence.internal.xr.XRDynamicClassLoader.COLLECTION_WRAPPER_SUFFIX;
  
  /**
-  * Write the byte codes of a dynamic entity class. The class writer will create
 --- a/org/eclipse/persistence/internal/dbws/SOAPResponseClassLoader.java
 +++ b/org/eclipse/persistence/internal/dbws/SOAPResponseClassLoader.java
 @@ -18,14 +18,14 @@
@@ -100,6 +66,105 @@
  
  /**
   * <p><b>INTERNAL</b>: A subclass of {@link ClassLoader} that exposes a build method to the hidden
+--- a/org/eclipse/persistence/internal/jpa/weaving/RestAdapterClassWriter.java
++++ b/org/eclipse/persistence/internal/jpa/weaving/RestAdapterClassWriter.java
+@@ -14,9 +14,9 @@
+ 
+ import org.eclipse.persistence.dynamic.DynamicClassLoader;
+ import org.eclipse.persistence.dynamic.EclipseLinkClassWriter;
+-import org.eclipse.persistence.internal.libraries.asm.ClassWriter;
+-import org.eclipse.persistence.internal.libraries.asm.MethodVisitor;
+-import org.eclipse.persistence.internal.libraries.asm.Opcodes;
++import org.objectweb.asm.ClassWriter;
++import org.objectweb.asm.MethodVisitor;
++import org.objectweb.asm.Opcodes;
+ 
+ public class RestAdapterClassWriter implements EclipseLinkClassWriter, Opcodes {
+ 
+--- a/org/eclipse/persistence/internal/jpa/weaving/ComputeClassWriter.java
++++ b/org/eclipse/persistence/internal/jpa/weaving/ComputeClassWriter.java
+@@ -33,9 +33,9 @@
+ import java.io.IOException;
+ import java.io.InputStream;
+ 
+-import org.eclipse.persistence.internal.libraries.asm.ClassReader;
+-import org.eclipse.persistence.internal.libraries.asm.ClassWriter;
+-import org.eclipse.persistence.internal.libraries.asm.Opcodes;
++import org.objectweb.asm.ClassReader;
++import org.objectweb.asm.ClassWriter;
++import org.objectweb.asm.Opcodes;
+ 
+ /**
+  * A ClassWriter that computes the common super class of two classes without
+--- a/org/eclipse/persistence/internal/jpa/weaving/ClassWeaver.java
++++ b/org/eclipse/persistence/internal/jpa/weaving/ClassWeaver.java
+@@ -20,13 +20,13 @@
+ import java.util.Iterator;
+ 
+ import org.eclipse.persistence.internal.helper.Helper;
+-import org.eclipse.persistence.internal.libraries.asm.ClassWriter;
+-import org.eclipse.persistence.internal.libraries.asm.FieldVisitor;
+-import org.eclipse.persistence.internal.libraries.asm.Label;
+-import org.eclipse.persistence.internal.libraries.asm.MethodVisitor;
+-import org.eclipse.persistence.internal.libraries.asm.Opcodes;
+-import org.eclipse.persistence.internal.libraries.asm.Type;
+-import org.eclipse.persistence.internal.libraries.asm.commons.SerialVersionUIDAdder;
++import org.objectweb.asm.ClassWriter;
++import org.objectweb.asm.FieldVisitor;
++import org.objectweb.asm.Label;
++import org.objectweb.asm.MethodVisitor;
++import org.objectweb.asm.Opcodes;
++import org.objectweb.asm.Type;
++import org.objectweb.asm.commons.SerialVersionUIDAdder;
+ 
+ /**
+  * INTERNAL: Weaves classes to allow them to support EclipseLink indirection.
+--- a/org/eclipse/persistence/internal/jpa/weaving/PersistenceWeaver.java
++++ b/org/eclipse/persistence/internal/jpa/weaving/PersistenceWeaver.java
+@@ -21,8 +21,8 @@
+ 
+ import org.eclipse.persistence.config.SystemProperties;
+ import org.eclipse.persistence.internal.helper.Helper;
+-import org.eclipse.persistence.internal.libraries.asm.ClassReader;
+-import org.eclipse.persistence.internal.libraries.asm.ClassWriter;
++import org.objectweb.asm.ClassReader;
++import org.objectweb.asm.ClassWriter;
+ import org.eclipse.persistence.internal.sessions.AbstractSession;
+ import org.eclipse.persistence.logging.SessionLog;
+ import org.eclipse.persistence.sessions.Session;
+--- a/org/eclipse/persistence/internal/jpa/weaving/MethodWeaver.java
++++ b/org/eclipse/persistence/internal/jpa/weaving/MethodWeaver.java
+@@ -14,7 +14,7 @@
+ 
+ //ASM imports
+ import org.eclipse.persistence.internal.descriptors.VirtualAttributeMethodInfo;
+-import org.eclipse.persistence.internal.libraries.asm.*;
++import org.objectweb.asm.*;
+ 
+ /**
+  * Processes all the methods of a class to weave in persistence code such as,
+--- a/org/eclipse/persistence/internal/jpa/weaving/AttributeDetails.java
++++ b/org/eclipse/persistence/internal/jpa/weaving/AttributeDetails.java
+@@ -12,7 +12,7 @@
+  ******************************************************************************/  
+ package org.eclipse.persistence.internal.jpa.weaving;
+ 
+-import org.eclipse.persistence.internal.libraries.asm.Type;
++import org.objectweb.asm.Type;
+ 
+ import org.eclipse.persistence.mappings.DatabaseMapping;
+ 
+--- a/org/eclipse/persistence/internal/jpa/weaving/TransformerFactory.java
++++ b/org/eclipse/persistence/internal/jpa/weaving/TransformerFactory.java
+@@ -31,7 +31,7 @@
+ import org.eclipse.persistence.internal.jpa.metadata.accessors.objects.MetadataClass;
+ import org.eclipse.persistence.internal.jpa.metadata.accessors.objects.MetadataField;
+ import org.eclipse.persistence.internal.jpa.metadata.accessors.objects.MetadataMethod;
+-import org.eclipse.persistence.internal.libraries.asm.Type;
++import org.objectweb.asm.Type;
+ import org.eclipse.persistence.internal.sessions.AbstractSession;
+ import org.eclipse.persistence.internal.weaving.PersistenceWeavedChangeTracking;
+ import org.eclipse.persistence.logging.SessionLog;
 --- a/org/eclipse/persistence/internal/jpa/metadata/MetadataDynamicClassWriter.java
 +++ b/org/eclipse/persistence/internal/jpa/metadata/MetadataDynamicClassWriter.java
 @@ -13,20 +13,20 @@
@@ -133,6 +198,17 @@
  
  /**
   * Custom {@link DynamicClassWriter} adding getter methods for virtual
+--- a/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataClass.java
++++ b/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataClass.java
+@@ -34,7 +34,7 @@
+ import java.util.Set;
+ 
+ import org.eclipse.persistence.internal.helper.Helper;
+-import org.eclipse.persistence.internal.libraries.asm.Opcodes;
++import org.objectweb.asm.Opcodes;
+ 
+ /**
+  * INTERNAL:
 --- a/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataAsmFactory.java
 +++ b/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataAsmFactory.java
 @@ -28,14 +28,14 @@
@@ -158,210 +234,137 @@
  
  /**
   * INTERNAL: A metadata factory that uses ASM technology and no reflection
---- a/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataClass.java
-+++ b/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataClass.java
-@@ -32,7 +32,7 @@
- import java.util.Set;
- 
- import org.eclipse.persistence.internal.helper.Helper;
+--- a/org/eclipse/persistence/jaxb/compiler/MappingsGenerator.java
++++ b/org/eclipse/persistence/jaxb/compiler/MappingsGenerator.java
+@@ -72,10 +72,10 @@
+ import org.eclipse.persistence.internal.jaxb.many.ManyValue;
+ import org.eclipse.persistence.internal.jaxb.many.MapValue;
+ import org.eclipse.persistence.internal.jaxb.many.MapValueAttributeAccessor;
+-import org.eclipse.persistence.internal.libraries.asm.ClassWriter;
+-import org.eclipse.persistence.internal.libraries.asm.MethodVisitor;
 -import org.eclipse.persistence.internal.libraries.asm.Opcodes;
-+import org.objectweb.asm.Opcodes;
- 
- /**
-  * INTERNAL:
---- a/org/eclipse/persistence/internal/jpa/weaving/AttributeDetails.java
-+++ b/org/eclipse/persistence/internal/jpa/weaving/AttributeDetails.java
-@@ -12,7 +12,7 @@
-  ******************************************************************************/  
- package org.eclipse.persistence.internal.jpa.weaving;
- 
 -import org.eclipse.persistence.internal.libraries.asm.Type;
++import org.objectweb.asm.ClassWriter;
++import org.objectweb.asm.MethodVisitor;
++import org.objectweb.asm.Opcodes;
 +import org.objectweb.asm.Type;
+ import org.eclipse.persistence.internal.oxm.Constants;
  
- import org.eclipse.persistence.mappings.DatabaseMapping;
- 
---- a/org/eclipse/persistence/internal/jpa/weaving/ClassWeaver.java
-+++ b/org/eclipse/persistence/internal/jpa/weaving/ClassWeaver.java
-@@ -20,14 +20,14 @@
- import java.util.Iterator;
- 
- import org.eclipse.persistence.internal.helper.Helper;
+ import org.eclipse.persistence.internal.oxm.NamespaceResolver;
+--- a/org/eclipse/persistence/jaxb/compiler/AnnotationsProcessor.java
++++ b/org/eclipse/persistence/jaxb/compiler/AnnotationsProcessor.java
+@@ -81,13 +81,13 @@
+ import org.eclipse.persistence.internal.jaxb.many.ManyValue;
+ import org.eclipse.persistence.internal.jaxb.many.MultiDimensionalArrayValue;
+ import org.eclipse.persistence.internal.jaxb.many.MultiDimensionalCollectionValue;
+-import org.eclipse.persistence.internal.libraries.asm.AnnotationVisitor;
 -import org.eclipse.persistence.internal.libraries.asm.ClassWriter;
 -import org.eclipse.persistence.internal.libraries.asm.FieldVisitor;
--import org.eclipse.persistence.internal.libraries.asm.Label;
 -import org.eclipse.persistence.internal.libraries.asm.MethodVisitor;
 -import org.eclipse.persistence.internal.libraries.asm.Opcodes;
+-import org.eclipse.persistence.internal.libraries.asm.Label;
 -import org.eclipse.persistence.internal.libraries.asm.Type;
--import org.eclipse.persistence.internal.libraries.asm.commons.SerialVersionUIDAdder;
--import org.eclipse.persistence.internal.libraries.asm.signature.SignatureReader;
++import org.objectweb.asm.AnnotationVisitor;
 +import org.objectweb.asm.ClassWriter;
 +import org.objectweb.asm.FieldVisitor;
-+import org.objectweb.asm.Label;
 +import org.objectweb.asm.MethodVisitor;
 +import org.objectweb.asm.Opcodes;
++import org.objectweb.asm.Label;
 +import org.objectweb.asm.Type;
-+import org.objectweb.asm.commons.SerialVersionUIDAdder;
-+import org.objectweb.asm.signature.SignatureReader;
- 
- /**
-  * INTERNAL: Weaves classes to allow them to support EclipseLink indirection.
---- a/org/eclipse/persistence/internal/jpa/weaving/ComputeClassWriter.java
-+++ b/org/eclipse/persistence/internal/jpa/weaving/ComputeClassWriter.java
-@@ -33,9 +33,9 @@
- import java.io.IOException;
- import java.io.InputStream;
- 
--import org.eclipse.persistence.internal.libraries.asm.ClassReader;
+ import org.eclipse.persistence.internal.oxm.Constants;
+ import org.eclipse.persistence.internal.oxm.Namespace;
+ import org.eclipse.persistence.internal.oxm.XMLConversionManager;
+--- a/org/eclipse/persistence/sdo/helper/DynamicClassWriter.java
++++ b/org/eclipse/persistence/sdo/helper/DynamicClassWriter.java
+@@ -25,10 +25,10 @@
+ import org.eclipse.persistence.sdo.SDOProperty;
+ import org.eclipse.persistence.sdo.SDOType;
+ import org.eclipse.persistence.sdo.helper.extension.SDOUtil;
 -import org.eclipse.persistence.internal.libraries.asm.ClassWriter;
+-import org.eclipse.persistence.internal.libraries.asm.MethodVisitor;
 -import org.eclipse.persistence.internal.libraries.asm.Opcodes;
-+import org.objectweb.asm.ClassReader;
+-import org.eclipse.persistence.internal.libraries.asm.Type;
 +import org.objectweb.asm.ClassWriter;
++import org.objectweb.asm.MethodVisitor;
 +import org.objectweb.asm.Opcodes;
++import org.objectweb.asm.Type;
+ import org.eclipse.persistence.internal.security.PrivilegedAccessHelper;
  
- /**
-  * A ClassWriter that computes the common super class of two classes without
---- a/org/eclipse/persistence/internal/jpa/weaving/MethodWeaver.java
-+++ b/org/eclipse/persistence/internal/jpa/weaving/MethodWeaver.java
-@@ -14,7 +14,7 @@
- 
- //ASM imports
- import org.eclipse.persistence.internal.descriptors.VirtualAttributeMethodInfo;
--import org.eclipse.persistence.internal.libraries.asm.*;
-+import org.objectweb.asm.*;
- 
- /**
-  * Processes all the methods of a class to weave in persistence code such as,
---- a/org/eclipse/persistence/internal/jpa/weaving/PersistenceWeaver.java
-+++ b/org/eclipse/persistence/internal/jpa/weaving/PersistenceWeaver.java
-@@ -21,8 +21,8 @@
- 
- import org.eclipse.persistence.config.SystemProperties;
+ import commonj.sdo.helper.HelperContext;
+--- a/org/eclipse/persistence/dynamic/DynamicClassWriter.java
++++ b/org/eclipse/persistence/dynamic/DynamicClassWriter.java
+@@ -25,41 +25,41 @@
+ import org.eclipse.persistence.internal.dynamic.DynamicEntityImpl;
+ import org.eclipse.persistence.internal.dynamic.DynamicPropertiesManager;
  import org.eclipse.persistence.internal.helper.Helper;
--import org.eclipse.persistence.internal.libraries.asm.ClassReader;
--import org.eclipse.persistence.internal.libraries.asm.ClassWriter;
-+import org.objectweb.asm.ClassReader;
-+import org.objectweb.asm.ClassWriter;
- import org.eclipse.persistence.internal.sessions.AbstractSession;
- import org.eclipse.persistence.logging.SessionLog;
- import org.eclipse.persistence.sessions.Session;
---- a/org/eclipse/persistence/internal/jpa/weaving/RestAdapterClassWriter.java
-+++ b/org/eclipse/persistence/internal/jpa/weaving/RestAdapterClassWriter.java
-@@ -14,9 +14,9 @@
- 
- import org.eclipse.persistence.dynamic.DynamicClassLoader;
- import org.eclipse.persistence.dynamic.EclipseLinkClassWriter;
--import org.eclipse.persistence.internal.libraries.asm.ClassWriter;
--import org.eclipse.persistence.internal.libraries.asm.MethodVisitor;
--import org.eclipse.persistence.internal.libraries.asm.Opcodes;
-+import org.objectweb.asm.ClassWriter;
-+import org.objectweb.asm.MethodVisitor;
-+import org.objectweb.asm.Opcodes;
- 
- public class RestAdapterClassWriter implements EclipseLinkClassWriter, Opcodes {
- 
---- a/org/eclipse/persistence/internal/jpa/weaving/TransformerFactory.java
-+++ b/org/eclipse/persistence/internal/jpa/weaving/TransformerFactory.java
-@@ -31,7 +31,7 @@
- import org.eclipse.persistence.internal.jpa.metadata.accessors.objects.MetadataClass;
- import org.eclipse.persistence.internal.jpa.metadata.accessors.objects.MetadataField;
- import org.eclipse.persistence.internal.jpa.metadata.accessors.objects.MetadataMethod;
--import org.eclipse.persistence.internal.libraries.asm.Type;
-+import org.objectweb.asm.Type;
- import org.eclipse.persistence.internal.sessions.AbstractSession;
- import org.eclipse.persistence.internal.weaving.PersistenceWeavedChangeTracking;
- import org.eclipse.persistence.logging.SessionLog;
---- a/org/eclipse/persistence/internal/xr/XRClassWriter.java
-+++ b/org/eclipse/persistence/internal/xr/XRClassWriter.java
-@@ -17,21 +17,21 @@
- //EclipseLink imports
- import org.eclipse.persistence.dynamic.DynamicClassLoader;
- import org.eclipse.persistence.dynamic.DynamicClassWriter;
 -import org.eclipse.persistence.internal.libraries.asm.ClassWriter;
 -import org.eclipse.persistence.internal.libraries.asm.MethodVisitor;
+-import org.eclipse.persistence.internal.libraries.asm.Type;
 +import org.objectweb.asm.ClassWriter;
 +import org.objectweb.asm.MethodVisitor;
++import org.objectweb.asm.Type;
+ 
  import static org.eclipse.persistence.internal.dynamic.DynamicPropertiesManager.PROPERTIES_MANAGER_FIELD;
+-import static org.eclipse.persistence.internal.libraries.asm.Opcodes.AASTORE;
+-import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_ENUM;
+-import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_FINAL;
+-import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_PRIVATE;
 -import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_PUBLIC;
 -import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_STATIC;
 -import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_SUPER;
+-import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_SYNTHETIC;
 -import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ALOAD;
+-import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ANEWARRAY;
 -import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ARETURN;
+-import static org.eclipse.persistence.internal.libraries.asm.Opcodes.BIPUSH;
+-import static org.eclipse.persistence.internal.libraries.asm.Opcodes.SIPUSH;
+-import static org.eclipse.persistence.internal.libraries.asm.Opcodes.CHECKCAST;
 -import static org.eclipse.persistence.internal.libraries.asm.Opcodes.DUP;
 -import static org.eclipse.persistence.internal.libraries.asm.Opcodes.GETSTATIC;
+-import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ICONST_0;
+-import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ICONST_1;
+-import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ICONST_2;
+-import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ICONST_3;
+-import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ICONST_4;
+-import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ICONST_5;
+-import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ILOAD;
 -import static org.eclipse.persistence.internal.libraries.asm.Opcodes.INVOKESPECIAL;
+-import static org.eclipse.persistence.internal.libraries.asm.Opcodes.INVOKESTATIC;
+-import static org.eclipse.persistence.internal.libraries.asm.Opcodes.INVOKEVIRTUAL;
 -import static org.eclipse.persistence.internal.libraries.asm.Opcodes.NEW;
 -import static org.eclipse.persistence.internal.libraries.asm.Opcodes.PUTSTATIC;
 -import static org.eclipse.persistence.internal.libraries.asm.Opcodes.RETURN;
 -import static org.eclipse.persistence.internal.libraries.asm.Opcodes.V1_5;
++import static org.objectweb.asm.Opcodes.AASTORE;
++import static org.objectweb.asm.Opcodes.ACC_ENUM;
++import static org.objectweb.asm.Opcodes.ACC_FINAL;
++import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
 +import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
 +import static org.objectweb.asm.Opcodes.ACC_STATIC;
 +import static org.objectweb.asm.Opcodes.ACC_SUPER;
++import static org.objectweb.asm.Opcodes.ACC_SYNTHETIC;
 +import static org.objectweb.asm.Opcodes.ALOAD;
++import static org.objectweb.asm.Opcodes.ANEWARRAY;
 +import static org.objectweb.asm.Opcodes.ARETURN;
++import static org.objectweb.asm.Opcodes.BIPUSH;
++import static org.objectweb.asm.Opcodes.SIPUSH;
++import static org.objectweb.asm.Opcodes.CHECKCAST;
 +import static org.objectweb.asm.Opcodes.DUP;
 +import static org.objectweb.asm.Opcodes.GETSTATIC;
++import static org.objectweb.asm.Opcodes.ICONST_0;
++import static org.objectweb.asm.Opcodes.ICONST_1;
++import static org.objectweb.asm.Opcodes.ICONST_2;
++import static org.objectweb.asm.Opcodes.ICONST_3;
++import static org.objectweb.asm.Opcodes.ICONST_4;
++import static org.objectweb.asm.Opcodes.ICONST_5;
++import static org.objectweb.asm.Opcodes.ILOAD;
 +import static org.objectweb.asm.Opcodes.INVOKESPECIAL;
++import static org.objectweb.asm.Opcodes.INVOKESTATIC;
++import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL;
 +import static org.objectweb.asm.Opcodes.NEW;
 +import static org.objectweb.asm.Opcodes.PUTSTATIC;
 +import static org.objectweb.asm.Opcodes.RETURN;
 +import static org.objectweb.asm.Opcodes.V1_5;
- import static org.eclipse.persistence.internal.xr.XRDynamicClassLoader.COLLECTION_WRAPPER_SUFFIX;
  
  /**
---- a/org/eclipse/persistence/jaxb/compiler/AnnotationsProcessor.java
-+++ b/org/eclipse/persistence/jaxb/compiler/AnnotationsProcessor.java
-@@ -82,13 +82,13 @@
- import org.eclipse.persistence.internal.jaxb.many.ManyValue;
- import org.eclipse.persistence.internal.jaxb.many.MultiDimensionalArrayValue;
- import org.eclipse.persistence.internal.jaxb.many.MultiDimensionalCollectionValue;
--import org.eclipse.persistence.internal.libraries.asm.AnnotationVisitor;
--import org.eclipse.persistence.internal.libraries.asm.ClassWriter;
--import org.eclipse.persistence.internal.libraries.asm.FieldVisitor;
--import org.eclipse.persistence.internal.libraries.asm.MethodVisitor;
--import org.eclipse.persistence.internal.libraries.asm.Opcodes;
--import org.eclipse.persistence.internal.libraries.asm.Label;
--import org.eclipse.persistence.internal.libraries.asm.Type;
-+import org.objectweb.asm.AnnotationVisitor;
-+import org.objectweb.asm.ClassWriter;
-+import org.objectweb.asm.FieldVisitor;
-+import org.objectweb.asm.MethodVisitor;
-+import org.objectweb.asm.Opcodes;
-+import org.objectweb.asm.Label;
-+import org.objectweb.asm.Type;
- import org.eclipse.persistence.internal.oxm.Constants;
- import org.eclipse.persistence.internal.oxm.Namespace;
- import org.eclipse.persistence.internal.oxm.XMLConversionManager;
---- a/org/eclipse/persistence/jaxb/compiler/MappingsGenerator.java
-+++ b/org/eclipse/persistence/jaxb/compiler/MappingsGenerator.java
-@@ -72,10 +72,10 @@
- import org.eclipse.persistence.internal.jaxb.many.ManyValue;
- import org.eclipse.persistence.internal.jaxb.many.MapValue;
- import org.eclipse.persistence.internal.jaxb.many.MapValueAttributeAccessor;
--import org.eclipse.persistence.internal.libraries.asm.ClassWriter;
--import org.eclipse.persistence.internal.libraries.asm.MethodVisitor;
--import org.eclipse.persistence.internal.libraries.asm.Opcodes;
--import org.eclipse.persistence.internal.libraries.asm.Type;
-+import org.objectweb.asm.ClassWriter;
-+import org.objectweb.asm.MethodVisitor;
-+import org.objectweb.asm.Opcodes;
-+import org.objectweb.asm.Type;
- import org.eclipse.persistence.internal.oxm.Constants;
- 
- import org.eclipse.persistence.internal.oxm.NamespaceResolver;
---- a/org/eclipse/persistence/sdo/helper/DynamicClassWriter.java
-+++ b/org/eclipse/persistence/sdo/helper/DynamicClassWriter.java
-@@ -25,10 +25,10 @@
- import org.eclipse.persistence.sdo.SDOProperty;
- import org.eclipse.persistence.sdo.SDOType;
- import org.eclipse.persistence.sdo.helper.extension.SDOUtil;
--import org.eclipse.persistence.internal.libraries.asm.ClassWriter;
--import org.eclipse.persistence.internal.libraries.asm.MethodVisitor;
--import org.eclipse.persistence.internal.libraries.asm.Opcodes;
--import org.eclipse.persistence.internal.libraries.asm.Type;
-+import org.objectweb.asm.ClassWriter;
-+import org.objectweb.asm.MethodVisitor;
-+import org.objectweb.asm.Opcodes;
-+import org.objectweb.asm.Type;
- import org.eclipse.persistence.internal.security.PrivilegedAccessHelper;
- 
- import commonj.sdo.helper.HelperContext;
+  * Write the byte codes of a dynamic entity class. The class writer will create
diff --git a/debian/patches/series b/debian/patches/series
index 78b2c3c..60768b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
-charset.patch
-cast.patch
-typeparameters.patch
 disable_antlr3_embedded_copy.diff
 disable_asm_embedded_copy.diff
+charset.patch
+typeparameters.patch
diff --git a/debian/patches/typeparameters.patch b/debian/patches/typeparameters.patch
index 9abef31..3781a7a 100644
--- a/debian/patches/typeparameters.patch
+++ b/debian/patches/typeparameters.patch
@@ -1,6 +1,6 @@
 --- a/org/eclipse/persistence/internal/oxm/XMLMarshaller.java
 +++ b/org/eclipse/persistence/internal/oxm/XMLMarshaller.java
-@@ -69,7 +69,7 @@
+@@ -68,7 +68,7 @@
  public abstract class XMLMarshaller<
      ABSTRACT_SESSION extends CoreAbstractSession,
      CONTEXT extends Context<ABSTRACT_SESSION, DESCRIPTOR, ?, ?, ?, ?, ?>,
diff --git a/debian/regenerate-patches.sh b/debian/regenerate-patches.sh
new file mode 100644
index 0000000..870c209
--- /dev/null
+++ b/debian/regenerate-patches.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+quilt delete disable_antlr3_embedded_copy.diff
+quilt delete disable_asm_embedded_copy.diff 
+
+mv debian/patches/disable_antlr3_embedded_copy.diff debian/patches/disable_antlr3_embedded_copy.diff.old
+mv debian/patches/disable_asm_embedded_copy.diff debian/patches/disable_asm_embedded_copy.diff.old
+
+quilt new disable_antlr3_embedded_copy.diff
+
+for file in `fgrep -l -r "org.eclipse.persistence.internal.libraries.antlr" org/ | fgrep -v "org/eclipse/persistence/internal/libraries/antlr"`
+do
+    echo $file
+    quilt add $file
+    sed -i -e 's/org\.eclipse\.persistence\.internal\.libraries\.antlr/org.antlr/g' $file
+    quilt refresh
+done
+
+
+quilt new disable_asm_embedded_copy.diff
+
+for file in `fgrep -l -r "org.eclipse.persistence.internal.libraries.asm" org/ | fgrep -v "org/eclipse/persistence/internal/libraries/asm"`
+do
+    echo $file
+    quilt add $file
+    sed -i -e 's/org\.eclipse\.persistence\.internal\.libraries\.asm/org.objectweb.asm/g' $file
+    quilt refresh
+done
+
+echo "*****************************************"
+echo "Now copy the headers from the old patches"
+echo "*****************************************"

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

More information about the pkg-java-commits mailing list