From: <asa...@us...> - 2014-01-20 19:02:39
|
Revision: 9009 http://sourceforge.net/p/htmlunit/code/9009 Author: asashour Date: 2014-01-20 19:02:33 +0000 (Mon, 20 Jan 2014) Log Message: ----------- move JavaScript ActiveX package to *.javascript.host.activex Modified Paths: -------------- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ActiveXObject.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/MSXMLActiveXObjectFactory.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/MSXMLConfiguration.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/MSXMLJavaScriptEnvironment.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/MSXMLScriptable.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMAttribute.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMCDATASection.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMCharacterData.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMComment.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMDocument.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMDocumentFragment.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMDocumentType.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMElement.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMImplementation.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMNamedNodeMap.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMNode.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMNodeList.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMParseError.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMProcessingInstruction.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMSelection.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMText.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLHTTPRequest.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLSerializer.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XSLProcessor.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XSLTemplate.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/MSXMLActiveXObjectFactoryTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/MSXMLTestUtil.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMAttributeTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMCDATASectionTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMCommentTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMDocument2Test.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMDocument3Test.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMDocumentFragmentTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMDocumentTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMDocumentTypeTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMElementTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMImplementationTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMNamedNodeMapTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMNodeListTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMParseErrorTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMProcessingInstructionTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMTextTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLHTTPRequestTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLSerializerTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XSLProcessorTest.java Added Paths: ----------- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/ Removed Paths: ------------- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/ Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -52,7 +52,6 @@ import org.apache.http.client.CredentialsProvider; import org.w3c.css.sac.ErrorHandler; -import com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLActiveXObjectFactory; import com.gargoylesoftware.htmlunit.attachment.Attachment; import com.gargoylesoftware.htmlunit.attachment.AttachmentHandler; import com.gargoylesoftware.htmlunit.gae.GAEUtils; @@ -71,6 +70,7 @@ import com.gargoylesoftware.htmlunit.javascript.host.Location; import com.gargoylesoftware.htmlunit.javascript.host.Node; import com.gargoylesoftware.htmlunit.javascript.host.Window; +import com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLActiveXObjectFactory; import com.gargoylesoftware.htmlunit.javascript.host.css.ComputedCSSStyleDeclaration; import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLDocument; import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLElement; Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ActiveXObject.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ActiveXObject.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ActiveXObject.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -29,13 +29,13 @@ import com.gargoylesoftware.htmlunit.WebClient; import com.gargoylesoftware.htmlunit.WebWindow; -import com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLActiveXObjectFactory; import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable; import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass; import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor; import com.gargoylesoftware.htmlunit.javascript.configuration.JsxGetter; import com.gargoylesoftware.htmlunit.javascript.configuration.JsxSetter; import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser; +import com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLActiveXObjectFactory; /** * This is the host object that allows JavaScript to instantiate Java objects via the ActiveXObject Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -73,8 +73,6 @@ import com.gargoylesoftware.htmlunit.WebClient; import com.gargoylesoftware.htmlunit.WebWindow; import com.gargoylesoftware.htmlunit.WebWindowNotFoundException; -import com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLActiveXObjectFactory; -import com.gargoylesoftware.htmlunit.activex.javascript.msxml.XMLDOMDocument; import com.gargoylesoftware.htmlunit.html.BaseFrameElement; import com.gargoylesoftware.htmlunit.html.DomChangeEvent; import com.gargoylesoftware.htmlunit.html.DomChangeListener; @@ -99,6 +97,8 @@ import com.gargoylesoftware.htmlunit.javascript.configuration.JsxGetter; import com.gargoylesoftware.htmlunit.javascript.configuration.JsxSetter; import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser; +import com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLActiveXObjectFactory; +import com.gargoylesoftware.htmlunit.javascript.host.activex.XMLDOMDocument; import com.gargoylesoftware.htmlunit.javascript.host.css.CSSStyleDeclaration; import com.gargoylesoftware.htmlunit.javascript.host.css.CSSStyleSheet; import com.gargoylesoftware.htmlunit.javascript.host.css.ComputedCSSStyleDeclaration; Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/MSXMLActiveXObjectFactory.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/MSXMLActiveXObjectFactory.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/MSXMLActiveXObjectFactory.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import java.util.Locale; Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/MSXMLConfiguration.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/MSXMLConfiguration.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/MSXMLConfiguration.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import java.util.Map; import java.util.WeakHashMap; Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/MSXMLJavaScriptEnvironment.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/MSXMLJavaScriptEnvironment.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/MSXMLJavaScriptEnvironment.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import java.lang.reflect.Method; import java.util.HashMap; Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/MSXMLScriptable.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/MSXMLScriptable.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/MSXMLScriptable.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMAttribute.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMAttribute.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMAttribute.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE; import net.sourceforge.htmlunit.corejs.javascript.Context; Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMCDATASection.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMCDATASection.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMCDATASection.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE; Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMCharacterData.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMCharacterData.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMCharacterData.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE; import net.sourceforge.htmlunit.corejs.javascript.Context; Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMComment.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMComment.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMComment.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE; Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMDocument.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMDocument.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMDocument.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE; Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMDocumentFragment.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMDocumentFragment.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMDocumentFragment.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE; import net.sourceforge.htmlunit.corejs.javascript.Context; Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMDocumentType.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMDocumentType.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMDocumentType.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE; Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMElement.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMElement.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMElement.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE; Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMImplementation.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMImplementation.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMImplementation.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE; import net.sourceforge.htmlunit.corejs.javascript.Context; Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMNamedNodeMap.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMNamedNodeMap.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMNamedNodeMap.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE; Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMNode.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMNode.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMNode.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE; Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMNodeList.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMNodeList.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMNodeList.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE; Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMParseError.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMParseError.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMParseError.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE; Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMProcessingInstruction.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMProcessingInstruction.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMProcessingInstruction.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE; import net.sourceforge.htmlunit.corejs.javascript.Context; Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMSelection.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMSelection.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMSelection.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE; Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMText.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMText.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMText.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE; import net.sourceforge.htmlunit.corejs.javascript.Context; Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLHTTPRequest.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequest.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLHTTPRequest.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE; Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLSerializer.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLSerializer.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLSerializer.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import org.w3c.dom.NamedNodeMap; Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XSLProcessor.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XSLProcessor.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XSLProcessor.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE; Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XSLTemplate.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XSLTemplate.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XSLTemplate.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE; Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -64,8 +64,6 @@ import com.gargoylesoftware.htmlunit.WebRequest; import com.gargoylesoftware.htmlunit.WebResponse; import com.gargoylesoftware.htmlunit.WebWindow; -import com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLActiveXObjectFactory; -import com.gargoylesoftware.htmlunit.activex.javascript.msxml.XMLDOMDocument; import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.javascript.JavaScriptEngine; import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable; @@ -78,6 +76,8 @@ import com.gargoylesoftware.htmlunit.javascript.configuration.JsxSetter; import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser; import com.gargoylesoftware.htmlunit.javascript.host.Event; +import com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLActiveXObjectFactory; +import com.gargoylesoftware.htmlunit.javascript.host.activex.XMLDOMDocument; import com.gargoylesoftware.htmlunit.util.NameValuePair; import com.gargoylesoftware.htmlunit.util.WebResponseWrapper; import com.gargoylesoftware.htmlunit.xml.XmlPage; Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/MSXMLActiveXObjectFactoryTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/MSXMLActiveXObjectFactoryTest.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/MSXMLActiveXObjectFactoryTest.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,13 +12,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Test; +import com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLActiveXObjectFactory; + /** * Tests for {@link MSXMLActiveXObjectFactory}. * Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/MSXMLTestUtil.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/MSXMLTestUtil.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/MSXMLTestUtil.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import com.gargoylesoftware.htmlunit.html.HtmlPageTest; Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMAttributeTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMAttributeTest.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMAttributeTest.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,15 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.IE; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.CREATE_XMLDOMDOCUMENT_FUNCTION; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil. - LOAD_XMLDOMDOCUMENT_FROM_URL_FUNCTION; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.callCreateXMLDOMDocument; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.callLoadXMLDOMDocumentFromURL; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.createTestHTML; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.CREATE_XMLDOMDOCUMENT_FUNCTION; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.LOAD_XMLDOMDOCUMENT_FROM_URL_FUNCTION; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.callCreateXMLDOMDocument; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.callLoadXMLDOMDocumentFromURL; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.createTestHTML; import org.junit.Test; import org.junit.runner.RunWith; @@ -28,6 +27,7 @@ import com.gargoylesoftware.htmlunit.BrowserRunner; import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts; import com.gargoylesoftware.htmlunit.BrowserRunner.Browsers; +import com.gargoylesoftware.htmlunit.javascript.host.activex.XMLDOMAttribute; import com.gargoylesoftware.htmlunit.WebDriverTestCase; /** Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMCDATASectionTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMCDATASectionTest.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMCDATASectionTest.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,15 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.IE; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.CREATE_XMLDOMDOCUMENT_FUNCTION; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil. - LOAD_XMLDOMDOCUMENT_FROM_URL_FUNCTION; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.callCreateXMLDOMDocument; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.callLoadXMLDOMDocumentFromURL; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.createTestHTML; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.CREATE_XMLDOMDOCUMENT_FUNCTION; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.LOAD_XMLDOMDOCUMENT_FROM_URL_FUNCTION; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.callCreateXMLDOMDocument; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.callLoadXMLDOMDocumentFromURL; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.createTestHTML; import org.junit.Test; import org.junit.runner.RunWith; @@ -29,6 +28,7 @@ import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts; import com.gargoylesoftware.htmlunit.BrowserRunner.Browsers; import com.gargoylesoftware.htmlunit.BrowserRunner.NotYetImplemented; +import com.gargoylesoftware.htmlunit.javascript.host.activex.XMLDOMCDATASection; import com.gargoylesoftware.htmlunit.WebDriverTestCase; /** Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMCommentTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMCommentTest.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMCommentTest.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,15 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.IE; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.CREATE_XMLDOMDOCUMENT_FUNCTION; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil. - LOAD_XMLDOMDOCUMENT_FROM_URL_FUNCTION; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.callCreateXMLDOMDocument; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.callLoadXMLDOMDocumentFromURL; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.createTestHTML; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.CREATE_XMLDOMDOCUMENT_FUNCTION; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.LOAD_XMLDOMDOCUMENT_FROM_URL_FUNCTION; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.callCreateXMLDOMDocument; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.callLoadXMLDOMDocumentFromURL; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.createTestHTML; import org.junit.Test; import org.junit.runner.RunWith; @@ -28,6 +27,7 @@ import com.gargoylesoftware.htmlunit.BrowserRunner; import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts; import com.gargoylesoftware.htmlunit.BrowserRunner.Browsers; +import com.gargoylesoftware.htmlunit.javascript.host.activex.XMLDOMComment; import com.gargoylesoftware.htmlunit.WebDriverTestCase; /** Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMDocument2Test.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMDocument2Test.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMDocument2Test.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,18 +12,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.IE; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.CREATE_XMLDOMDOCUMENT_FUNCTION; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil. - LOAD_XMLDOMDOCUMENT_FROM_STRING_FUNCTION; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil. - LOAD_XMLDOMDOCUMENT_FROM_URL_FUNCTION; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.callCreateXMLDOMDocument; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.callLoadXMLDOMDocumentFromString; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.callLoadXMLDOMDocumentFromURL; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.createTestHTML; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.CREATE_XMLDOMDOCUMENT_FUNCTION; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.LOAD_XMLDOMDOCUMENT_FROM_STRING_FUNCTION; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.LOAD_XMLDOMDOCUMENT_FROM_URL_FUNCTION; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.callCreateXMLDOMDocument; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.callLoadXMLDOMDocumentFromString; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.callLoadXMLDOMDocumentFromURL; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.createTestHTML; import java.net.URL; @@ -33,6 +31,7 @@ import com.gargoylesoftware.htmlunit.BrowserRunner; import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts; import com.gargoylesoftware.htmlunit.BrowserRunner.Browsers; +import com.gargoylesoftware.htmlunit.javascript.host.activex.XMLDOMDocument; import com.gargoylesoftware.htmlunit.WebDriverTestCase; /** Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMDocument3Test.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMDocument3Test.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMDocument3Test.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,18 +12,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.IE; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.CREATE_XMLDOMDOCUMENT_FUNCTION; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil. - LOAD_XMLDOMDOCUMENT_FROM_STRING_FUNCTION; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil. - SERIALIZE_XMLDOMDOCUMENT_TO_STRING_FUNCTION; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.callCreateXMLDOMDocument; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.callLoadXMLDOMDocumentFromString; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.callSerializeXMLDOMDocumentToString; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.createTestHTML; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.CREATE_XMLDOMDOCUMENT_FUNCTION; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.LOAD_XMLDOMDOCUMENT_FROM_STRING_FUNCTION; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.SERIALIZE_XMLDOMDOCUMENT_TO_STRING_FUNCTION; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.callCreateXMLDOMDocument; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.callLoadXMLDOMDocumentFromString; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.callSerializeXMLDOMDocumentToString; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.createTestHTML; import org.junit.Test; import org.junit.runner.RunWith; Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMDocumentFragmentTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMDocumentFragmentTest.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMDocumentFragmentTest.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,16 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.IE; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil. - CREATE_XMLDOMDOCUMENT_FUNCTION; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil. - LOAD_XMLDOMDOCUMENT_FROM_URL_FUNCTION; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.callCreateXMLDOMDocument; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.callLoadXMLDOMDocumentFromURL; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.createTestHTML; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.CREATE_XMLDOMDOCUMENT_FUNCTION; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.LOAD_XMLDOMDOCUMENT_FROM_URL_FUNCTION; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.callCreateXMLDOMDocument; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.callLoadXMLDOMDocumentFromURL; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.createTestHTML; import org.junit.Test; import org.junit.runner.RunWith; @@ -29,6 +27,7 @@ import com.gargoylesoftware.htmlunit.BrowserRunner; import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts; import com.gargoylesoftware.htmlunit.BrowserRunner.Browsers; +import com.gargoylesoftware.htmlunit.javascript.host.activex.XMLDOMDocumentFragment; import com.gargoylesoftware.htmlunit.WebDriverTestCase; /** Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMDocumentTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMDocumentTest.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMDocumentTest.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,19 +12,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.IE; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.CREATE_XMLDOMDOCUMENT_FUNCTION; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.CREATE_XMLDOMDOCUMENT_FUNCTION_NAME; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil. - LOAD_XMLDOMDOCUMENT_FROM_STRING_FUNCTION; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil. - LOAD_XMLDOMDOCUMENT_FROM_URL_FUNCTION; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.callCreateXMLDOMDocument; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.callLoadXMLDOMDocumentFromString; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.callLoadXMLDOMDocumentFromURL; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.createTestHTML; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.CREATE_XMLDOMDOCUMENT_FUNCTION; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.CREATE_XMLDOMDOCUMENT_FUNCTION_NAME; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.LOAD_XMLDOMDOCUMENT_FROM_STRING_FUNCTION; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.LOAD_XMLDOMDOCUMENT_FROM_URL_FUNCTION; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.callCreateXMLDOMDocument; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.callLoadXMLDOMDocumentFromString; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.callLoadXMLDOMDocumentFromURL; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.createTestHTML; import org.junit.Test; import org.junit.runner.RunWith; @@ -33,6 +31,7 @@ import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts; import com.gargoylesoftware.htmlunit.BrowserRunner.Browsers; import com.gargoylesoftware.htmlunit.BrowserRunner.NotYetImplemented; +import com.gargoylesoftware.htmlunit.javascript.host.activex.XMLDOMDocument; import com.gargoylesoftware.htmlunit.WebDriverTestCase; /** Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMDocumentTypeTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMDocumentTypeTest.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMDocumentTypeTest.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,13 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.IE; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil. - LOAD_XMLDOMDOCUMENT_FROM_URL_FUNCTION; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.callLoadXMLDOMDocumentFromURL; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.createTestHTML; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.LOAD_XMLDOMDOCUMENT_FROM_URL_FUNCTION; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.callLoadXMLDOMDocumentFromURL; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.createTestHTML; import org.junit.Test; import org.junit.runner.RunWith; @@ -27,6 +26,7 @@ import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts; import com.gargoylesoftware.htmlunit.BrowserRunner.Browsers; import com.gargoylesoftware.htmlunit.BrowserRunner.NotYetImplemented; +import com.gargoylesoftware.htmlunit.javascript.host.activex.XMLDOMDocumentType; import com.gargoylesoftware.htmlunit.WebDriverTestCase; /** Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMElementTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMElementTest.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMElementTest.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,16 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.IE; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil. - CREATE_XMLDOMDOCUMENT_FUNCTION; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil. - LOAD_XMLDOMDOCUMENT_FROM_URL_FUNCTION; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.callCreateXMLDOMDocument; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.callLoadXMLDOMDocumentFromURL; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.createTestHTML; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.CREATE_XMLDOMDOCUMENT_FUNCTION; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.LOAD_XMLDOMDOCUMENT_FROM_URL_FUNCTION; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.callCreateXMLDOMDocument; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.callLoadXMLDOMDocumentFromURL; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.createTestHTML; import org.junit.Test; import org.junit.runner.RunWith; @@ -29,6 +27,7 @@ import com.gargoylesoftware.htmlunit.BrowserRunner; import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts; import com.gargoylesoftware.htmlunit.BrowserRunner.Browsers; +import com.gargoylesoftware.htmlunit.javascript.host.activex.XMLDOMElement; import com.gargoylesoftware.htmlunit.WebDriverTestCase; /** Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMImplementationTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMImplementationTest.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMImplementationTest.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,13 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.IE; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil. - CREATE_XMLDOMDOCUMENT_FUNCTION; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.callCreateXMLDOMDocument; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.createTestHTML; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.CREATE_XMLDOMDOCUMENT_FUNCTION; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.callCreateXMLDOMDocument; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.createTestHTML; import org.junit.Test; import org.junit.runner.RunWith; @@ -26,6 +25,7 @@ import com.gargoylesoftware.htmlunit.BrowserRunner; import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts; import com.gargoylesoftware.htmlunit.BrowserRunner.Browsers; +import com.gargoylesoftware.htmlunit.javascript.host.activex.XMLDOMImplementation; import com.gargoylesoftware.htmlunit.WebDriverTestCase; /** Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMNamedNodeMapTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMNamedNodeMapTest.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMNamedNodeMapTest.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,13 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.IE; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil. - LOAD_XMLDOMDOCUMENT_FROM_URL_FUNCTION; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.callLoadXMLDOMDocumentFromURL; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.createTestHTML; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.LOAD_XMLDOMDOCUMENT_FROM_URL_FUNCTION; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.callLoadXMLDOMDocumentFromURL; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.createTestHTML; import org.junit.Test; import org.junit.runner.RunWith; @@ -26,6 +25,7 @@ import com.gargoylesoftware.htmlunit.BrowserRunner; import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts; import com.gargoylesoftware.htmlunit.BrowserRunner.Browsers; +import com.gargoylesoftware.htmlunit.javascript.host.activex.XMLDOMNamedNodeMap; import com.gargoylesoftware.htmlunit.WebDriverTestCase; /** Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMNodeListTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMNodeListTest.java 2014-01-20 18:57:23 UTC (rev 9008) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/activex/XMLDOMNodeListTest.java 2014-01-20 19:02:33 UTC (rev 9009) @@ -12,13 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gargoylesoftware.htmlunit.activex.javascript.msxml; +package com.gargoylesoftware.htmlunit.javascript.host.activex; import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.IE; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil. - LOAD_XMLDOMDOCUMENT_FROM_URL_FUNCTION; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.callLoadXMLDOMDocumentFromURL; -import static com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLTestUtil.createTestHTML; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.LOAD_XMLDOMDOCUMENT_FROM_URL_FUNCTION; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLTestUtil.callLoadXMLDOMDocumentFromURL; +import static com.gargoylesoftware.htmlunit.javascript.host.activex.MSXMLT... [truncated message content] |