rpms/axis/devel axis-1.2.1-DH.patch,NONE,1.1 axis.spec,1.15,1.16

[fedora-cvs-commits at redhat.com]

Author: ashah

Update of /cvs/dist/rpms/axis/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9589

Modified Files:
	axis.spec 
Added Files:
	axis-1.2.1-DH.patch 
Log Message:
- remove unnecessary build dependencies on jacorb and jonathan-rmi
- include fix to Axis bug 2142
- merge from upstream 2jpp


axis-1.2.1-DH.patch:
 encoding/ser/SourceDataHandlerDeserializer.java |    3 +--
 utils/JavaUtils.java                            |    7 +++----
 2 files changed, 4 insertions(+), 6 deletions(-)

--- NEW FILE axis-1.2.1-DH.patch ---
Index: src/org/apache/axis/utils/JavaUtils.java
===================================================================
RCS file: /home/cvspublic/ws-axis/java/src/org/apache/axis/utils/JavaUtils.java,v
retrieving revision 1.118
diff -u -r1.118 JavaUtils.java
--- src/org/apache/axis/utils/JavaUtils.java	26 Apr 2005 21:06:36 -0000	1.118
+++ src/org/apache/axis/utils/JavaUtils.java	15 Jul 2005 15:20:21 -0000
@@ -295,7 +295,7 @@
                         // attachment, but if the image would be null
                         // (is.available == 0) then ImageIO component isn't needed
                         // and we can return null.
-                        InputStream is = (InputStream) handler.getContent();
+                        InputStream is = handler.getInputStream();
                         if (is.available() == 0) {
                             return null;
                         }
@@ -314,15 +314,14 @@
                         // For a reason unknown to me, the handler's
                         // content is a String.  Convert it to a
                         // StreamSource.
-                        return new StreamSource(new StringReader(
-                                (String) handler.getContent()));
+                        return new StreamSource(handler.getInputStream());
                     }
                     else if (destClass == OctetStream.class || destClass == byte[].class) {
                         InputStream in = null;
                         if (arg instanceof InputStream) {
                             in = (InputStream) arg;
                         } else {
-                            in = (InputStream)handler.getContent();
+                            in = handler.getInputStream();
                         }
                         ByteArrayOutputStream baos = new ByteArrayOutputStream();
                         int byte1 = -1;
Index: src/org/apache/axis/encoding/ser/SourceDataHandlerDeserializer.java
===================================================================
RCS file: /home/cvspublic/ws-axis/java/src/org/apache/axis/encoding/ser/SourceDataHandlerDeserializer.java,v
retrieving revision 1.4
diff -u -r1.4 SourceDataHandlerDeserializer.java
--- src/org/apache/axis/encoding/ser/SourceDataHandlerDeserializer.java	25 Feb 2004 14:02:37 -0000	1.4
+++ src/org/apache/axis/encoding/ser/SourceDataHandlerDeserializer.java	15 Jul 2005 15:20:21 -0000
@@ -45,8 +45,7 @@
         if (getValue() instanceof DataHandler) {
             try {
                 DataHandler dh = (DataHandler) getValue();
-                StreamSource ss = new StreamSource(new StringReader(
-                        (String) dh.getContent()));
+                StreamSource ss = new StreamSource(dh.getInputStream());
                 setValue(ss);
             }
             catch (IOException ioe) {


Index: axis.spec
===================================================================
RCS file: /cvs/dist/rpms/axis/devel/axis.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- axis.spec	9 Dec 2005 22:39:44 -0000	1.15
+++ axis.spec	1 Mar 2006 20:12:35 -0000	1.16
@@ -1,12 +1,12 @@
 %define name       axis
 %define version    1.2.1
 %define archivever 1_2_1
-%define release 1jpp_1fc.1
+%define release    2jpp_1fc
 %define section    free
 
 Name:          %{name}
 Version:       %{version}
-Release: %{release}.1
+Release:       %{release}
 Epoch:         0
 Summary:       A SOAP implementation in Java
 License:       Apache Software License
@@ -16,21 +16,20 @@
 Patch1:        %{name}-bz152255.patch
 Patch2:        %{name}-imageio.patch
 Patch3:        %{name}-objectweb.patch
+Patch4:        %{name}-%{version}-DH.patch
 BuildRequires: jpackage-utils >= 0:1.5
 BuildRequires: java-devel
-BuildRequires: ant >= 0:1.6
-BuildRequires: ant-nodeps
+BuildRequires: ant >= 0:1.6, ant-nodeps
 # Mandatory requires
 BuildRequires: jaf
 BuildRequires: jakarta-commons-discovery
 BuildRequires: jakarta-commons-httpclient
 BuildRequires: jakarta-commons-logging
 BuildRequires: javamail
+BuildRequires: jaxp_parser_impl
 BuildRequires: log4j
 BuildRequires: servletapi5
 BuildRequires: wsdl4j
-BuildRequires: jacorb
-BuildRequires: jonathan-rmi
 # optional requires
 BuildRequires: jsse
 BuildRequires: junit
@@ -46,6 +45,7 @@
 Requires:      jakarta-commons-logging
 Requires:      jakarta-commons-httpclient
 Requires:      javamail
+Requires: jaxp_parser_impl
 Requires:      log4j
 Requires:      wsdl4j
 
@@ -87,6 +87,7 @@
 %patch1 -p1 -b .orig
 %patch2 -p1 -b .orig
 %patch3 -p1 -b .orig
+%patch4
 
 # Remove provided binaries
 find . -name "*.jar" -exec rm -f {} \;
@@ -98,7 +99,6 @@
 [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
 
 CLASSPATH=$(build-classpath wsdl4j jakarta-commons-discovery jakarta-commons-httpclient jakarta-commons-logging log4j jaf javamail/mailapi servletapi5)
-CLASSPATH=$CLASSPATH:$(build-classpath jacorb/jacorb jonathan-rmi)
 export CLASSPATH=$CLASSPATH:$(build-classpath oro junit jimi xml-security jsse httpunit jms castor 2>/dev/null)
 
 export OPT_JAR_LIST="ant/ant-nodeps"
@@ -175,6 +175,11 @@
 %doc docs/*
 
 %changelog
+* Wed Mar  1 2006 Archit Shah <ashah at redhat.com> 0:1.2.1-2jpp_1fc
+- remove unnecessary build dependencies on jacorb and jonathan-rmi
+- include fix to Axis bug 2142
+- merge from upstream 2jpp
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt