Re: interceptors patch - solved

[ma...@zrs-tk.si]

You are right it worked.
Who would think that some cr/lf can mess the whole thing so much. :-(
Thanks for your help.

Regards

Matjaz
----- Original Message -----
From: <al...@dsl.ab.ca>
To: <rp...@xml.apache.org>
Sent: Thursday, April 11, 2002 5:11 PM
Subject: Re: interceptors patch


>   I downloaded the source and patch in your email.
>
>
>   I am using unix.  Applying the patch directly results in the same
> 'Hunk ... FAILED...' messages.
>
>
>   Running dos2unix on the patch file, then applying the patch works
> for me.
>
>
>   I am using the patch (v2.5) program from Debian (potato)
> distribution.
>
>
> dslsun99:/test/alvin/test3/xmlrpc-1.1/src/java/org/apache/xmlrpc> patch -i
../../../../../../interceptors-introspection.patch2
> patching file `InterceptorsSample.java'
> patching file `ClientInterceptorManager.java'
> patching file `Headers.java'
> patching file `IntrospectiveXmlRpcHandler.java'
> patching file `ObjectHolder.java'
> patching file `ServerInterceptorManager.java'
> patching file `WebServer.java'
> patching file `XmlRpcClient.java'
> patching file `XmlRpcClientInterceptor.java'
> patching file `XmlRpcClientLite.java'
> patching file `XmlRpcProxyServlet.java'
> patching file `XmlRpcServer.java'
> patching file `XmlRpcServerInterceptor.java'
> dslsun99:/test/alvin/test3/xmlrpc-1.1/src/java/org/apache/xmlrpc>
>
>
>   Hope this helps.
>
> Alvin.
>
>
> matjaz.ostroversnik@zrs-tk.si writes:
>  > It seems that I am working with some strange source. I've downloaded
>  > http://xml.apache.org/dist/xmlrpc/release/v1.1/xmlrpc-1.1-src.tar.gz
>  > and
>  > interceptors - introspection patch from
>  > http://aeolus.cit.cornell.edu/xmlrpc/xmlrpc.html
>  >
>  > Which source do you use?
>  >
>  > I get the following output:
>  >
>  > [root@giant /usr/local/src/xmlrpc-1.1/src]# patch -u -p 1 -i
>  > interceptors-introspection.patch.txt
>  > patching file `InterceptorsSample.java'
>  > patching file `java/org/apache/xmlrpc/ClientInterceptorManager.java'
>  > patching file `java/org/apache/xmlrpc/Headers.java'
>  > patching file `java/org/apache/xmlrpc/IntrospectiveXmlRpcHandler.java'
>  > patching file `java/org/apache/xmlrpc/ObjectHolder.java'
>  > patching file `java/org/apache/xmlrpc/ServerInterceptorManager.java'
>  > patching file `java/org/apache/xmlrpc/WebServer.java'
>  > Hunk #1 FAILED at 66.
>  > Hunk #2 FAILED at 136.
>  > Hunk #3 FAILED at 264.
>  > Hunk #4 FAILED at 287.
>  > Hunk #5 FAILED at 535.
>  > Hunk #6 FAILED at 565.
>  > Hunk #7 FAILED at 577.
>  > Hunk #8 FAILED at 593.
>  > Hunk #9 FAILED at 689.
>  > 9 out of 9 hunks FAILED -- saving rejects to
>  > java/org/apache/xmlrpc/WebServer.java.rej
>  > patching file `java/org/apache/xmlrpc/XmlRpcClient.java'
>  > Hunk #1 FAILED at 64.
>  > Hunk #2 FAILED at 112.
>  > Hunk #3 FAILED at 139.
>  > Hunk #4 FAILED at 366.
>  > Hunk #5 FAILED at 410.
>  > Hunk #6 FAILED at 446.
>  > Hunk #7 FAILED at 489.
>  > 7 out of 7 hunks FAILED -- saving rejects to
>  > java/org/apache/xmlrpc/XmlRpcClient.java.rej
>  > patching file `java/org/apache/xmlrpc/XmlRpcClientInterceptor.java'
>  > patching file `java/org/apache/xmlrpc/XmlRpcClientLite.java'
>  > Hunk #1 FAILED at 67.
>  > Hunk #2 FAILED at 136.
>  > Hunk #3 FAILED at 168.
>  > Hunk #4 FAILED at 212.
>  > Hunk #5 FAILED at 244.
>  > Hunk #6 FAILED at 260.
>  > --- skiping the rest ---
>  >
>  > ----- Original Message -----
>  > From: <al...@dsl.ab.ca>
>  > To: <rp...@xml.apache.org>
>  > Sent: Wednesday, April 10, 2002 1:32 AM
>  > Subject: Re: interceptors patch
>  >
>  >
>  > > Hi,
>  > >
>  > >   I checked out the XMLRPC_1_1 revision.  The patches were easily
>  > > applied.
>  > >
>  > >   Merging the HEAD revision took some effort.
>  > >
>  > >   The XmlRpcServer.execute(InputStream) method seems to be replaced
>  > > with execute(String, InputStream, Properties).
>  > >
>  > >
>  > >   I ran the tests and testServer started to fail.
>  > >
>  > >   testRpc also fails in the unmodified HEAD revision on my setup.
>  > >
>  > >
>  > >   The merged xmlrpc.jar file does work with the simple calls I make
so
>  > > far.
>  > >
>  > >
>  > >   Tomorrow I will try the new Interceptors.
>  > >
>  > >
>  > > Alvin.
>  > >
>  > >
>  >
>  >
>
> --
>
>   If you have any questions, please call Alvin at 266-4413.
>
> --
> Alvin Schur.
>
> Dynamic Solutions Ltd.
> suite 700, 633-6 ave SW
> Calgary, Alberta
> Canada
> T2P 2Y5
>
> phone: 403-266-4413
>   fax: 403-233-8490
>
>
> alvins@dsl.ab.ca
> info@dsl.ab.ca
>
>