diff --git a/.cvsignore b/.cvsignore index 47ff6eb..a8df665 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,4 @@ -axis-1_2RC2-src.tar.gz +axis-src-1_2.tar.gz +axis-1_2 +noarch +*.src.rpm diff --git a/axis-bz152255.patch b/axis-bz152255.patch new file mode 100644 index 0000000..472d958 --- /dev/null +++ b/axis-bz152255.patch @@ -0,0 +1,361 @@ +--- axis-1_2/src/org/apache/axis/SOAPPart.java~ 2005-05-03 20:29:14.000000000 +0100 ++++ axis-1_2/src/org/apache/axis/SOAPPart.java 2005-06-07 11:28:33.000000000 +0100 +@@ -33,6 +33,7 @@ + import org.w3c.dom.Attr; + import org.w3c.dom.CDATASection; + import org.w3c.dom.Comment; ++import org.w3c.dom.DOMConfiguration; + import org.w3c.dom.DOMException; + import org.w3c.dom.DOMImplementation; + import org.w3c.dom.Document; +@@ -45,6 +46,7 @@ + import org.w3c.dom.NodeList; + import org.w3c.dom.ProcessingInstruction; + import org.w3c.dom.Text; ++import org.w3c.dom.UserDataHandler; + import org.xml.sax.InputSource; + import org.xml.sax.SAXException; + +@@ -1273,5 +1275,102 @@ + public boolean isBodyStream() { + return (currentForm == SOAPPart.FORM_INPUTSTREAM || currentForm == SOAPPart.FORM_BODYINSTREAM); + } ++ ++ /** ++ * DOM Level 3 stubs ++ */ ++ ++ public String getBaseURI() { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public boolean getXmlStandalone() { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public Object setUserData( ++ String key, Object data, UserDataHandler handler) { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public void setDocumentURI(String documentURI) { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public void setXmlStandalone(boolean xmlStandalone) { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public Node renameNode(Node n, String namespaceURI, String qualifiedName) { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public String getInputEncoding() { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public String getXmlEncoding() { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public void setTextContent(String textContent) { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public boolean isSameNode(Node other) { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public String getDocumentURI() { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public Object getFeature(String feature, String version) { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public boolean isDefaultNamespace(String namespaceURI) { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public String lookupPrefix(String namespaceURI) { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public boolean isEqualNode(Node arg) { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public void setXmlVersion(String xmlVersion) { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public String getXmlVersion() { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public Object getUserData(String key) { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public String getTextContent() { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public void normalizeDocument() { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public String lookupNamespaceURI(String prefix) { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public DOMConfiguration getDomConfig() { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public short compareDocumentPosition(Node other) { ++ throw new RuntimeException("not implemented"); ++ } + } + +--- axis-1_2/src/org/apache/axis/message/NodeImpl.java~ 2005-05-03 20:28:58.000000000 +0100 ++++ axis-1_2/src/org/apache/axis/message/NodeImpl.java 2005-06-07 12:22:15.000000000 +0100 +@@ -30,6 +30,8 @@ + import org.w3c.dom.Node; + import org.w3c.dom.NodeList; + import org.w3c.dom.Text; ++import org.w3c.dom.TypeInfo; ++import org.w3c.dom.UserDataHandler; + import org.xml.sax.Attributes; + import org.xml.sax.helpers.AttributesImpl; + +@@ -834,4 +836,74 @@ + ((NodeImpl) parent).setDirty(true); + } + } ++ ++ /** ++ * DOM Level 3 stubs ++ */ ++ ++ public void setIdAttributeNS( ++ String namespaceURI, String localName, boolean isId) { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public void setIdAttribute(String name, boolean isId) { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public void setIdAttributeNode(Attr idAttr, boolean isId) { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public TypeInfo getSchemaTypeInfo() { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public Object setUserData( ++ String key, Object data, UserDataHandler handler) { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public String getBaseURI() { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public String getTextContent() { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public boolean isSameNode(Node other) { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public void setTextContent(String textContent) { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public Object getUserData(String key) { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public boolean isDefaultNamespace(String namespaceURI) { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public Object getFeature(String feature, String version) { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public boolean isEqualNode(Node arg) { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public short compareDocumentPosition(Node other) { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public String lookupNamespaceURI(String prefix) { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public String lookupPrefix(String namespaceURI) { ++ throw new RuntimeException("not implemented"); ++ } + } +--- axis-1_2/src/org/apache/axis/message/SOAPDocumentImpl.java~ 2005-05-03 20:29:08.000000000 +0100 ++++ axis-1_2/src/org/apache/axis/message/SOAPDocumentImpl.java 2005-06-07 12:31:30.000000000 +0100 +@@ -25,6 +25,7 @@ + import org.w3c.dom.Attr; + import org.w3c.dom.CDATASection; + import org.w3c.dom.Comment; ++import org.w3c.dom.DOMConfiguration; + import org.w3c.dom.DOMException; + import org.w3c.dom.DOMImplementation; + import org.w3c.dom.Document; +@@ -36,6 +37,7 @@ + import org.w3c.dom.Node; + import org.w3c.dom.NodeList; + import org.w3c.dom.ProcessingInstruction; ++import org.w3c.dom.UserDataHandler; + + import javax.xml.parsers.ParserConfigurationException; + import javax.xml.soap.SOAPException; +@@ -680,4 +682,113 @@ + public boolean hasAttributes() { + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); + } ++ ++ /** ++ * DOM Level 3 stubs ++ */ ++ ++ public String getBaseURI() { ++ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); ++ } ++ ++ public boolean getXmlStandalone() { ++ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); ++ } ++ ++ public boolean getStrictErrorChecking() { ++ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); ++ } ++ ++ public void setXmlStandalone(boolean xmlStandalone) { ++ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); ++ } ++ ++ public Node renameNode(Node n, String namespaceURI, String qualifiedName) { ++ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); ++ } ++ ++ public void setStrictErrorChecking(boolean strictErrorChecking) { ++ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); ++ } ++ ++ public Object setUserData( ++ String key, Object data, UserDataHandler handler) { ++ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); ++ } ++ ++ public String getInputEncoding() { ++ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); ++ } ++ ++ public String getXmlEncoding() { ++ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); ++ } ++ ++ public void setTextContent(String textContent) { ++ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); ++ } ++ ++ public boolean isSameNode(Node other) { ++ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); ++ } ++ ++ public String getDocumentURI() { ++ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); ++ } ++ ++ public void setDocumentURI(String documentURI) { ++ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); ++ } ++ ++ public Object getFeature(String feature, String version) { ++ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); ++ } ++ ++ public Node adoptNode(Node source) { ++ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); ++ } ++ ++ public boolean isDefaultNamespace(String namespaceURI) { ++ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); ++ } ++ ++ public boolean isEqualNode(Node arg) { ++ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); ++ } ++ ++ public void setXmlVersion(String xmlVersion) { ++ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); ++ } ++ ++ public String getXmlVersion() { ++ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); ++ } ++ ++ public String lookupPrefix(String namespaceURI) { ++ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); ++ } ++ ++ public Object getUserData(String key) { ++ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); ++ } ++ ++ public String getTextContent() { ++ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); ++ } ++ ++ public void normalizeDocument() { ++ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); ++ } ++ ++ public String lookupNamespaceURI(String prefix) { ++ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); ++ } ++ ++ public DOMConfiguration getDomConfig() { ++ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); ++ } ++ ++ public short compareDocumentPosition(Node other) { ++ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); ++ } + } +--- axis-1_2/src/org/apache/axis/message/Text.java~ 2005-05-03 20:29:21.000000000 +0100 ++++ axis-1_2/src/org/apache/axis/message/Text.java 2005-06-07 12:34:19.000000000 +0100 +@@ -213,4 +213,19 @@ + return ( textRep.getData() != null ? textRep.getData().hashCode() : 0 ); + } + ++ /** ++ * DOM Level 3 stubs ++ */ ++ ++ public String getWholeText() { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public boolean isElementContentWhitespace() { ++ throw new RuntimeException("not implemented"); ++ } ++ ++ public org.w3c.dom.Text replaceWholeText(String content) { ++ throw new RuntimeException("not implemented"); ++ } + } diff --git a/axis-imageio.patch b/axis-imageio.patch new file mode 100644 index 0000000..286a861 --- /dev/null +++ b/axis-imageio.patch @@ -0,0 +1,25 @@ +--- axis-1_2/src/org/apache/axis/components/image/MerlinIO.java.orig 2005-05-03 20:28:43.000000000 +0100 ++++ axis-1_2/src/org/apache/axis/components/image/MerlinIO.java 2005-06-07 12:00:01.000000000 +0100 +@@ -42,12 +42,6 @@ + */ + public void saveImage(String mimeType, Image image, OutputStream os) + throws Exception { +- ImageWriter writer = null; +- Iterator iter = javax.imageio.ImageIO.getImageWritersByMIMEType(mimeType); +- if (iter.hasNext()) { +- writer = (ImageWriter) iter.next(); +- } +- writer.setOutput(javax.imageio.ImageIO.createImageOutputStream(os)); + BufferedImage rendImage = null; + if (image instanceof BufferedImage) { + rendImage = (BufferedImage) image; +@@ -59,8 +53,7 @@ + Graphics g = rendImage.createGraphics(); + g.drawImage(image, 0, 0, null); + } +- writer.write(new IIOImage(rendImage, null, null)); +- writer.dispose(); ++ javax.imageio.ImageIO.write(rendImage, mimeType, os); + } + + /** diff --git a/axis.spec b/axis.spec index 1a0f1e1..52b9561 100644 --- a/axis.spec +++ b/axis.spec @@ -1,7 +1,7 @@ %define name axis %define version 1.2 -%define archivever 1_2RC2 -%define release 0.rc2.1jpp_1rh +%define archivever 1_2 +%define release 1jpp_0fc %define section free Name: %{name} @@ -12,34 +12,42 @@ Summary: A SOAP implementation in Java License: Apache Software License Group: Development/Libraries/Java Url: http://ws.apache.org/%{name}/ -Source0: %{url}/dist/%{archivever}/%{name}-%{archivever}-src.tar.gz -#Vendor: JPackage Project -#Distribution: JPackage +Source0: %{url}/dist/%{archivever}/%{name}-src-%{archivever}.tar.gz +Patch1: %{name}-bz152255.patch +Patch2: %{name}-imageio.patch BuildRequires: jpackage-utils >= 0:1.5 BuildRequires: java-devel -BuildRequires: ant +BuildRequires: ant >= 0:1.6 +BuildRequires: ant-nodeps # Mandatory requires -BuildRequires: wsdl4j -BuildRequires: jakarta-commons-logging +BuildRequires: jaf BuildRequires: jakarta-commons-discovery -BuildRequires: log4j +BuildRequires: jakarta-commons-httpclient +BuildRequires: jakarta-commons-logging BuildRequires: javamail -BuildRequires: jaf +BuildRequires: log4j +BuildRequires: servletapi5 +BuildRequires: wsdl4j +BuildRequires: jacorb +BuildRequires: javax-rmi # optional requires -BuildRequires: servlet oro junit jimi jsse -BuildRequires: jakarta-commons-httpclient -BuildRequires: httpunit +BuildRequires: jsse +BuildRequires: junit +BuildRequires: oro BuildRequires: jms BuildRequires: castor #BuildRequires: xml-security -Requires: jpackage-utils >= 0:1.5 + Requires: java -Requires: wsdl4j -Requires: jakarta-commons-logging -Requires: jakarta-commons-discovery -Requires: log4j +Requires: jpackage-utils >= 0:1.5 Requires: jaf +Requires: jakarta-commons-discovery +Requires: jakarta-commons-logging +Requires: jakarta-commons-httpclient Requires: javamail +Requires: log4j +Requires: wsdl4j + BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot @@ -75,6 +83,8 @@ Documentation for %{name}. %prep rm -rf $RPM_BUILD_ROOT %setup -q -n %{name}-%{archivever} +%patch1 -p1 -b .orig +%patch2 -p1 -b .orig # Remove provided binaries find . -name "*.jar" -exec rm -f {} \; @@ -85,23 +95,24 @@ find . -name "*.class" -exec rm -f {} \; [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java -CLASSPATH=$(build-classpath wsdl4j jakarta-commons-logging jakarta-commons-discovery log4j jaf javamail/mailapi) -export CLASSPATH=$CLASSPATH:$(build-classpath servlet oro junit jimi xml-security jsse jakarta-commons-httpclient httpunit jms castor 2>/dev/null) +CLASSPATH=$(build-classpath wsdl4j jakarta-commons-discovery jakarta-commons-httpclient jakarta-commons-logging log4j jaf javamail/mailapi servletapi5) +CLASSPATH=$CLASSPATH:$(build-classpath jacorb javax-rmi) +export CLASSPATH=$CLASSPATH:$(build-classpath oro junit jimi xml-security jsse httpunit jms castor 2>/dev/null) ant -Dcompile.ime=true \ -Dwsdl4j.jar=$(build-classpath wsdl4j) \ - -Dcommons-logging.jar=$(build-classpath jakarta-commons-logging) \ -Dcommons-discovery.jar=$(build-classpath jakarta-commons-discovery) \ + -Dcommons-logging.jar=$(build-classpath jakarta-commons-logging) \ + -Dcommons-httpclient.jar=$(build-classpath jakarta-commons-httpclient) \ -Dlog4j-core.jar=$(build-classpath log4j) \ -Dactivation.jar=$(build-classpath jaf) \ -Dmailapi.jar=$(build-classpath javamail/mailapi) \ -Dxerces.jar=$(build-classpath jaxp_parser_impl) \ - -Dservlet.jar=$(build-classpath servlet 2>/dev/null) \ + -Dservlet.jar=$(build-classpath servletapi5) \ -Dregexp.jar=$(build-classpath oro 2>/dev/null) \ -Djunit.jar=$(build-classpath junit 2>/dev/null) \ -Djimi.jar=$(build-classpath jimi 2>/dev/null) \ -Djsse.jar=$(build-classpath jsse/jsse 2>/dev/null) \ - -Dcommons-httpclient.jar=$(build-classpath jakarta-commons-httpclient 2>/dev/null) \ clean compile javadocs %install @@ -161,12 +172,34 @@ fi %doc docs/* %changelog +* Tue Jun 7 2005 Gary Benson +- Add DOM3 stubs to classes that need them (#152255). +- Avoid some API holes in libgcj's ImageIO implementation. +- Pick up CORBA classes from jacorb. +- Pick up javax.rmi classes from javax-rmi. + +* Wed May 04 2005 Fernando Nasser 0:1.2-1jpp_1rh +- Merge with upstream for upgrade + +* Wed May 04 2005 Fernando Nasser 0:1.2-1jpp +- Finaly 1.2 final release + +* Sat Mar 12 2005 Ralph Apel 0:1.2-0.rc2.3jpp +- Also Buildrequire ant-nodeps + +* Fri Mar 11 2005 Ralph Apel 0:1.2-0.rc2.2jpp +- Set OPT_JAR_LIST to "ant/ant-nodeps" +- Buildrequire ant >= 1.6 + * Wed Dec 22 2004 Fernando Nasser 0:1.2-0.rc2.1jpp_1rh - Merge with upstream for upgrade * Wed Dec 22 2004 Fernando Nasser 0:1.2-0.rc2.1jpp - Upgrade to 1.2.rc2 +* Fri Aug 20 2004 Ralph Apel 0:1.1-3jpp +- Build with ant-1.6.2 + * Thu Mar 4 2004 Frank Ch. Eigler 0:1.1-2jpp_1rh - RH vacuuming diff --git a/sources b/sources index 7cb32ac..71f8dae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a5424fcb51e2f3e9ad53db2186185ad6 axis-1_2RC2-src.tar.gz +a4779bdf301a7135e8f3c41847baf48d axis-src-1_2.tar.gz