You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xap-commits@incubator.apache.org by bb...@apache.org on 2006/11/06 22:26:33 UTC
svn commit: r471899 [2/2] - in /incubator/xap/trunk:
WebContent/examples/demo/ src/xap/bridges/basic/ src/xap/data/
src/xap/data/datasource/ src/xap/macro/ src/xap/requestservice/
src/xap/session/ src/xap/taghandling/ src/xap/xml/ src/xap/xml/dom/ src/...
Added: incubator/xap/trunk/testsrc/xap/performance/slider_panel.xml-copy
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/testsrc/xap/performance/slider_panel.xml-copy?view=auto&rev=471899
==============================================================================
--- incubator/xap/trunk/testsrc/xap/performance/slider_panel.xml-copy (added)
+++ incubator/xap/trunk/testsrc/xap/performance/slider_panel.xml-copy Mon Nov 6 14:26:31 2006
@@ -0,0 +1,88 @@
+<?xml version="1.0"?>
+<xul id="nx:5c-4o-1-3d-2f3yc-28">
+ <panel bgcolor="gray" id="slider_panel">
+ <layoutmanager align="stretch" layout="boxlayout" orientation="horizontal" pack="end" id="nx:5c-4o-1-3d-2f3yc-29"/>
+ <panel id="slide1" bgcolor="229,229,229" width="28">
+ <layoutmanager layout="borderlayout" vgap="0" hgap="0" id="nx:5c-4o-1-3d-2f3yc-30"/>
+ <panel id="header1" layoutpos="west" bgcolor="#6c6b79" borderwidth="2" borderstyle="inset" width="28" minsize="28">
+ <layoutmanager layout="borderlayout" vgap="0" hgap="0" id="nx:5c-4o-1-3d-2f3yc-31"/>
+ <panel layoutpos="center" height="900" width="20" bgimg="images/topology_view.gif" borderwidth="0" borderstyle="solid" id="nx:5c-4o-1-3d-2f3yc-32"/>
+ </panel>
+ <scrollpane layoutpos="center" id="nx:5c-4o-1-3d-2f3yc-33">
+ <panel id="topology_view" src="topology.jsp"/>
+ </scrollpane>
+ </panel>
+ <panel bgcolor="229,229,229" id="slide2" x="20" width="28" maximized="false">
+ <layoutmanager layout="borderlayout" id="nx:5c-4o-1-3d-2f3yc-34"/>
+ <panel id="header2" bgcolor="#6c6b79" layoutpos="west" borderwidth="2" borderstyle="inset" width="28" height="400" minsize="28">
+ <layoutmanager layout="borderlayout" vgap="0" hgap="0" id="nx:5c-4o-1-3d-2f3yc-35"/>
+ <button id="header2_max_button" img="images/AllLeftArrow.gif" layoutpos="north" oncommand="mco:myMCO.handleHeader2MaxButton()" onmouseover="#Header2MaxButtonMouseOver" onmouseout="#Header2MaxButtonMouseOut"/>
+ <panel id="header2_button_panel" layoutpos="center" borderwidth="2" borderstyle="outset">
+ <layoutmanager layout="borderlayout" id="nx:5c-4o-1-3d-2f3yc-36"/>
+ <label id="label_arrow2" img="images/LeftArrow.gif" layoutpos="north" justifyh="center" onmouseup="mco:myMCO.handleHeader2ButtonMouseUp()" onmousedown="mco:myMCO.handleHeader2ButtonMouseDown()" onmouseover="mco:myMCO.handleHeader2OnMouseOver()" onmouseout="mco:myMCO.handleHeader2OnMouseOut()"/>
+ <panel height="900" width="20" layoutpos="center" id="header2_button" bgimg="images/list_view.gif" onmouseup="mco:myMCO.handleHeader2ButtonMouseUp()" onmousedown="mco:myMCO.handleHeader2ButtonMouseDown()" onmouseover="mco:myMCO.handleHeader2OnMouseOver()" onmouseout="mco:myMCO.handleHeader2OnMouseOut()"/>
+ </panel>
+ </panel>
+ <scrollpane layoutpos="center" id="nx:5c-4o-1-3d-2f3yc-37">
+ <panel id="list_view" src="list_view.jsp"/>
+ </scrollpane>
+ </panel>
+ <panel id="slide3" x="20" bgcolor="229,229,229" width="28" maximized="false">
+ <layoutmanager layout="borderlayout" id="nx:5c-4o-1-3d-2f3yc-38"/>
+ <panel layoutpos="west" id="header3" bgcolor="#6c6b79" borderwidth="2" borderstyle="inset" width="28" height="400" minsize="28">
+ <layoutmanager layout="borderlayout" vgap="0" hgap="0" id="nx:5c-4o-1-3d-2f3yc-39"/>
+ <button id="header3_max_button" img="images/AllLeftArrow.gif" layoutpos="north" oncommand="mco:myMCO.handleHeader3MaxButton()" onmouseover="#Header3MaxButtonMouseOver" onmouseout="#Header3MaxButtonMouseOut"/>
+ <panel id="header3_button_panel" layoutpos="center" borderwidth="2" borderstyle="outset">
+ <layoutmanager layout="borderlayout" id="nx:5c-4o-1-3d-2f3yc-40"/>
+ <label id="label_arrow3" img="images/LeftArrow.gif" layoutpos="north" justifyh="center" onmouseup="mco:myMCO.handleHeader3ButtonMouseUp()" onmousedown="mco:myMCO.handleHeader3ButtonMouseDown()" onmouseover="mco:myMCO.handleHeader3OnMouseOver()" onmouseout="mco:myMCO.handleHeader3OnMouseOut()"/>
+ <panel height="900" width="20" layoutpos="center" id="header3_button" bgimg="images/stats_view.gif" onmouseup="mco:myMCO.handleHeader3ButtonMouseUp()" onmousedown="mco:myMCO.handleHeader3ButtonMouseDown()" onmouseover="mco:myMCO.handleHeader3OnMouseOver()" onmouseout="mco:myMCO.handleHeader3OnMouseOut()"/>
+ </panel>
+ </panel>
+ <panel id="stats_panel" x="0" y="0" layoutpos="center">
+ <layoutmanager align="stretch" layout="boxlayout" orientation="vertical" pack="start" id="nx:5c-4o-1-3d-2f3yc-41"/>
+ <panel bgcolor="229,229,229" id="slideA" height="28" maximized="false">
+ <layoutmanager layout="borderlayout" vgap="0" hgap="0" id="nx:5c-4o-1-3d-2f3yc-42"/>
+ <panel id="headerA" borderwidth="2" borderstyle="inset" bgcolor="#6c6b79" layoutpos="south" height="28">
+ <layoutmanager layout="borderlayout" vgap="0" hgap="0" id="nx:5c-4o-1-3d-2f3yc-43"/>
+ <button id="headerA_max_button" img="images/AllDownArrow.gif" layoutpos="west" oncommand="mco:myMCO.handleHeaderAMaxButton()" onmouseover="#HeaderAMaxButtonMouseOver" onmouseout="#HeaderAMaxButtonMouseOut"/>
+ <panel id="headerA_button_panel" layoutpos="center" borderwidth="2" borderstyle="outset">
+ <layoutmanager layout="borderlayout" id="nx:5c-4o-1-3d-2f3yc-44"/>
+ <label id="label_arrowA" img="images/DownArrow.gif" layoutpos="west" justifyh="center" onmouseup="mco:myMCO.handleHeaderAButtonMouseUp()" onmousedown="mco:myMCO.handleHeaderAButtonMouseDown()" onmouseover="mco:myMCO.handleHeaderAOnMouseOver()" onmouseout="mco:myMCO.handleHeaderAOnMouseOut()"/>
+ <panel height="20" width="1800" bgimg="images/performance_stats.gif" id="headerA_button" layoutpos="center" onmousedown="mco:myMCO.handleHeaderAButtonMouseDown()" onmouseup="mco:myMCO.handleHeaderAButtonMouseUp()" onmouseover="mco:myMCO.handleHeaderAOnMouseOver()" onmouseout="mco:myMCO.handleHeaderAOnMouseOut()"/>
+ </panel>
+ </panel>
+ <panel id="performance_charts4" src="performance_charts.jsp" layoutpos="center"/>
+ </panel>
+ <panel bgcolor="229,229,229" id="slideB" height="28">
+ <layoutmanager layout="borderlayout" vgap="0" hgap="0" id="nx:5c-4o-1-3d-2f3yc-45"/>
+ <panel id="headerB" borderwidth="2" borderstyle="inset" bgcolor="#6c6b79" layoutpos="south" height="28">
+ <layoutmanager layout="borderlayout" vgap="0" hgap="0" id="nx:5c-4o-1-3d-2f3yc-46"/>
+ <panel id="headerB_button" height="20" width="1800" borderwidth="0" borderstyle="solid" layoutpos="center" bgimg="images/disk_usage_stats.gif"/>
+ </panel>
+ <scrollpane layoutpos="center" id="nx:5c-4o-1-3d-2f3yc-47">
+ <panel id="disk_usage_charts2" src="disk_usage_charts.xml"/>
+ </scrollpane>
+ </panel>
+ </panel>
+ </panel>
+ </panel>
+ <mco id="myMCO" src="com.nexaweb.sanmgr.SliderPanelEventHandlerMCO" onload="mco:myMCO.initSlides()"/>
+ <define id="Header2MaxButtonMouseOver">
+ <button id="header2_max_button2" bgcolor="#898995"/>
+ </define>
+ <define id="Header2MaxButtonMouseOut">
+ <button id="header2_max_button3" bgcolor="#6c6b79"/>
+ </define>
+ <define id="Header3MaxButtonMouseOver">
+ <button id="header3_max_button2" bgcolor="#898995"/>
+ </define>
+ <define id="Header3MaxButtonMouseOut">
+ <button id="header3_max_button3" bgcolor="#6c6b79"/>
+ </define>
+ <define id="HeaderAMaxButtonMouseOver">
+ <button id="headerA_max_button2" bgcolor="#898995"/>
+ </define>
+ <define id="HeaderAMaxButtonMouseOut">
+ <button id="headerA_max_button3" bgcolor="#6c6b79"/>
+ </define>
+</xul>
\ No newline at end of file
Modified: incubator/xap/trunk/testsrc/xap/xml/_TestParser.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/testsrc/xap/xml/_TestParser.html?view=diff&rev=471899&r1=471898&r2=471899
==============================================================================
--- incubator/xap/trunk/testsrc/xap/xml/_TestParser.html (original)
+++ incubator/xap/trunk/testsrc/xap/xml/_TestParser.html Mon Nov 6 14:26:31 2006
@@ -22,20 +22,15 @@
dojo.hostenv.setModulePrefix("dojo", "../dojo/src");
dojo.hostenv.setModulePrefix("xap", "../xap");
dojo.hostenv.setModulePrefix("google", "../google");
- Xap.require("xap.xml.sax.SaxContentHandler");
- Xap.require("xap.xml.sax.SaxParser");
+ Xap.require("xap.xml.ParserFactory");
//-----------------------------------------------------------------------
// Parser-specific Methods.
//-----------------------------------------------------------------------
function createDoc(xmlString){
- var handler = new xap.xml.sax.SaxContentHandler();
- var parser = new xap.xml.sax.SaxParser(handler);
-
- parser.setDocumentHandler( handler );
- parser.parse( xmlString ) ;
- return handler._document ;
+ var parser = xap.xml.ParserFactory.getParser();
+ return parser.parse( xmlString ) ;
}
@@ -129,16 +124,58 @@
}
function testEmptyDocument() {
- assertSpecificExceptionThrownOnParse(EMPTY_DOCUMENT,
- "xap.xml.sax.EmptyDocumentException");
- }
+ exceptionThrown = false;
+ try{
+ var doc = createDoc(EMPTY_DOCUMENT);
+ } catch(ee){
+ exceptionThrown = true;
+ }
+
+ assertTrue("An exception should have been thrown for emtpy document.",
+ exceptionThrown);
+ }
+
+ function testCompoundNamespacesDocument() {
+ exceptionThrown = false;
+ try{
+ var doc = createDoc(COMPOUND_NAMESPACE);
+
+ assertTrue("Compound Namespaces: Make sure the root element has a namespace of http://www.openxal.org/xal.",
+ doc.getRootElement().getNamespaceUri() == "http://www.openxal.org/xal");
+
+ assertTrue("Compound Namespaces: Make sure the root element has a prefix of \"\".",
+ doc.getRootElement().getPrefix() == "");
+
+ assertTrue("Compound Namespaces: Make sure the root element has a namespace of http://www.openxal.org/xmodify.",
+ doc.getRootElement().childNodes[0].getNamespaceUri() == "http://www.openxal.org/xmodify");
+
+ assertTrue("Compound Namespaces: Make sure the root element has a prefix of \"\".",
+ doc.getRootElement().childNodes[0].getPrefix() == "xm");
+ } catch(ee){
+ exceptionThrown = true;
+ }
+
+ }
+
+ /*
function testDuplicateAttributeNames() {
- var doc = createDoc(DUPLICATE_ATTRIBUTES_ON_ELEMENT);
- assertEquals("If there are two attributes with the same name, " +
- "the second one should take precedence.",
- doc.getRootElement().getAttribute("name"), "value2");
+ //var doc = createDoc(DUPLICATE_ATTRIBUTES_ON_ELEMENT);
+ //assertEquals("If there are two attributes with the same name, " +
+ // "the second one should take precedence.",
+ // doc.getRootElement().getAttribute("name"), "value2");
+
+ exceptionThrown = false;
+ try{
+ doc = createDoc(DUPLICATE_ATTRIBUTES_ON_ELEMENT);
+ } catch(ee){
+ exceptionThrown = true;
+ }
+ assertTrue("An exception should have been thrown for invalid xml duplicate attributes.",
+ exceptionThrown);
+
}
+ */
function testTextAndCdata() {
var doc = createDoc(TEXT_AND_CDATA);
@@ -169,7 +206,9 @@
var doc = createDoc(EMPLOYEE_XML);
// Made it here, so
exceptionThrown = false ;
- } catch(ee) {}
+ } catch(ee) {
+ alert(ee);
+ }
assertFalse(exceptionThrown) ;
/* Breaks unit test coherence....
Modified: incubator/xap/trunk/testsrc/xap/xml/parserTester.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/testsrc/xap/xml/parserTester.js?view=diff&rev=471899&r1=471898&r2=471899
==============================================================================
--- incubator/xap/trunk/testsrc/xap/xml/parserTester.js (original)
+++ incubator/xap/trunk/testsrc/xap/xml/parserTester.js Mon Nov 6 14:26:31 2006
@@ -69,9 +69,7 @@
resultString += "\n"+index+": "+ theStr;
try {
- var parser = new SaxParser();
- var handler = new SaxContentHandler();
- parser.setDocumentHandler( handler );
+ var parser = xap.xml.ParserFactory.getParser();
parser.parse(theStr) ;
//result = Xparse(theStr) ;
//toXml = retag(result).replace(/<[\/]*ROOT>/g,"") ;
Modified: incubator/xap/trunk/testsrc/xap/xmodify/_TestxModify.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/testsrc/xap/xmodify/_TestxModify.html?view=diff&rev=471899&r1=471898&r2=471899
==============================================================================
--- incubator/xap/trunk/testsrc/xap/xmodify/_TestxModify.html (original)
+++ incubator/xap/trunk/testsrc/xap/xmodify/_TestxModify.html Mon Nov 6 14:26:31 2006
@@ -32,34 +32,29 @@
function setUp() {
xap.xml.xmodify.Xmodify.DEBUG=true;
try {
+ var session = new xap.session.ClientSession(null,"dojo",null) ;
var requestService = new xap.requestservice.RequestService( null );
// index.xal contains xap.xml.xmodify.Xmodify instructions that need to get executed
var content = requestService.retrieve( "/jsunit/testsrc/xap/xmodify/xmodify.xal" );
- var parser = new xap.xml.sax.SaxParser();
- var handler = new xap.xml.sax.SaxContentHandler();
- parser.setDocumentHandler( handler );
- parser.parse( content.responseText );
-
- // At this point, 'doc' represents our xap.xml.dom.Document containing xap.xml.xmodify.Xmodify
- // instructions
- var commandsDoc = handler._document;
+ var parser = xap.xml.ParserFactory.getParser();
+ var commandsDoc = parser.parse( content.responseText );
// Get the container containing the UI doc (also our DOM) representing
// the application UI. All xap.xml.xmodify.Xmodify ops will be executed against this
// DOM.
var documentContainer = new xap.xml.DocumentContainer();
- uiDoc = documentContainer.getUiDocument();
-
+ uiDoc = session.getDocumentContainer().getUiDocument();
+ uiDoc.setRootElement(uiDoc.createElement("xal"));
+
/////////////////////////////////////////////////
// Here is what I need from xap.xml.xmodify.Xmodify:
/////////////////////////////////////////////////
- var xmodify = new xap.xml.xmodify.Xmodify( commandsDoc.firstChild.firstChild, new xap.session.ClientSession("", "", null) );
+ var xmodify = new xap.xml.xmodify.Xmodify(commandsDoc.firstChild.firstChild, session);
- xmodify.execute( documentContainer );
-
- } catch (ee) {
+ xmodify.execute();
+ } catch (ee) {
// Need a catch here, even though we mean to do
// nothing interesting:
throw ee ;
@@ -70,19 +65,19 @@
}
function testRootElement(){
- var rootElement = uiDoc.getRootElement();
+ var rootElement = uiDoc.getRootElement();
assertTrue( "Check Root Element",
rootElement.getLocalName() == "xal" );
}
function testAppendElement(){
var rootElement = uiDoc.getRootElement();
- var element = uiDoc.getElementById("x0");
- var element1 = uiDoc.getElementById("x1");
+ var element = uiDoc.getElementById("button");
+ var element1 = uiDoc.getElementById("button1");
- assertTrue( "Check Append Element Exists",
+ assertTrue( "Check Append Element (button) Exists",
element != null );
- assertTrue( "Check Append Element Exists",
+ assertTrue( "Check Append Element (button1) Exists",
element1 != null );
assertTrue( "Check Append Element has correct parent",
@@ -96,26 +91,25 @@
*/
function testInsertElement(){
var rootElement = uiDoc.getRootElement();
-
assertTrue( "Check Insert Before",
- rootElement.childNodes[1].getLocalName() == "button1" );
+ rootElement.childNodes[1].getAttribute("id") == "button1" );
assertTrue( "Check Insert After",
- rootElement.childNodes[2].getLocalName() == "button1a" );
+ rootElement.childNodes[2].getAttribute("id") == "button1a" );
}
function testNestedInsert(){
var rootElement = uiDoc.getRootElement();
- var element1 = uiDoc.getElementById("x1");
+ var element1 = uiDoc.getElementById("button1");
assertTrue( "Check Nested Append Element Exists",
- element1.childNodes[0].getLocalName() == "buttonnested2" );
+ element1.childNodes[0].getAttribute("id") == "buttonnested2" );
assertTrue( "Check Nested Append Element Exists",
- element1.childNodes[1].getLocalName() == "buttonnested3" );
+ element1.childNodes[1].getAttribute("id") == "buttonnested3" );
}
function testNestedRemove(){
var rootElement = uiDoc.getRootElement();
- var element1 = uiDoc.getElementById("y1");
+ var element1 = uiDoc.getElementById("buttonnested");
assertTrue( "Check remove Element worked",
element1 == null );
@@ -124,7 +118,7 @@
function testAttributeSet(){
var rootElement = uiDoc.getRootElement();
- var element1 = uiDoc.getElementById("x1");
+ var element1 = uiDoc.getElementById("button1");
assertTrue( "Check set attribute BB worked = " + element1.toXml(true),
element1.getAttribute("BB") == "B1" );
@@ -132,7 +126,7 @@
function testAttributeRemove(){
var rootElement = uiDoc.getRootElement();
- var element1 = uiDoc.getElementById("x1");
+ var element1 = uiDoc.getElementById("button1");
assertTrue( "Check set attribute AA worked = " + element1.toXml(true),
element1.getAttribute("AA") == null );
@@ -141,7 +135,7 @@
function testRemoveChildren(){
var rootElement = uiDoc.getRootElement();
- var element1 = uiDoc.getElementById("x2");
+ var element1 = uiDoc.getElementById("button2");
assertTrue( "Check remove children worked child array length = " + element1.childNodes.length,
element1.childNodes.length == 0 );
Modified: incubator/xap/trunk/testsrc/xap/xmodify/_TestxModifyHTML.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/testsrc/xap/xmodify/_TestxModifyHTML.html?view=diff&rev=471899&r1=471898&r2=471899
==============================================================================
--- incubator/xap/trunk/testsrc/xap/xmodify/_TestxModifyHTML.html (original)
+++ incubator/xap/trunk/testsrc/xap/xmodify/_TestxModifyHTML.html Mon Nov 6 14:26:31 2006
@@ -25,8 +25,8 @@
dojo.hostenv.setModulePrefix("xap", "../xap");
dojo.hostenv.setModulePrefix("google", "../google");
Xap.require("xap.xml.xmodify.Xmodify");
-Xap.require("xap.xml.sax.SaxParser");
-Xap.require("xap.xml.sax.SaxContentHandler");
+Xap.require("xap.session.ClientSession");
+Xap.require("xap.xml.ParserFactory");
Xap.require("xap.requestservice.RequestService");
var setupOnce = true;
function setUp() {
@@ -35,25 +35,19 @@
if (setupOnce == false) return;
try {
+ var session = new xap.session.ClientSession(null,"dojo",null) ;
var requestService = new xap.requestservice.RequestService( null );
// index.xal contains xap.xml.xmodify.Xmodify instructions that need to get executed
var content = requestService.retrieve( "/jsunit/testsrc/xap/xmodify/xmodifyHTML.xal" );
- var parser = new xap.xml.sax.SaxParser();
- var handler = new xap.xml.sax.SaxContentHandler();
- parser.setDocumentHandler( handler );
- parser.parse( content.responseText );
+ var parser = xap.xml.ParserFactory.getParser();
+ var commandsDoc = parser.parse( content.responseText );
- // At this point, 'doc' represents our xap.xml.dom.Document containing xap.xml.xmodify.Xmodify
- // instructions
- var commandsDoc = handler._document;
-
/////////////////////////////////////////////////
// Here is what I need from xap.xml.xmodify.Xmodify:
/////////////////////////////////////////////////
- var xmodify = new xap.xml.xmodify.Xmodify( commandsDoc.firstChild.firstChild, new xap.session.ClientSession("", "", null));
+ var xmodify = new xap.xml.xmodify.Xmodify( commandsDoc.firstChild.firstChild, session);
xmodify.execute( document );
-
} catch (ee) {
// Need a catch here, even though we mean to do
// nothing interesting: