[SCM] jenkins-dom4j packaging branch, master, updated. debian/1.6.1-hudson-3-4-1-g14f7ba0
Emmanuel Bourg
ebourg at apache.org
Wed Jul 17 10:21:40 UTC 2013
The following commit has been merged in the master branch:
commit 14f7ba0525a3b34fe156f757c85930f34cf15764
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Jul 17 12:20:59 2013 +0200
Don't compile the classes in the org.dom4j.dom package to match the behavior of the upstream build
Specified the source file encoding to fix the unmappable character error with Java 7 (Closes: #717118)
diff --git a/debian/changelog b/debian/changelog
index 490e4a5..0da24f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+jenkins-dom4j (1.6.1-hudson-3-5) unstable; urgency=low
+
+ * Don't compile the classes in the org.dom4j.dom package
+ to match the behavior of the upstream build.
+ * Specified the source file encoding to fix the unmappable character error
+ with Java 7 (Closes: #717118)
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 17 Jul 2013 12:19:57 +0200
+
jenkins-dom4j (1.6.1-hudson-3-4) unstable; urgency=low
* Removed the dependency on libjaxme-java
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
index 49bba3f..ae5cb98 100644
--- a/debian/patches/build.patch
+++ b/debian/patches/build.patch
@@ -35,16 +35,7 @@ Forwarded: not-needed
</fileset>
</path>
-@@ -146,8 +147,6 @@
- source="1.3"
- deprecation="${deprecation}"
- classpathref="compile.classpath">
-- <exclude name="**/jaxb/*" />
-- <exclude name="**/dom/*" />
- </javac>
- </target>
-
-@@ -223,8 +222,7 @@
+@@ -223,8 +224,7 @@
doctitle="${Name}"
bottom="Copyright © ${year} MetaStuff Ltd. All Rights Reserved. Hosted by <p> <img src='http://sourceforge.net/sflogo.php?group_id=16035' width='88' height='31' border='0' alt='SourceForge Logo' />"
stylesheetfile="${doc.dir}/style/javadoc.css">
@@ -54,7 +45,7 @@ Forwarded: not-needed
</javadoc>
<mkdir dir="${build.apidocs}"/>
-@@ -240,8 +238,7 @@
+@@ -240,8 +240,7 @@
doctitle="${Name}"
bottom="Copyright © ${year} MetaStuff Ltd. All Rights Reserved. Hosted by <p> <img src='http://sourceforge.net/sflogo.php?group_id=16035' width='88' height='31' border='0' alt='SourceForge Logo' />"
stylesheetfile="${doc.dir}/style/javadoc.css">
@@ -64,7 +55,7 @@ Forwarded: not-needed
<link href="${build.javadocs}"/>
</javadoc>
</target>
-@@ -274,7 +271,7 @@
+@@ -274,7 +273,7 @@
<!-- =================================================================== -->
<target name="test" depends="compile-test">
<mkdir dir="${build.dir}/test-results/xml"/>
diff --git a/debian/patches/compat.patch b/debian/patches/compat.patch
index d500c01..45ccd92 100644
--- a/debian/patches/compat.patch
+++ b/debian/patches/compat.patch
@@ -3,10 +3,8 @@ Description: Various compatibility patches for API compliance
Author: Marcus Better <marcus at better.se>
Forwarded: not-needed
-Index: hudson-dom4j/src/test/org/dom4j/xpath/MatrixConcatTest.java
-===================================================================
---- hudson-dom4j.orig/src/test/org/dom4j/xpath/MatrixConcatTest.java 2011-05-31 10:00:42.550297000 +0100
-+++ hudson-dom4j/src/test/org/dom4j/xpath/MatrixConcatTest.java 2011-06-08 10:20:38.973014964 +0100
+--- a/src/test/org/dom4j/xpath/MatrixConcatTest.java
++++ b/src/test/org/dom4j/xpath/MatrixConcatTest.java
@@ -33,9 +33,11 @@
String[] exp2 = {"EQUITY_BAR_CF1", "EQUITY_BAR_CF2", "EQUITY_BAR_CF3"};
@@ -19,979 +17,3 @@ Index: hudson-dom4j/src/test/org/dom4j/xpath/MatrixConcatTest.java
}
// Implementation methods
-Index: hudson-dom4j/src/java/org/dom4j/dom/DOMNamespace.java
-===================================================================
---- hudson-dom4j.orig/src/java/org/dom4j/dom/DOMNamespace.java 2011-05-31 10:00:42.550297000 +0100
-+++ hudson-dom4j/src/java/org/dom4j/dom/DOMNamespace.java 2011-06-08 10:20:38.973014964 +0100
-@@ -13,7 +13,9 @@
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -140,6 +142,66 @@
- public boolean hasAttributes() {
- return DOMNodeHelper.hasAttributes(this);
- }
-+
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String arg0, String arg1) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
- /*
-Index: hudson-dom4j/src/java/org/dom4j/dom/DOMCDATA.java
-===================================================================
---- hudson-dom4j.orig/src/java/org/dom4j/dom/DOMCDATA.java 2011-05-31 10:00:42.550297000 +0100
-+++ hudson-dom4j/src/java/org/dom4j/dom/DOMCDATA.java 2011-06-08 10:20:38.973014964 +0100
-@@ -14,7 +14,10 @@
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.Text;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -225,6 +228,81 @@
- protected CDATA createCDATA(String text) {
- return new DOMCDATA(text);
- }
-+
-+ public boolean isElementContentWhitespace() {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String getWholeText() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Text replaceWholeText(String content) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node other) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String textContent) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node other) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String namespaceURI) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String namespaceURI) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String prefix) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String feature, String version) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String key, Object data, UserDataHandler handler) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String key) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
- /*
-Index: hudson-dom4j/src/java/org/dom4j/dom/DOMDocumentType.java
-===================================================================
---- hudson-dom4j.orig/src/java/org/dom4j/dom/DOMDocumentType.java 2011-05-31 10:00:42.550297000 +0100
-+++ hudson-dom4j/src/java/org/dom4j/dom/DOMDocumentType.java 2011-06-08 10:20:38.973014964 +0100
-@@ -12,7 +12,9 @@
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -177,6 +179,66 @@
- public String getInternalSubset() {
- return getElementName();
- }
-+
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String arg0, String arg1) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
- /*
-Index: hudson-dom4j/src/java/org/dom4j/dom/DOMAttribute.java
-===================================================================
---- hudson-dom4j.orig/src/java/org/dom4j/dom/DOMAttribute.java 2011-05-31 10:00:42.550297000 +0100
-+++ hudson-dom4j/src/java/org/dom4j/dom/DOMAttribute.java 2011-06-08 10:20:38.973014964 +0100
-@@ -14,7 +14,10 @@
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.TypeInfo;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -179,6 +182,76 @@
- public org.w3c.dom.Element getOwnerElement() {
- return DOMNodeHelper.asDOMElement(getParent());
- }
-+
-+ public TypeInfo getSchemaTypeInfo() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isId() {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node other) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String textContent) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node other) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String namespaceURI) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String namespaceURI) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String prefix) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String feature, String version) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String key, Object data, UserDataHandler handler) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String key) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
- /*
-Index: hudson-dom4j/src/java/org/dom4j/dom/DOMText.java
-===================================================================
---- hudson-dom4j.orig/src/java/org/dom4j/dom/DOMText.java 2011-05-31 10:00:42.550297000 +0100
-+++ hudson-dom4j/src/java/org/dom4j/dom/DOMText.java 2011-06-08 10:20:38.973014964 +0100
-@@ -14,7 +14,9 @@
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -224,6 +226,81 @@
- protected Text createText(String text) {
- return new DOMText(text);
- }
-+
-+ public boolean isElementContentWhitespace() {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String getWholeText() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public org.w3c.dom.Text replaceWholeText(String arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String arg0, String arg1) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
- /*
-Index: hudson-dom4j/src/java/org/dom4j/dom/DOMDocument.java
-===================================================================
---- hudson-dom4j.orig/src/java/org/dom4j/dom/DOMDocument.java 2011-05-31 10:00:42.550297000 +0100
-+++ hudson-dom4j/src/java/org/dom4j/dom/DOMDocument.java 2011-06-08 10:20:38.973014964 +0100
-@@ -15,12 +15,15 @@
-
- import org.w3c.dom.Attr;
- import org.w3c.dom.CDATASection;
-+import org.w3c.dom.DOMConfiguration;
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.EntityReference;
- import org.w3c.dom.NamedNodeMap;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
- import org.w3c.dom.ProcessingInstruction;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -301,6 +304,136 @@
- return super.getDocumentFactory();
- }
- }
-+
-+ public String getInputEncoding() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public String getXmlEncoding() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean getXmlStandalone() {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public void setXmlStandalone(boolean arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public String getXmlVersion() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setXmlVersion(String arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean getStrictErrorChecking() {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public void setStrictErrorChecking(boolean arg0) {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public String getDocumentURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setDocumentURI(String arg0) {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public Node adoptNode(Node arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public DOMConfiguration getDomConfig() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void normalizeDocument() {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public Node renameNode(Node arg0, String arg1, String arg2) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String arg0, String arg1) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
- /*
-Index: hudson-dom4j/src/java/org/dom4j/dom/DOMEntityReference.java
-===================================================================
---- hudson-dom4j.orig/src/java/org/dom4j/dom/DOMEntityReference.java 2011-05-31 10:00:42.550297000 +0100
-+++ hudson-dom4j/src/java/org/dom4j/dom/DOMEntityReference.java 2011-06-08 10:20:38.973014964 +0100
-@@ -13,7 +13,9 @@
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -166,6 +168,66 @@
- public boolean hasAttributes() {
- return DOMNodeHelper.hasAttributes(this);
- }
-+
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String arg0, String arg1) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
- /*
-Index: hudson-dom4j/src/java/org/dom4j/dom/DOMDocumentFactory.java
-===================================================================
---- hudson-dom4j.orig/src/java/org/dom4j/dom/DOMDocumentFactory.java 2011-05-31 10:00:42.550297000 +0100
-+++ hudson-dom4j/src/java/org/dom4j/dom/DOMDocumentFactory.java 2011-06-08 10:20:38.973014964 +0100
-@@ -174,6 +174,11 @@
- docType.getPublicId(), docType.getSystemId());
- }
- }
-+
-+ public Object getFeature(String arg0, String arg1) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
-
-@@ -213,4 +218,4 @@
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
-- */
-\ No newline at end of file
-+ */
-Index: hudson-dom4j/src/java/org/dom4j/dom/DOMElement.java
-===================================================================
---- hudson-dom4j.orig/src/java/org/dom4j/dom/DOMElement.java 2011-05-31 10:00:42.550297000 +0100
-+++ hudson-dom4j/src/java/org/dom4j/dom/DOMElement.java 2011-06-08 10:20:38.973014964 +0100
-@@ -16,11 +16,14 @@
- import org.dom4j.QName;
- import org.dom4j.tree.DefaultElement;
-
-+import org.w3c.dom.Attr;
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
- import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.TypeInfo;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -389,6 +392,86 @@
-
- return getDocumentFactory().createQName(localName, prefix, namespace);
- }
-+
-+ public TypeInfo getSchemaTypeInfo() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setIdAttribute(String arg0, boolean arg1) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public void setIdAttributeNS(String arg0, String arg1, boolean arg2) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public void setIdAttributeNode(Attr arg0, boolean arg1) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String arg0, String arg1) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
- /*
-Index: hudson-dom4j/src/java/org/dom4j/dom/DOMProcessingInstruction.java
-===================================================================
---- hudson-dom4j.orig/src/java/org/dom4j/dom/DOMProcessingInstruction.java 2011-05-31 10:00:42.550297000 +0100
-+++ hudson-dom4j/src/java/org/dom4j/dom/DOMProcessingInstruction.java 2011-06-08 10:20:38.983014964 +0100
-@@ -15,7 +15,9 @@
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -177,6 +179,66 @@
- }
- }
-
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String arg0) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg0) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String arg0, String arg1) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String arg0) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
- // Implementation methods
- // -------------------------------------------------------------------------
- }
-Index: hudson-dom4j/src/java/org/dom4j/dom/DOMComment.java
-===================================================================
---- hudson-dom4j.orig/src/java/org/dom4j/dom/DOMComment.java 2011-05-31 10:00:42.550297000 +0100
-+++ hudson-dom4j/src/java/org/dom4j/dom/DOMComment.java 2011-06-08 10:20:38.983014964 +0100
-@@ -13,7 +13,9 @@
- import org.w3c.dom.DOMException;
- import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
-+import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.UserDataHandler;
-
- /**
- * <p>
-@@ -187,6 +189,66 @@
- throws DOMException {
- DOMNodeHelper.replaceData(this, offset, count, arg);
- }
-+
-+ public String getBaseURI() {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public short compareDocumentPosition(Node other) throws DOMException {
-+ // TODO Auto-generated method stub
-+ return 0;
-+ }
-+
-+ public String getTextContent() throws DOMException {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public void setTextContent(String textContent) throws DOMException {
-+ // TODO Auto-generated method stub
-+
-+ }
-+
-+ public boolean isSameNode(Node other) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupPrefix(String namespaceURI) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isDefaultNamespace(String namespaceURI) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public String lookupNamespaceURI(String prefix) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public boolean isEqualNode(Node arg) {
-+ // TODO Auto-generated method stub
-+ return false;
-+ }
-+
-+ public Object getFeature(String feature, String version) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object setUserData(String key, Object data, UserDataHandler handler) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
-+
-+ public Object getUserData(String key) {
-+ // TODO Auto-generated method stub
-+ return null;
-+ }
- }
-
- /*
diff --git a/debian/patches/fix-test-compilation.patch b/debian/patches/fix-test-compilation.patch
new file mode 100644
index 0000000..5f1917d
--- /dev/null
+++ b/debian/patches/fix-test-compilation.patch
@@ -0,0 +1,56 @@
+Description: Fix the issues preventing the compilation of the tests
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: https://github.com/jenkinsci/dom4j/pull/3
+--- a/build.xml
++++ b/build.xml
+@@ -160,8 +160,11 @@
+ destdir="${build.dest}"
+ debug="${debug}"
+ optimize="${optimize}"
++ encoding="ISO-8859-1"
+ deprecation="${deprecation}"
+ classpathref="test.classpath">
++ <exclude name="**/dom/*" />
++ <exclude name="**/DOMWriterTest*" />
+ </javac>
+ </target>
+
+@@ -284,6 +287,8 @@
+ <batchtest fork="yes" todir="${build.dir}/test-results/xml">
+ <fileset dir="${test.dir}">
+ <include name="**/*Test.java" />
++ <exclude name="**/dom/*" />
++ <exclude name="**/DOMWriterTest.java" />
+ <exclude name="**/AllTests.java,**/Abstract*.java,**/TestCase.java" />
+ </fileset>
+ </batchtest>
+--- a/src/test/org/dom4j/CloneTest.java
++++ b/src/test/org/dom4j/CloneTest.java
+@@ -11,8 +11,6 @@
+
+ import java.util.Comparator;
+
+-import org.dom4j.dom.DOMDocument;
+-import org.dom4j.dom.DOMDocumentFactory;
+ import org.dom4j.util.NodeComparator;
+
+ /**
+@@ -30,18 +28,6 @@
+
+ // Test case(s)
+ // -------------------------------------------------------------------------
+- public void testBug1148333() {
+- DOMDocumentFactory factory = (DOMDocumentFactory) DOMDocumentFactory
+- .getInstance();
+- DOMDocument doc = (DOMDocument) factory.createDocument();
+- Element el = doc.addElement("root");
+- el.addNamespace("pref2", "uri2");
+-
+- DOMDocument clone = (DOMDocument) doc.cloneNode(true);
+-
+- assertNotSame(doc, clone);
+- assertNodesEqual(doc, clone);
+- }
+
+ public void testElementWithNamespaceClone() {
+ Element element = DocumentFactory.getInstance()
diff --git a/debian/patches/series b/debian/patches/series
index 717a569..60c1854 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
build.patch
backport-util.patch
compat.patch
+fix-test-compilation.patch
--
jenkins-dom4j packaging
More information about the pkg-java-commits
mailing list