axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Aleksander Slominski <as...@cs.indiana.edu>
Subject Re: [Axis2] OM table model patch
Date Fri, 22 Oct 2004 17:05:09 GMT
i gave it a second try in scratch/ajith_eran_dasarath_deepal

but still no luck ...

alek

C:\Forge\AXIS2\java\dev\scratch\ajith_eran_dasarath_deepal\src>patch -p1 
-i ..\.
.\ajith_21102004-omtm.txt
patching file test/org/apache/axis/om/OMModleTest3.java
patching file test/org/apache/axis/om/stax/StaxStreamingWrapperTester.java
patching file test/org/apache/axis/om/stax/OMModelTest.java
can't find file to patch at input line 284
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: src/test/org/apache/axis/om/storage/table/ElementTableTest.java
|===================================================================
|--- src/test/org/apache/axis/om/storage/table/ElementTableTest.java    
(revisio
n 54508)
|+++ src/test/org/apache/axis/om/storage/table/ElementTableTest.java    
(working
 copy)
--------------------------
File to patch:
C:\Forge\AXIS2\java\dev\scratch\ajith_eran_dasarath_deepal\src>^C


Aleksander Slominski wrote:

> Ajith Ranabahu wrote:
>
>> oops
>> I forgot the advice of Alek to put the "[Axis2]" in subject. Really
>> sorry about that
>>  
>>
> i have problems applying the patch - what is exact location where you 
> want it applied - did you run svn update to make sure that patch is 
> against is the latest code?
>
> thanks,
>
> alek
>
> C:\Forge\AXIS2\java\dev\scratch\ajith_deepal\omTableModel\src>patch 
> -p1 -i ..\..\..\ajith_21102004-omtm.txt
> patching file test/org/apache/axis/om/OMModleTest3.java
> patching file 
> test/org/apache/axis/om/stax/StaxStreamingWrapperTester.java
> patching file test/org/apache/axis/om/stax/OMModelTest.java
> patching file test/org/apache/axis/om/storage/table/ElementTableTest.java
> Reversed (or previously applied) patch detected!  Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 1 out of 1 hunk ignored -- saving rejects to file 
> test/org/apache/axis/om/storag
> e/table/ElementTableTest.java.rej
> patching file 
> test/org/apache/axis/om/storage/table/AttributeTableTest.java
> Reversed (or previously applied) patch detected!  Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 1 out of 1 hunk ignored -- saving rejects to file 
> test/org/apache/axis/om/storag
> e/table/AttributeTableTest.java.rej
> patching file 
> test/org/apache/axis/om/serialize/SimpleOMSerializeTester.java
> patching file 
> test/org/apache/axis/om/serialize/OMPullSerializerTester.java
> patching file test/org/apache/axis/om/xpp/OMModleTest3.java
> patching file test/org/apache/axis/om/xpp/XPPStreamingWrapperTester.java
> patching file test/org/apache/axis/om/xpp/OMModelTest.java
> patching file test/org/apache/axis/om/xpp/OMModelTest2.java
> patching file test/org/apache/axis/om/OMTest.java
> patching file test/org/apache/axis/om/OMModelTest.java
> Reversed (or previously applied) patch detected!  Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 4 out of 4 hunks ignored -- saving rejects to file 
> test/org/apache/axis/om/OMMod
> elTest.java.rej
> patching file test/org/apache/axis/om/util/TimeTester.java
> patching file test/org/apache/axis/om/OMModelTest2.java
> patching file 
> java/org/apache/axis/om/stax/build/StreamingStaxOMBuilder.java
> patching file java/org/apache/axis/om/stax/pull/StAXStreamingWrapper.java
> patching file java/org/apache/axis/om/StreamingBuilder.java
> patching file java/org/apache/axis/om/serialize/SimpleOMSerializer.java
> patching file java/org/apache/axis/om/serialize/OMPullSerializer.java
> patching file 
> java/org/apache/axis/om/serialize/OMSerializerException.java
> patching file java/org/apache/axis/om/serialize/OMSerializer.java
> patching file java/org/apache/axis/om/OMModelImpl.java
> Hunk #5 FAILED at 231.
> Hunk #6 FAILED at 242.
> Hunk #7 FAILED at 253.
> Hunk #8 FAILED at 264.
> Hunk #9 FAILED at 296.
> Hunk #10 FAILED at 306.
> Hunk #11 FAILED at 332.
> Hunk #12 succeeded at 415 (offset 3 lines).
> Hunk #13 succeeded at 492 (offset 3 lines).
> 7 out of 13 hunks FAILED -- saving rejects to file 
> java/org/apache/axis/om/OMMod
> elImpl.java.rej
> patching file java/org/apache/axis/om/impl/OMAttributeImpl.java
> Reversed (or previously applied) patch detected!  Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 5 out of 5 hunks ignored -- saving rejects to file 
> java/org/apache/axis/om/impl/
> OMAttributeImpl.java.rej
> patching file java/org/apache/axis/om/impl/OMTextImpl.java
> Reversed (or previously applied) patch detected!  Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 2 out of 2 hunks ignored -- saving rejects to file 
> java/org/apache/axis/om/impl/
> OMTextImpl.java.rej
> patching file java/org/apache/axis/om/impl/OMNodeImpl.java
> Hunk #1 FAILED at 29.
> Hunk #2 FAILED at 101.
> 2 out of 2 hunks FAILED -- saving rejects to file 
> java/org/apache/axis/om/impl/O
> MNodeImpl.java.rej
> patching file 
> java/org/apache/axis/om/impl/traversal/AttributeIteratorImpl.java
> patching file 
> java/org/apache/axis/om/impl/traversal/NodeIteratorImpl.java
> Reversed (or previously applied) patch detected!  Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 3 out of 3 hunks ignored -- saving rejects to file 
> java/org/apache/axis/om/impl/
> traversal/NodeIteratorImpl.java.rej
> patching file java/org/apache/axis/om/impl/OMElementImpl.java
> Hunk #2 FAILED at 32.
> Hunk #3 FAILED at 75.
> Hunk #4 FAILED at 83.
> Hunk #5 FAILED at 102.
> Hunk #6 FAILED at 136.
> Hunk #7 FAILED at 179.
> Hunk #8 succeeded at 228 with fuzz 2 (offset 33 lines).
> 6 out of 8 hunks FAILED -- saving rejects to file 
> java/org/apache/axis/om/impl/O
> MElementImpl.java.rej
> patching file java/org/apache/axis/om/impl/OMNameSpaceImpl.java
> Hunk #1 succeeded at 1 with fuzz 1.
> Hunk #2 FAILED at 28.
> 1 out of 2 hunks FAILED -- saving rejects to file 
> java/org/apache/axis/om/impl/O
> MNameSpaceImpl.java.rej
> patching file java/org/apache/axis/om/impl/OMDocumentImpl.java
> Hunk #2 FAILED at 26.
> Hunk #4 FAILED at 51.
> 2 out of 4 hunks FAILED -- saving rejects to file 
> java/org/apache/axis/om/impl/O
> MDocumentImpl.java.rej
> patching file java/org/apache/axis/om/storage/table/ElementTable.java
> Reversed (or previously applied) patch detected!  Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 2 out of 2 hunks ignored -- saving rejects to file 
> java/org/apache/axis/om/stora
> ge/table/ElementTable.java.rej
> patching file java/org/apache/axis/om/storage/table/NameSpaceTable.java
> Reversed (or previously applied) patch detected!  Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 1 out of 1 hunk ignored -- saving rejects to file 
> java/org/apache/axis/om/storag
> e/table/NameSpaceTable.java.rej
> patching file java/org/apache/axis/om/storage/table/Table.java
> Reversed (or previously applied) patch detected!  Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 1 out of 1 hunk ignored -- saving rejects to file 
> java/org/apache/axis/om/storag
> e/table/Table.java.rej
> patching file java/org/apache/axis/om/storage/table/EventTable.java
> Reversed (or previously applied) patch detected!  Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 1 out of 1 hunk ignored -- saving rejects to file 
> java/org/apache/axis/om/storag
> e/table/EventTable.java.rej
> patching file java/org/apache/axis/om/storage/table/AbstractTable.java
> patching file java/org/apache/axis/om/storage/table/AttributeTable.java
> Reversed (or previously applied) patch detected!  Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 1 out of 1 hunk ignored -- saving rejects to file 
> java/org/apache/axis/om/storag
> e/table/AttributeTable.java.rej
> patching file java/org/apache/axis/om/storage/table/TextTable.java
> Reversed (or previously applied) patch detected!  Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 1 out of 1 hunk ignored -- saving rejects to file 
> java/org/apache/axis/om/storag
> e/table/TextTable.java.rej
> patching file java/org/apache/axis/om/storage/column/AbstractColumn.java
> Reversed (or previously applied) patch detected!  Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 1 out of 1 hunk ignored -- saving rejects to file 
> java/org/apache/axis/om/storag
> e/column/AbstractColumn.java.rej
> patching file 
> java/org/apache/axis/om/xpp/build/StreamingXPPOMBuilder.java
> patching file java/org/apache/axis/om/xpp/pull/XPPStreamingWrapper.java
> patching file java/org/apache/axis/om/factory/FactoryConfiguration.java
> patching file 
> java/org/apache/axis/om/factory/StaxFactoryConfiguration.java
> patching file java/org/apache/axis/om/factory/OMDocumentFactory.java
> patching file java/org/apache/axis/om/factory/OMFactoryException.java
> patching file 
> java/org/apache/axis/om/factory/XPPFactoryConfiguration.java
> patching file java/org/apache/axis/om/StreamingWrapper.java
> patching file java/org/apache/axis/om/OMModel.java
> patching file java/org/apache/axis/om/util/OMConstants.java
> Reversed (or previously applied) patch detected!  Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 2 out of 2 hunks ignored -- saving rejects to file 
> java/org/apache/axis/om/util/
> OMConstants.java.rej
> patching file java/TBD.txt
> patching file test-resources/sample1.xml
> patching file test-resources/soap2.xml
>
> C:\Forge\AXIS2\java\dev\scratch\ajith_deepal\omTableModel\src>
>


-- 
The best way to predict the future is to invent it - Alan Kay


Mime
View raw message