Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package axis for openSUSE:Factory checked in at 2022-03-18 16:42:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/axis (Old) and /work/SRC/openSUSE:Factory/.axis.new.25692 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "axis" Fri Mar 18 16:42:44 2022 rev:38 rq:962703 version:1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/axis/axis.changes 2022-03-04 00:18:04.508290717 +0100 +++ /work/SRC/openSUSE:Factory/.axis.new.25692/axis.changes 2022-03-18 16:43:03.553220976 +0100 @@ -1,0 +2,10 @@ +Fri Mar 18 13:55:46 UTC 2022 - Fridrich Strba <fst...@suse.com> + +- Unify the dependency on glassfish-activation-api instead of jaf + and gnu-jaf +- Added patch: + * unimplemented-saaj13-methods.patch + + on systems where the JavaEE modules exist, allow building + against newer versions of APIs + +------------------------------------------------------------------- New: ---- unimplemented-saaj13-methods.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ axis.spec ++++++ --- /var/tmp/diff_new_pack.Pohahl/_old 2022-03-18 16:43:04.241221469 +0100 +++ /var/tmp/diff_new_pack.Pohahl/_new 2022-03-18 16:43:04.249221475 +0100 @@ -51,12 +51,12 @@ Patch8: axis-jdk11.patch # PATCH-FIX-UPSTREAM bsc#1134598 CVE-2012-5784 CVE-2014-3596 missing connection hostname check against X.509 certificate name Patch9: axis-CVE-2014-3596.patch +Patch10: unimplemented-saaj13-methods.patch BuildRequires: ant BuildRequires: ant-jdepend BuildRequires: antlr BuildRequires: apache-commons-httpclient BuildRequires: apache-commons-logging -BuildRequires: gnu-jaf BuildRequires: jakarta-commons-discovery BuildRequires: java-devel >= 1.8 BuildRequires: javamail @@ -70,7 +70,6 @@ BuildRequires: xerces-j2 Requires: apache-commons-httpclient Requires: apache-commons-logging -Requires: jaf Requires: jakarta-commons-discovery Requires: java Requires: javamail @@ -79,6 +78,10 @@ Requires: wsdl4j Obsoletes: %{name}-javadoc BuildArch: noarch +%if 0%{?suse_version} > 1500 +BuildRequires: glassfish-activation-api +Requires: glassfish-activation-api +%endif %description Apache Axis is an implementation of the SOAP ("Simple Object Access @@ -106,6 +109,7 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 # Remove provided binaries find . "(" -name "*.jar" -o -name "*.zip" -o -name "*.class" ")" -delete @@ -121,7 +125,11 @@ %build [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java -CLASSPATH=$(build-classpath wsdl4j commons-discovery commons-httpclient3 commons-logging reload4j activation javamail servletapi5) +CLASSPATH=$(build-classpath wsdl4j commons-discovery commons-httpclient3 commons-logging reload4j \ +%if 0%{?suse_version} > 1500 + glassfish-activation-api \ +%endif + javamail servletapi5) export CLASSPATH=$CLASSPATH:$(build-classpath oro junit jdepend jimi xml-security jsse httpunit jms castor 2>/dev/null) export OPT_JAR_LIST="ant/ant-nodeps" ant -Dcompile.ime=true \ @@ -130,7 +138,11 @@ -Dcommons-logging.jar=$(build-classpath commons-logging) \ -Dcommons-httpclient.jar=$(build-classpath commons-httpclient3) \ -Dlog4j-core.jar=$(build-classpath reload4j/reload4j) \ - -Dactivation.jar=$(build-classpath jaf) \ +%if 0%{?suse_version} > 1500 + -Dactivation.jar=$(build-classpath glassfish-activation-api) \ +%else + -Dactivation.jar= \ +%endif -Dmailapi.jar=$(build-classpath javamail/mailapi) \ -Dxerces.jar=$(build-classpath jaxp_parser_impl) \ -Dservlet.jar=$(build-classpath servletapi5) \ ++++++ unimplemented-saaj13-methods.patch ++++++ diff -urEbwB axis-1_4.orig/src/org/apache/axis/attachments/AttachmentPart.java axis-1_4/src/org/apache/axis/attachments/AttachmentPart.java --- axis-1_4.orig/src/org/apache/axis/attachments/AttachmentPart.java 2006-04-23 03:57:27.000000000 +0200 +++ axis-1_4/src/org/apache/axis/attachments/AttachmentPart.java 2022-03-18 13:29:00.839161021 +0100 @@ -546,4 +546,25 @@ //we get to release memory anyway datahandler = null; } + + public InputStream getBase64Content() { + return null; + } + + public void setBase64Content(InputStream content, String contentType) { + } + + public void setRawContentBytes(byte[] content, int offset, int len, String contentType) { + } + + public void setRawContent(InputStream content, String contentType) { + } + + public byte[] getRawContentBytes() { + return new byte[0]; + } + + public InputStream getRawContent() { + return null; + } } diff -urEbwB axis-1_4.orig/src/org/apache/axis/message/Detail.java axis-1_4/src/org/apache/axis/message/Detail.java --- axis-1_4.orig/src/org/apache/axis/message/Detail.java 2006-04-23 03:57:27.000000000 +0200 +++ axis-1_4/src/org/apache/axis/message/Detail.java 2022-03-18 13:29:43.371458397 +0100 @@ -16,6 +16,7 @@ package org.apache.axis.message; +import javax.xml.namespace.QName; import javax.xml.soap.DetailEntry; import javax.xml.soap.Name; import javax.xml.soap.SOAPException; @@ -52,4 +53,8 @@ public Iterator getDetailEntries() { return this.getChildElements(); } + + public DetailEntry addDetailEntry(QName name) throws SOAPException { + return addDetailEntry(new PrefixedQName(name)); + } } diff -urEbwB axis-1_4.orig/src/org/apache/axis/message/MessageElement.java axis-1_4/src/org/apache/axis/message/MessageElement.java --- axis-1_4.orig/src/org/apache/axis/message/MessageElement.java 2006-04-23 03:57:26.000000000 +0200 +++ axis-1_4/src/org/apache/axis/message/MessageElement.java 2022-03-18 13:29:55.583543778 +0100 @@ -2143,4 +2143,57 @@ } return doc; } + + // Adding unimplemented functions + + public SOAPElement addAttribute(QName qname, String value) throws SOAPException { + return addAttribute(new PrefixedQName(qname), value); + } + + public SOAPElement addChildElement(QName qname) throws SOAPException { + return addChildElement(new PrefixedQName(qname)); + } + + public QName createQName(String localName, String prefix) { + return new QName(getNamespaceURI(), localName, prefix); + } + + public Iterator getAllAttributesAsQNames() { + int num = attributes.getLength(); + Vector attrs = new Vector(num); + for (int i = 0; i < num; i++) { + String q = attributes.getQName(i); + String prefix = ""; + if (q != null) { + int idx = q.indexOf(":"); + if (idx > 0) { + prefix = q.substring(0, idx); + } else { + prefix= ""; + } + } + + attrs.add(new QName(attributes.getURI(i), + attributes.getLocalName(i), + prefix)); + } + return attrs.iterator(); + } + + public String getAttributeValue(QName qname) { + return getAttributeValue(new PrefixedQName(qname)); + } + + public QName getElementQName() { + return new QName(getNamespaceURI(), getName(), getPrefix()); + } + + public boolean removeAttribute (QName qname) { + return removeAttribute(new PrefixedQName(qname)); + } + + public SOAPElement setElementQName(QName newName) { + return null; // unimplemented + } + } diff -urEbwB axis-1_4.orig/src/org/apache/axis/message/SOAPBody.java axis-1_4/src/org/apache/axis/message/SOAPBody.java --- axis-1_4.orig/src/org/apache/axis/message/SOAPBody.java 2006-04-23 03:57:27.000000000 +0200 +++ axis-1_4/src/org/apache/axis/message/SOAPBody.java 2022-03-18 11:12:57.250249421 +0100 @@ -306,4 +306,22 @@ public void setSAAJEncodingCompliance(boolean comply) { this.doSAAJEncodingCompliance = true; } + + // uninmplemented functions + public javax.xml.soap.SOAPBodyElement addBodyElement(QName name) + throws SOAPException { + return addBodyElement(new PrefixedQName(name)); + } + + public javax.xml.soap.SOAPFault addFault(QName name, String s, Locale locale) throws SOAPException { + return addFault(new PrefixedQName(name), s, locale); + } + + public javax.xml.soap.SOAPFault addFault(QName name, String s) throws SOAPException { + return addFault(new PrefixedQName(name), s); + } + + public Document extractContentAsDocument() { + return null; + } } diff -urEbwB axis-1_4.orig/src/org/apache/axis/message/SOAPFault.java axis-1_4/src/org/apache/axis/message/SOAPFault.java --- axis-1_4.orig/src/org/apache/axis/message/SOAPFault.java 2006-04-23 03:57:27.000000000 +0200 +++ axis-1_4/src/org/apache/axis/message/SOAPFault.java 2022-03-18 13:01:31.303632820 +0100 @@ -423,4 +423,56 @@ } } } + + public void addFaultReasonText(String text, Locale locale) { + } + + public Iterator getFaultReasonLocales() { + return null; + } + + public String getFaultReasonText(Locale locale) { + return null; + } + + public Iterator getFaultReasonTexts() { + return null; + } + + public void setFaultRole(String uri) { + } + + public void setFaultNode(String uri) { + } + + public String getFaultRole() { + return null; + } + + public String getFaultNode() { + return null; + } + + public boolean hasDetail() { + return false; + } + + public void appendFaultSubcode(QName subcode) { + } + + public QName getFaultCodeAsQName() { + Name name = getFaultCodeAsName(); + return new QName(name.getURI(), name.getLocalName(), name.getPrefix()); + } + + public void removeAllFaultSubcodes() { + } + + public Iterator getFaultSubcodes() { + return null; + } + + public void setFaultCode(QName faultCodeQName) throws SOAPException { + setFaultCode(new PrefixedQName(faultCodeQName)); + } } diff -urEbwB axis-1_4.orig/src/org/apache/axis/message/SOAPHeader.java axis-1_4/src/org/apache/axis/message/SOAPHeader.java --- axis-1_4.orig/src/org/apache/axis/message/SOAPHeader.java 2006-04-23 03:57:27.000000000 +0200 +++ axis-1_4/src/org/apache/axis/message/SOAPHeader.java 2022-03-18 11:05:17.135058675 +0100 @@ -400,4 +400,26 @@ } return headerElement; } + + + // new unimplemented stuff + public javax.xml.soap.SOAPHeaderElement addHeaderElement(QName qname) throws SOAPException { + return addHeaderElement(new PrefixedQName(qname)); + } + + public javax.xml.soap.SOAPHeaderElement addNotUnderstoodHeaderElement(QName name) { + return null; + } + + public javax.xml.soap.SOAPHeaderElement addUpgradeHeaderElement(String supportedSoapUri) { + return null; + } + + public javax.xml.soap.SOAPHeaderElement addUpgradeHeaderElement(String[] supportedSoapUris) { + return null; + } + + public javax.xml.soap.SOAPHeaderElement addUpgradeHeaderElement(Iterator<String> supportedSOAPURIs) { + return null; + } } diff -urEbwB axis-1_4.orig/src/org/apache/axis/Message.java axis-1_4/src/org/apache/axis/Message.java --- axis-1_4.orig/src/org/apache/axis/Message.java 2006-04-23 03:57:27.000000000 +0200 +++ axis-1_4/src/org/apache/axis/Message.java 2022-03-18 13:34:41.697544322 +0100 @@ -30,6 +30,7 @@ import javax.xml.soap.AttachmentPart; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPHeader; import javax.xml.soap.SOAPMessage; @@ -759,4 +760,11 @@ mAttachments.dispose(); } } + + public AttachmentPart getAttachment(SOAPElement element) { + return null; + } + + public void removeAttachments(javax.xml.soap.MimeHeaders headers) { + } } diff -urEbwB axis-1_4.orig/src/org/apache/axis/soap/SOAPFactoryImpl.java axis-1_4/src/org/apache/axis/soap/SOAPFactoryImpl.java --- axis-1_4.orig/src/org/apache/axis/soap/SOAPFactoryImpl.java 2006-04-23 03:57:27.000000000 +0200 +++ axis-1_4/src/org/apache/axis/soap/SOAPFactoryImpl.java 2022-03-18 13:11:18.083732230 +0100 @@ -19,9 +19,11 @@ import org.apache.axis.message.MessageElement; import org.apache.axis.message.PrefixedQName; +import javax.xml.namespace.QName; import javax.xml.soap.Name; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPFault; /** * SOAP Element Factory implementation @@ -91,4 +93,13 @@ throws SOAPException { return new PrefixedQName("",localName,""); } + + public SOAPFault createFault() { + return null; + } + + public SOAPFault createFault(String reasonText, QName faultCode) { + return null; + } + } diff -urEbwB axis-1_4.orig/src/org/apache/axis/SOAPPart.java axis-1_4/src/org/apache/axis/SOAPPart.java --- axis-1_4.orig/src/org/apache/axis/SOAPPart.java 2006-04-23 03:57:27.000000000 +0200 +++ axis-1_4/src/org/apache/axis/SOAPPart.java 2022-03-18 13:29:12.735244205 +0100 @@ -49,6 +49,7 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; +import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.transform.Source; @@ -1280,5 +1281,27 @@ public boolean isBodyStream() { return (currentForm == SOAPPart.FORM_INPUTSTREAM || currentForm == SOAPPart.FORM_BODYINSTREAM); } + + // javax.xml.soap.Node + + public void detachNode() { + } + + public void recycleNode() { + } + + public SOAPElement getParentElement() { + return null; + } + + public void setParentElement(SOAPElement parent) { + } + + public void setValue(String value) { + } + + public String getValue() { + return null; + } }