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 mt...@apache.org on 2006/11/06 23:56:10 UTC

svn commit: r471937 - in /incubator/xap/trunk/WebContent/examples: basic/ dojo/ htmlEmbedding/ widgets/

Author: mturyn
Date: Mon Nov  6 15:56:09 2006
New Revision: 471937

URL: http://svn.apache.org/viewvc?view=rev&rev=471937
Log:
Updated to use new application creation method and nomenclature (e.g., xapId-->applicationName, 
xapSrc-->startPage, xapToolkit="dojo" removed as it's assumed now).

Modified:
    incubator/xap/trunk/WebContent/examples/basic/dom0.html
    incubator/xap/trunk/WebContent/examples/dojo/colorPicker.html
    incubator/xap/trunk/WebContent/examples/dojo/dateAndColorPickers.html
    incubator/xap/trunk/WebContent/examples/dojo/datePicker.html
    incubator/xap/trunk/WebContent/examples/dojo/dojo1.html
    incubator/xap/trunk/WebContent/examples/dojo/dojoExample_0.html
    incubator/xap/trunk/WebContent/examples/dojo/portlet.html
    incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_controlledComponentLevelDisplay.html
    incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_homeSpecified.html
    incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_noHomeSpecified.html
    incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_3_specialAttributes_controlledComponentLevelDisplay.html
    incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_3_specialAttributes_defaultDisplay.html
    incubator/xap/trunk/WebContent/examples/widgets/button.html
    incubator/xap/trunk/WebContent/examples/widgets/desktopPane.html
    incubator/xap/trunk/WebContent/examples/widgets/listbox.html

Modified: incubator/xap/trunk/WebContent/examples/basic/dom0.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/basic/dom0.html?view=diff&rev=471937&r1=471936&r2=471937
==============================================================================
--- incubator/xap/trunk/WebContent/examples/basic/dom0.html (original)
+++ incubator/xap/trunk/WebContent/examples/basic/dom0.html Mon Nov  6 15:56:09 2006
@@ -16,25 +16,20 @@
 		};
 	</script>    
 	
-    <script language="JavaScript" type="text/javascript" src="../../xapcore.js"></script>
-    
-
     <script language="JavaScript" type="text/javascript"> 
     	// These should be in this order, as this is what their dependencies
     	// look like   	
-		Xap.addDebuggables( 
+		debug_config = { 
+			_debugList:[ 
 						"xap.taghandling.AbstractTagImpl",
 						"xap.bridges.basic.AbstractWidgetBridge",
 						"xap.bridges.basic.DomNodeBridge"
-							) ;
-    </script>
-   
-    <script language="JavaScript" type="text/javascript">
-    	Xap.bootstrap( "../../", true );
-  	</script>
-
-    	
-
+							]} ;
+    </script>					
+	
+    <script language="JavaScript" type="text/javascript" src="../../xapcore.js"></script>
+ 								
+	<script language="JavaScript" type="text/javascript">	
     	
   	
   	  <!-- SECTION 2 -->
@@ -43,12 +38,14 @@
 	<script language="JavaScript" src="dom0.js"> </script>
 	<script language="JavaScript" src="dom0Handler.js"> </script>	
 
-<!--  Do this as late as possible---brings in script tags: -->
-<script> Xap._loadDebuggables();</script> 
+	<!-- must do this before we load the actual application: -->
+	<script language="JavaScript">						
+		xap.util.Debug.loadDebuggables() ;
+	</script>   
  
  </head>
  
- <body onLoad="Xap.createAllPredefinedSessions();if(xap.showStatus){xap.showStatus();};">
+ <body onLoad="Xap.createEmbeddedApplications();if(xap.showStatus){xap.showStatus();};">
 	<h1>Wrapped DIV managed by a xaplet embedded in another table cell:</h1>
 	
 	<table id="bigtable" border="4px" borderColor="#8866AA" width="80%" height="80%"
@@ -58,8 +55,8 @@
 		<tr><th width="30%">0.</th><th>1.</th></tr>
 		<tr><td><td/><td/></tr>
 		<tr><td id="xapStat"></td>		
-			<td><div xapContext="../../"  id="applicationHome"
-				xapId="MyApp" xapSrc="dom0.xal" xapToolkit="dojo">This cell is the xap ClientSession "MyApp"'s home-base.</div>
+			<td><div   id="applicationHome"
+				applicationName="MyApp" startPage="dom0.xal">This cell is the xap ClientSession "MyApp"'s home-base.</div>
 			</td>
 		</tr>
 		<tr>

Modified: incubator/xap/trunk/WebContent/examples/dojo/colorPicker.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/dojo/colorPicker.html?view=diff&rev=471937&r1=471936&r2=471937
==============================================================================
--- incubator/xap/trunk/WebContent/examples/dojo/colorPicker.html (original)
+++ incubator/xap/trunk/WebContent/examples/dojo/colorPicker.html Mon Nov  6 15:56:09 2006
@@ -14,30 +14,28 @@
 		djConfig = {
 			parseWidgets: false
 		};
-	</script>    
-	
-    
-
-    <script language="JavaScript" type="text/javascript" src="../../xapcore.js"></script>
-    
+	</script>      
 
     <script language="JavaScript" type="text/javascript"> 
     	// These should be in this order, as this is what their dependencies
     	// look like   	
-		Xap.addDebuggables( 
+		debug_config = { 
+			_debugList:[ 
 						"xap.session.ClientSession",
 						"xap.taghandling.AbstractTagImpl",
 						"xap.bridges.basic.AbstractWidgetBridge",
 						"xap.bridges.dojo.DojoWidgetBridge",
 						"xap.bridges.dojo.DojoColorPaletteBridge"						
-							) ;
-    </script>
+							]} ;
+    </script>					
+	
+    <script language="JavaScript" type="text/javascript" src="../../xapcore.js"></script>
    
-    <script language="JavaScript" type="text/javascript">
-    	Xap.bootstrap( "../../", true );
-  	</script>
-<!--  Do this as late as possible---brings in script tags: -->
-<script language="JavaScript"> Xap._loadDebuggables();</script>
+
+	<!-- must do this before we load the actual application: -->
+	<script language="JavaScript">						
+		xap.util.Debug.loadDebuggables() ;
+	</script>   
 
   	
   	  <!-- SECTION 2 -->
@@ -57,7 +55,7 @@
  
  </head>
   
- <body onload="divv=document.getElementById('dp') ;dojo.widget.createWidget('ColorPalette',{widgetId:'dp'},divv);Xap.createAllPredefinedSessions();if(document.showXapStatus){document.showXapStatus('ColorPicker');}; ">
+ <body onload="divv=document.getElementById('dp') ;dojo.widget.createWidget('ColorPalette',{widgetId:'dp'},divv); Xap.createEmbeddedApplications(); if(document.showXapStatus){document.showXapStatus('ColorPicker');}; ">
 
 	<h1>A Dojo "ColorPalette" wrapped by an AbstractWidgetBridge subclass, managed by a xaplet in that cell.</h1>
 	
@@ -69,11 +67,11 @@
 		<tr><td>This is put here by plain Dojo.<div  id="dp"/><td/><td></td></tr>
 		<tr><td id="xapStat"></td>		
 			<td><div  id="applicationHome1"
-				xapId="ColorPicker" xapSrc="colorPicker.xal" xapToolkit="dojo">This cell is the xap ClientSession "MyApp"'s home-base.</div>
+				applicationName="ColorPicker" startPage="colorPicker.xal">This cell is the xap ClientSession "MyApp"'s home-base.</div>
 			</td>
 		</tr>
 		<tr><td>This ColorPicker was put here via a xap application, which also sized it:<div  height="5em" id="colorPickerHome" valign="top" align="left"/></div></td><td></td></tr>
-		<tr><td height="30px" >
+		<tr><td height="30px">
 					<div id="displayColour">
 							<font size="+2" face="Garamond">Pick a color...
 									<div style="align:center;width:4em">&nbsp;</div>

Modified: incubator/xap/trunk/WebContent/examples/dojo/dateAndColorPickers.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/dojo/dateAndColorPickers.html?view=diff&rev=471937&r1=471936&r2=471937
==============================================================================
--- incubator/xap/trunk/WebContent/examples/dojo/dateAndColorPickers.html (original)
+++ incubator/xap/trunk/WebContent/examples/dojo/dateAndColorPickers.html Mon Nov  6 15:56:09 2006
@@ -15,16 +15,13 @@
 			parseWidgets: false
 		};
 	</script>    
-	
-    
-
-    <script language="JavaScript" type="text/javascript" src="../../xapcore.js"></script>
-    
+ 
 
     <script language="JavaScript" type="text/javascript"> 
     	// These should be in this order, as this is what their dependencies
     	// look like   	
-		Xap.addDebuggables( 
+		debug_config = { 
+			_debugList:[ 
 						"xap.session.ClientSession",
 						"xap.taghandling.AbstractTagImpl",
 						"xap.bridges.basic.AbstractWidgetBridge",
@@ -32,18 +29,24 @@
 						"xap.bridges.dojo.DojoDatePickerBridge",
 						"xap.bridges.dojo.DojoColorPaletteBridge",						
 						"xap.session.EventHandler"					
-							) ;
-    </script>
+							] } ;
+	</script>							
+	
+    <script language="JavaScript" type="text/javascript" src="../../xapcore.js"></script>
+ 								
+	<script language="JavaScript" type="text/javascript">								
+		<!-- must do this before we load the actual application: -->					
+		xap.util.Debug.loadDebuggables() ;
+	</script> 
    
 	<script language="JavaScript" type="text/javascript">
-    		Xap.bootstrap( "../../", "debugAll");
     		
     		// Define the color-picker:
     		//Xap.defineSession = function(src, xapletName,xapHomeId,context,toolkit)
     		Xap.defineSession("colorPicker.xal", "ColorPicker","colorPickerHome","../../","dojo") ; 
 	</script>
-<!--  Do this as late as possible---brings in script tags: -->
-<script language="JavaScript"> Xap._loadDebuggables();</script>
+
+
 
   	
   	  <!-- SECTION 2 -->
@@ -65,7 +68,7 @@
  
  </head>
   
- <body onload="Xap.createAllPredefinedSessions();if(document.showXapStatus){document.showXapStatus(['DatePicker','ColorPicker']);}; ">
+ <body onload="Xap.createEmbeddedApplications(); if(document.showXapStatus){document.showXapStatus(['DatePicker','ColorPicker']);}; ">
 
 	<h1>Two Xap-spec'd applications in one page.</h1>
 	
@@ -76,11 +79,11 @@
 		<tr><th width="50%">0.</th><th>1.</th></tr>
 		<tr><td><div  id="dp"/><td/><td></td></tr>
 		<tr><td id="xapStat"></td>		
-			<td><div xapContext="../../" 
-				xapId="DatePicker" xapSrc="datePicker.xal" xapToolkit="dojo">DatePicker's home-base.</div>
+			<td><div  
+				applicationName="DatePicker" startPage="datePicker.xal">DatePicker's home-base.</div>
 			</td>
 		</tr>
-		<tr><td ><div id="displ"><b>Pick a day....</b></div><div  height="5em" id="targetNode" valign="top" align="left"/>
+		<tr><td><div id="displ"><b>Pick a day....</b></div><div  height="5em" id="targetNode" valign="top" align="left"/>
 			</div></td><td><div><div  id="datePickerDisplayer">This DatePicker was put here via a xap application:based elsewhere.</div></div></td></tr>
 		<tr><td></td><td height="30px" bgColor="#FFFFee"></td></tr>
 		

Modified: incubator/xap/trunk/WebContent/examples/dojo/datePicker.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/dojo/datePicker.html?view=diff&rev=471937&r1=471936&r2=471937
==============================================================================
--- incubator/xap/trunk/WebContent/examples/dojo/datePicker.html (original)
+++ incubator/xap/trunk/WebContent/examples/dojo/datePicker.html Mon Nov  6 15:56:09 2006
@@ -9,31 +9,26 @@
 		djConfig = {
 			parseWidgets: false
 		};
-	</script>    
-	
-    
-
-    <script language="JavaScript" type="text/javascript" src="../../xapcore.js"></script>
-    
 
-    <script language="JavaScript" type="text/javascript"> 
     	// These should be in this order, as this is what their dependencies
     	// look like   	
-		Xap.addDebuggables( 
+		debug_config = { 
+			_debugList:[ 
 						"xap.session.ClientSession",
 						"xap.taghandling.AbstractTagImpl",
 						"xap.bridges.basic.AbstractWidgetBridge",
 						"xap.bridges.dojo.DojoWidgetBridge",
 						"xap.bridges.dojo.DojoDatePickerBridge",
 						"xap.session.EventHandler"					
-							) ;
-    </script>
-   
-    <script language="JavaScript" type="text/javascript">
-    	Xap.bootstrap( "../../", true );
-  	</script>
-<!--  Do this as late as possible---brings in script tags: -->
-<script language="JavaScript"> Xap._loadDebuggables();</script>
+							]} ;
+	</script>							
+	
+    <script language="JavaScript" type="text/javascript" src="../../xapcore.js"></script>
+ 								
+	<script language="JavaScript" type="text/javascript">								
+		<!-- must do this before we load the actual application: -->					
+		xap.util.Debug.loadDebuggables() ;
+	</script>
 
   	
   	  <!-- SECTION 2 -->
@@ -57,7 +52,7 @@
  
  </head>
   
- <body onload="divv=document.getElementById('dp') ;dojo.widget.createWidget('datepicker',{widgetId:'dp'},divv);Xap.createAllPredefinedSessions();if(document.showXapStatus){document.showXapStatus('DatePicker');}; ">
+ <body onload="divv=document.getElementById('dp') ;dojo.widget.createWidget('datepicker',{widgetId:'dp'},divv);Xap.createEmbeddedApplications();if(document.showXapStatus){document.showXapStatus('DatePicker');}; ">
 	<h1>A Dojo "DatePicker" wrapped by an AbstractWidgetBridge subclass, managed by a xaplet in a different cell.</h1>
 	
 	<table id="bigtable" border="4px" borderColor="#8866AA" width="80%" height="80%"
@@ -67,11 +62,11 @@
 		<tr><th width="60%">0.</th><th>1.</th></tr>
 		<tr><td>This is put here by plain Dojo.<div  id="dp"/><td/><td></td></tr>
 		<tr><td id="xapStat"></td>		
-			<td><div xapContext="../../"  
-				xapId="DatePicker" xapSrc="datePicker.xal" xapToolkit="dojo">This cell is the xap ClientSession "DatePicker"'s home-base.</div>
+			<td><div   
+				applicationName="DatePicker" startPage="datePicker.xal">This cell is the xap ClientSession "DatePicker"'s home-base.</div>
 			</td>
 		</tr>
-		<tr><td><div id="datePickerDisplayer" >This DatePicker was put here via a xap application:</div></td><td></td></tr>
+		<tr><td><div id="datePickerDisplayer">This DatePicker was put here via a xap application:</div></td><td></td></tr>
 		<tr><td height="30px" bgColor="#FFFFee"><div id="displ"><b>Pick a day....</b></div></td><td id="mouseOverDisplayer"/><td/></tr>
 	</table>
 

Modified: incubator/xap/trunk/WebContent/examples/dojo/dojo1.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/dojo/dojo1.html?view=diff&rev=471937&r1=471936&r2=471937
==============================================================================
--- incubator/xap/trunk/WebContent/examples/dojo/dojo1.html (original)
+++ incubator/xap/trunk/WebContent/examples/dojo/dojo1.html Mon Nov  6 15:56:09 2006
@@ -24,21 +24,23 @@
     <script language="JavaScript" type="text/javascript"> 
     	// These should be in this order, as this is what their dependencies
     	// look like   	
-		Xap.addDebuggables( 
+		debug_config = { 
+			_debugList:[ 
 						"xap.taghandling.AbstractTagImpl",
 						"xap.bridges.basic.AbstractWidgetBridge",						
 						"xap.bridges.dojo.DojoWidgetBridge",		
 						"xap.bridges.dojo.DojoButtonBridge"
-							) ;
+							]} ;
+	</script>							
+	
+    <script language="JavaScript" type="text/javascript" src="../../xapcore.js"></script>
+ 								
+	<script language="JavaScript" type="text/javascript">						
+		<!-- must do this before we load the actual application: -->					
+		xap.util.Debug.loadDebuggables() ;							
     </script>
    
-    <script language="JavaScript" type="text/javascript">
-    	Xap.bootstrap( "../../", true );
-  	</script>
-
-    	
 
-    	
   	
   	  <!-- SECTION 2 -->
 	<script type="text/javascript">
@@ -55,7 +57,7 @@
  </head>
  
 
-<body onLoad="Xap.createAllPredefinedSessions();if(document.showXapStatus){document.showXapStatus('MyApp');}">
+<body onLoad="Xap.createEmbeddedApplications();if(document.showXapStatus){document.showXapStatus('MyApp');}">
 
 	<h1>Xaplet embedded in a table cell:</h1>
 	
@@ -66,8 +68,8 @@
 		<tr><th width="30%">0.</th><th>1.</th></tr>
 		<tr><td/><td/><td/><td/></tr>
 		<tr><td id="xapStat"></td>		
-			<td><div xapContext="../../" 
-				xapId="MyApp" xapSrc="dojo1.xal" xapToolkit="dojo">
+			<td><div  
+				applicationName="MyApp" startPage="dojo1.xal">
 			</td>
 		</tr>
 		<tr><td colspan="2" height="5em"></td></tr>
@@ -80,7 +82,5 @@
 	<button onclick="alert(MyApp.getDocumentContainer().getUiDocument().toXml());">hello</button>
 	<div id="foot">FOOTER TEXT</dev>
 
-<!--  Do this as late as possible---brings in script tags: -->
-<script> Xap._loadDebuggables();</script>
 </body>
 </html>

Modified: incubator/xap/trunk/WebContent/examples/dojo/dojoExample_0.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/dojo/dojoExample_0.html?view=diff&rev=471937&r1=471936&r2=471937
==============================================================================
--- incubator/xap/trunk/WebContent/examples/dojo/dojoExample_0.html (original)
+++ incubator/xap/trunk/WebContent/examples/dojo/dojoExample_0.html Mon Nov  6 15:56:09 2006
@@ -24,7 +24,8 @@
    <script language="JavaScript" type="text/javascript"> 
     	// These should be in this order, as this is what their dependencies
     	// look like   	
-		Xap.addDebuggables( 
+		debug_config = { 
+			_debugList:[ 
 						"xap.session.ClientSession",
 						"xap.taghandling.AbstractTagImpl",
 						"xap.bridges.basic.AbstractWidgetBridge",
@@ -32,13 +33,9 @@
 						"xap.bridges.dojo.DojoButtonBridge",						
 						"xap.bridges.dojo.DojoFloatingPaneBridge",
 						"xap.session.EventHandler"					
-							) ;
+							]} ;
     </script>
 
-
-    <script language="JavaScript" type="text/javascript">
-    	Xap.bootstrap( "../../", true);
-  	</script>
   	
   	  <!-- SECTION 2 -->
 	<script type="text/javascript">
@@ -57,11 +54,11 @@
  </head>
 
 
-<body onLoad="Xap.createAllPredefinedSessions()">
+<body onLoad="Xap.createEmbeddedApplications();">
 	
 	SOME TEXT
 	<h1>SOME BIG TEXT</h1>
-	<div xapContext="../../" xapId="MyApp" xapSrc="dojoExample_0.xal" xapToolkit="dojo" >
+	<div>
 	</div>
 
 	<!-- MyApp as the app name is a top-level alias for session

Modified: incubator/xap/trunk/WebContent/examples/dojo/portlet.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/dojo/portlet.html?view=diff&rev=471937&r1=471936&r2=471937
==============================================================================
--- incubator/xap/trunk/WebContent/examples/dojo/portlet.html (original)
+++ incubator/xap/trunk/WebContent/examples/dojo/portlet.html Mon Nov  6 15:56:09 2006
@@ -24,20 +24,22 @@
     <script language="JavaScript" type="text/javascript"> 
     	// These should be in this order, as this is what their dependencies
     	// look like   	
-		Xap.addDebuggables( 
+		debug_config = { 
+			_debugList:[  
 						"xap.session.ClientSession",
 						"xap.taghandling.AbstractTagImpl",
 						"xap.bridges.basic.AbstractWidgetBridge",
 						"xap.bridges.dojo.DojoWidgetBridge",
 						"xap.bridges.dojo.DojoColorPaletteBridge"						
-							) ;
+							]} ;
+	</script>							
+    <script language="JavaScript" type="text/javascript" src="../../xapcore.js"></script>
+							
+	<script language="JavaScript" type="text/javascript">							
+		<!-- must do this before we load the actual application: -->					
+		xap.util.Debug.loadDebuggables() ;
     </script>
    
-    <script language="JavaScript" type="text/javascript">
-    	Xap.bootstrap( "../../", true );
-  	</script>
-<!--  Do this as late as possible---brings in script tags: -->
-<script language="JavaScript"> Xap._loadDebuggables();</script>
 
   	
   	  <!-- SECTION 2 -->
@@ -58,7 +60,7 @@
  
  </head>
   
- <body onload="Xap.createAllPredefinedSessions();">
+ <body onload="Xap.createEmbeddedApplications();">
 
 <h1>Spatially-distributed XAP application</h1>
 <h2>XAP widgets (using Dojo colorPicker) are added to table cells</h2>

Modified: incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_controlledComponentLevelDisplay.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_controlledComponentLevelDisplay.html?view=diff&rev=471937&r1=471936&r2=471937
==============================================================================
--- incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_controlledComponentLevelDisplay.html (original)
+++ incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_controlledComponentLevelDisplay.html Mon Nov  6 15:56:09 2006
@@ -34,7 +34,7 @@
  
  </head>
   
- <body onload="Xap.createAllPredefinedSessions();">
+ <body onload="Xap.createEmbeddedApplications();">
 
 <h1>A spatially-distributed component</h1>
 <h3>The application home is the central cell,

Modified: incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_homeSpecified.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_homeSpecified.html?view=diff&rev=471937&r1=471936&r2=471937
==============================================================================
--- incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_homeSpecified.html (original)
+++ incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_homeSpecified.html Mon Nov  6 15:56:09 2006
@@ -32,7 +32,7 @@
  
  </head>
   
- <body onload="Xap.createAllPredefinedSessions();">
+ <body onload="Xap.createEmbeddedApplications();">
  	<font size="-1"><p>[Begin original body code.]</p></font>
     <h2>An application without a specified home, containing two 
     	<br/>Dojo color choosers, defined by a function call in 

Modified: incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_noHomeSpecified.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_noHomeSpecified.html?view=diff&rev=471937&r1=471936&r2=471937
==============================================================================
--- incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_noHomeSpecified.html (original)
+++ incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_noHomeSpecified.html Mon Nov  6 15:56:09 2006
@@ -38,7 +38,7 @@
  
  </head>
   
- <body onload="Xap.createAllPredefinedSessions();">
+ <body onload="Xap.createEmbeddedApplications();">
  	<font size="-1"><p>[Begin original body code.]</p></font>
 	<h2>A Dojo "ColorPalette" without a specified 
     <br/>home, defined by a function call in the html.

Modified: incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_3_specialAttributes_controlledComponentLevelDisplay.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_3_specialAttributes_controlledComponentLevelDisplay.html?view=diff&rev=471937&r1=471936&r2=471937
==============================================================================
--- incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_3_specialAttributes_controlledComponentLevelDisplay.html (original)
+++ incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_3_specialAttributes_controlledComponentLevelDisplay.html Mon Nov  6 15:56:09 2006
@@ -18,10 +18,10 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     
 <meta
-		xapSrc="simpleColor_homesSpecified.xal"
-		xapId="ColorPicker"
-		xapToolkit="dojo"
-		xapContext="../../" 
+		startPage="simpleColor_homesSpecified.xal"
+		applicationName="ColorPicker"
+		
+		 
 />	 		
 <!--  
 	We've just defined the xap application 
@@ -54,7 +54,7 @@
  
  </head>
   
- <body onload="Xap.createAllPredefinedSessions();" id="theBody">
+ <body onload="Xap.createEmbeddedApplications();" id="theBody">
  	
  	<font size="-1"><p>[Begin original body code.]</p></font>
 	<h2>

Modified: incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_3_specialAttributes_defaultDisplay.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_3_specialAttributes_defaultDisplay.html?view=diff&rev=471937&r1=471936&r2=471937
==============================================================================
--- incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_3_specialAttributes_defaultDisplay.html (original)
+++ incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_3_specialAttributes_defaultDisplay.html Mon Nov  6 15:56:09 2006
@@ -28,7 +28,7 @@
  
  </head>
   
- <body onload="Xap.createAllPredefinedSessions();">
+ <body onload="Xap.createEmbeddedApplications();">
  	
  	<font size="-1"><p>[Begin original body code.]</p></font>
 	<h2>
@@ -39,11 +39,11 @@
     <!--  Embed the XAP app. into DIV 0 -->
     <DIV id="DIV0" style="border-style:inset;background:rgb(255,239,239);border-width:1px;left:300px;top:120px;width:200px;height:200px;position:absolute;opacity:0.8;z-order:9;"
     		comment="This tag, which is _not_ a XAP tag, marks the start of the non-standard attributes."
-	 		xapSrc="simpleColor.xal"
-		 	xapId="ColorPicker"
-	 		xapToolkit="dojo"
-	 		xapContext="../../"    
-	    >DIV 0</DIV>
+	 		startPage="simpleColor.xal"
+		 	applicationName="ColorPicker"
+	 		
+	 		    
+	>DIV 0</DIV>
     <DIV id="DIV1" style="border-style:outset;background:rgb(239,239,255);border-width:1px;left:450px;top:220px;width:200px;height:200px;position:absolute;opacity:0.8;z-order:8;">DIV 1</DIV>    
  	<font size="-1"><p>[End original body code.]</p></font>    
 </body>

Modified: incubator/xap/trunk/WebContent/examples/widgets/button.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/button.html?view=diff&rev=471937&r1=471936&r2=471937
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/button.html (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/button.html Mon Nov  6 15:56:09 2006
@@ -16,14 +16,14 @@
 			djConfig = {
 				parseWidgets: false
 			};
-		</script>    
+		</script>
 		
-		<script language="JavaScript" type="text/javascript" src="../../xapcore.js"></script>
-	    <script language="JavaScript" type="text/javascript" src="AttributeTester.js"></script>    
-        
-        <script language="JavaScript" type="text/javascript">
-	    	xap.util.Debug.setSourceRootDir("../../"); 	
-			xap.util.Debug.addDebuggables(		
+		<!--  script type="text/javascript">
+			// This is actually the default _sourceRootDir,
+			// it's here as an illustration
+			debug_config = { 			
+	    		_sourceRootDir: "../../src" ,
+				_debugList:[ 	
 								"xap.data.DataFramework",
 								"xap.data.DataServiceFactory",
 								"xap.data.DataServiceImpl",
@@ -58,7 +58,14 @@
 								"xap.taghandling.AttributeConverter",
 								"xap.util.MessageFormat",
 								"xap.xml.dom.Document"
-								);
+							]
+						};
+		</script -->	
+		
+		<script language="JavaScript" type="text/javascript" src="../../xapcore.js"></script>
+	    <script language="JavaScript" type="text/javascript" src="AttributeTester.js"></script>    	
+							
+        <script language="JavaScript" type="text/javascript">						
 			xap.util.Debug.loadDebuggables();
 	    </script>	
 	</head>

Modified: incubator/xap/trunk/WebContent/examples/widgets/desktopPane.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/desktopPane.html?view=diff&rev=471937&r1=471936&r2=471937
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/desktopPane.html (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/desktopPane.html Mon Nov  6 15:56:09 2006
@@ -23,7 +23,7 @@
     
  </head>
   
- <body  onload="Xap.createAllPredefinedSessions();">
-	<div xapId="ButtonExample" style="width:100%; height:100%" xapSrc="desktopPane.xal" xapToolkit="dojo" xapContext="../../"></div>
+ <body  onload="Xap.createEmbeddedApplications();">
+	<div applicationName="ButtonExample" style="width:100%; height:100%" startPage="desktopPane.xal">
 </body>
 </html>

Modified: incubator/xap/trunk/WebContent/examples/widgets/listbox.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/listbox.html?view=diff&rev=471937&r1=471936&r2=471937
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/listbox.html (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/listbox.html Mon Nov  6 15:56:09 2006
@@ -37,6 +37,6 @@
  </head>
   
  <body onload="Xap.createEmbeddedApplications()">
-	<div xapId="ListBoxExample" startPage="listbox.xal"      ></div>
+	<div applicationName="ListBoxExample" startPage="listbox.xal"></div>
 </body>
 </html>