Advertisement
Guest User

Untitled

a guest
Oct 27th, 2012
149
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 3.94 KB | None | 0 0
  1. diff -r 1.7/com/meterware/httpunit/BlockElement.java 1.7-patch-2/com/meterware/httpunit/BlockElement.java
  2. 3c3
  3. <  * $Id: BlockElement.java 951 2008-05-02 10:11:40Z wolfgang_fahl $
  4. ---
  5. >  * $Id: BlockElement.java 984 2008-05-20 20:26:21Z russgold $
  6. diff -r 1.7/com/meterware/httpunit/Button.java 1.7-patch-2/com/meterware/httpunit/Button.java
  7. 3c3
  8. <  * $Id: Button.java 871 2008-04-01 15:02:41Z wolfgang_fahl $
  9. ---
  10. >  * $Id: Button.java 984 2008-05-20 20:26:21Z russgold $
  11. Only in 1.7-patch-2/com/meterware/httpunit/dom: DocumentBuilderFactoryFilter.java
  12. diff -r 1.7/com/meterware/httpunit/HTMLElementBase.java 1.7-patch-2/com/meterware/httpunit/HTMLElementBase.java
  13. 3c3
  14. <  * $Id: HTMLElementBase.java 839 2008-03-29 23:30:13Z wolfgang_fahl $
  15. ---
  16. >  * $Id: HTMLElementBase.java 984 2008-05-20 20:26:21Z russgold $
  17. diff -r 1.7/com/meterware/httpunit/HTMLElementScriptable.java 1.7-patch-2/com/meterware/httpunit/HTMLElementScriptable.java
  18. 3c3
  19. <  * $Id: HTMLElementScriptable.java 951 2008-05-02 10:11:40Z wolfgang_fahl $
  20. ---
  21. >  * $Id: HTMLElementScriptable.java 984 2008-05-20 20:26:21Z russgold $
  22. diff -r 1.7/com/meterware/httpunit/scripting/ScriptableDelegate.java 1.7-patch-2/com/meterware/httpunit/scripting/ScriptableDelegate.java
  23. 3c3
  24. <  * $Id: ScriptableDelegate.java 951 2008-05-02 10:11:40Z wolfgang_fahl $
  25. ---
  26. >  * $Id: ScriptableDelegate.java 984 2008-05-20 20:26:21Z russgold $
  27. diff -r 1.7/com/meterware/httpunit/WebClient.java 1.7-patch-2/com/meterware/httpunit/WebClient.java
  28. 30a31
  29. > import com.meterware.httpunit.dom.DocumentBuilderFactoryFilter;
  30. 35a37,40
  31. > import javax.xml.parsers.DocumentBuilder;
  32. > import javax.xml.parsers.DocumentBuilderFactory;
  33. > import javax.xml.parsers.ParserConfigurationException;
  34. >
  35. 63a69
  36. >     private DocumentBuilderFactory documentBuilderFactory;
  37. 417a424,434
  38. >         documentBuilderFactory = new DocumentBuilderFactoryFilter(DocumentBuilderFactory.newInstance()) {
  39. >             public DocumentBuilder newDocumentBuilder() throws ParserConfigurationException {
  40. >                 DocumentBuilder db = super.newDocumentBuilder();
  41. >                 db.setEntityResolver( new HttpUnitUtils.ClasspathEntityResolver() );
  42. >                 return db;
  43. >             }
  44. >         };
  45. >     }
  46. >
  47. >     public DocumentBuilderFactory getDocumentBuilderFactory() {
  48. >         return documentBuilderFactory;
  49. 419a437,439
  50. >     public void setDocumentBuilderFactory(DocumentBuilderFactory documentBuilderFactory) {
  51. >         this.documentBuilderFactory = documentBuilderFactory;
  52. >     }
  53. diff -r 1.7/com/meterware/httpunit/WebForm.java 1.7-patch-2/com/meterware/httpunit/WebForm.java
  54. 107,111c107,109
  55. <       if (button==null || button.doOnClickSequence(x, y)) {
  56. <           result= doFormSubmit( button, x, y );
  57. <       } else {
  58. <           result=getCurrentFrameContents();
  59. <       }
  60. ---
  61. >         if (button == null) throw new IllegalSubmitButtonException( "?", "?" );
  62. >         button.doOnClickSequence(x, y);
  63. >         result=getCurrentFrameContents();
  64. diff -r 1.7/com/meterware/httpunit/WebRequestSource.java 1.7-patch-2/com/meterware/httpunit/WebRequestSource.java
  65. 2c2
  66. <  * $Id: WebRequestSource.java 951 2008-05-02 10:11:40Z wolfgang_fahl $
  67. ---
  68. >  * $Id: WebRequestSource.java 984 2008-05-20 20:26:21Z russgold $
  69. diff -r 1.7/com/meterware/httpunit/WebResponse.java 1.7-patch-2/com/meterware/httpunit/WebResponse.java
  70. 47a48,49
  71. > import javax.xml.parsers.ParserConfigurationException;
  72. >
  73. 574c576
  74. <                 return HttpUnitUtils.parse( new InputSource( new StringReader( getText() ) ) );
  75. ---
  76. >                 return _client.getDocumentBuilderFactory().newDocumentBuilder().parse(new InputSource( new StringReader( getText() ) ));
  77. 575a578,579
  78. >                 throw new SAXException( e );
  79. >             } catch (ParserConfigurationException e) {
  80. Only in 1.7-patch-2/: META-INF
  81. Only in 1.7-patch-2/: org
  82. Only in 1.7-patch-2/: web-app_2_2.dtd
  83. Only in 1.7-patch-2/: web-app_2_3.dtd
  84. Only in 1.7-patch-2/: web-app_2_4.xsd
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement