Author: dolander Date: Sat Jan 22 20:39:14 2005 New Revision: 126194 URL: http://svn.apache.org/viewcvs?view=rev&rev=126194 Log: Remove the dead code associated with the URL rewriting version of the client side tree Added the registeration of the XmlHttpRequestServlet to the webapp template and the DRT WebApps Added the Tree XmlHttpRequest interceptor to the default configuration
Modified: incubator/beehive/trunk/netui/src/javascript/tagshtml/netui-tree.js incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IScriptReporter.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/javaScript.properties incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/DivPanel.java incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/netui-config.xml incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/web.xml incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/web.xml incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/web.xml Modified: incubator/beehive/trunk/netui/src/javascript/tagshtml/netui-tree.js Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/javascript/tagshtml/netui-tree.js?view=diff&rev=126194&p1=incubator/beehive/trunk/netui/src/javascript/tagshtml/netui-tree.js&r1=126193&p2=incubator/beehive/trunk/netui/src/javascript/tagshtml/netui-tree.js&r2=126194 ============================================================================== --- incubator/beehive/trunk/netui/src/javascript/tagshtml/netui-tree.js (original) +++ incubator/beehive/trunk/netui/src/javascript/tagshtml/netui-tree.js Sat Jan 22 20:39:14 2005 @@ -34,17 +34,6 @@ } } -//@todo: delete -// this will run the code necessary to submit an achor -//function NetUIAnchorInvoke(node,onclickStuff) -//{ -// var f = new Function(onclickStuff); -// var ret = f.call(node); -// if (ret != null && ret == false) -// return false; - //netUI.netUITree.rewriteAnchor(node); -//} - function getTreeName(node) { if (node.nodeName != "A") Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IScriptReporter.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IScriptReporter.java?view=diff&rev=126194&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IScriptReporter.java&r1=126193&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IScriptReporter.java&r2=126194 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IScriptReporter.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IScriptReporter.java Sat Jan 22 20:39:14 2005 @@ -56,13 +56,6 @@ void addInitMethod(String varClass); /** - * This method will add a method to be called which will handle state changes - * associated with an anchor post. - * @param rewriter the name of a method which will rewrite the anchor. - */ - void addAnchorPostRewriter(String rewriter); - - /** * Adds a tagID and tagName to the id to name map. A script container * can maintain a mapping of user ids to actual ids generated by * the tagId. This method will track these. Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java?view=diff&rev=126194&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java&r1=126193&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java&r2=126194 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java Sat Jan 22 20:39:14 2005 @@ -426,18 +426,6 @@ IScriptReporter sr = getScriptReporter(); if (sr != null && sr.isRunAtClient()) { if (_clientAction != null) { - //@todo: delete - //if (_state.onClick == null) { - // _state.onClick = "NetUIAnchorRewriter(this);"; - //} - //else { - // String click = HtmlUtils.escapeEscapes(_state.onClick); - // String entry = JavaScriptUtils.getString("createAnchorRewriterOnClickExists", - // new Object[]{click}); - // _state.onClick = entry; - //} - //} - //else { //@todo: we need to support onclick chaining here also... String action = HtmlUtils.escapeEscapes(_clientAction); String entry = JavaScriptUtils.getString("netuiAction", Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java?view=diff&rev=126194&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java&r1=126193&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java&r2=126194 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java Sat Jan 22 20:39:14 2005 @@ -74,8 +74,6 @@ private HashMap<String,String> _initNames; private HashMap<String,String> _idMap; private HashMap<String,String> _idToNameMap; - // @todo: delete - //private HashMap<String,String> _anchorRewriters; private boolean _genScope = false; private boolean _runAtClient = false; private boolean _writeScript = false; @@ -201,26 +199,6 @@ } /** - * This method will add a method to be called which will handle state changes - * associated with an anchor post. - * @param rewriter the name of a method which will rewrite the anchor. - */ - public void addAnchorPostRewriter(String rewriter) - { - //@todo: delete - //if (_anchorRewriters == null) { - // _anchorRewriters = new HashMap<String,String>(); - //} - - //assert (_anchorRewriters != null) : "Anchor Rewriters is null"; - - - //String o = _anchorRewriters.get(rewriter); - //if (o == null) - // _anchorRewriters.put(rewriter, rewriter); - } - - /** * This method will output all of the Script associated with the script reporter. * @param sb The script is written into the provided StringBuilder. This value must not be null. */ @@ -232,7 +210,6 @@ if (isRunAtClient()) { addInitCode(); - addAnchorFormRewriters(); } writeScriptBlock(sb); writeAfterBlocks(sb); @@ -357,7 +334,6 @@ // Add the code to support the JavaScript framework addInitCode(); - addAnchorFormRewriters(); // writeout the script. WriteRenderAppender writer = new WriteRenderAppender(pageContext); @@ -437,52 +413,6 @@ String s = JavaScriptUtils.getString("defineNetUI", null); assert(s != null) : "Didn't find the Script 'defineNetUI'"; JavaScriptUtils.writeScriptBlock(sb, s); - } - - /** - * Add the anchor rewriter code. Rewriter code is only on when <code>runAtClient</code> is set on - * the script container. - */ - protected void addAnchorFormRewriters() - { - // @todo: delete - // We only add the initialization code if we support runAtClient features - //if (!_runAtClient) - // return; - - // add the NetUI object to the container - //HttpServletRequest req = (HttpServletRequest) pageContext.getRequest(); - - // Walk all of the initialization parameters - //StringBuilder initSb = new StringBuilder(""); - //if (_anchorRewriters != null) { - // for (String varClass : _anchorRewriters.values()) { - // String varName = Character.toLowerCase(varClass.charAt(0)) + varClass.substring(1); - // String initLine = JavaScriptUtils.getString("createAnchorRewriterLine", new Object[]{varName, varClass}); - // assert(initLine != null) : "The script 'createAnchorRewriterLine' was not found"; - // initSb.append(initLine); - // } - //} - - //String script = JavaScriptUtils.getString("createAnchorRewriter", new Object[]{req.getContextPath(), - // initSb.toString()}); - //assert(script != null) : "The script 'createAnchorRewriter' was not found"; - //addScriptFunction(script); - - //initSb = new StringBuilder(""); - //if (_anchorRewriters != null) { - // for (String varClass : _anchorRewriters.values()) { - // String varName = Character.toLowerCase(varClass.charAt(0)) + varClass.substring(1); - // String initLine = JavaScriptUtils.getString("createFormRewriterLine", new Object[]{varName, varClass}); - // assert(initLine != null) : "The script 'createFormRewriterLine' was not found"; - // initSb.append(initLine); - // } - //} - - //script = JavaScriptUtils.getString("createFormRewriter", new Object[]{req.getContextPath(), - // initSb.toString()}); - //assert(script != null) : "The script 'createFormRewriter' was not found"; - //addScriptFunction(script); } protected void writeBeforeBlocks(AbstractRenderAppender sb) Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/javaScript.properties Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/javaScript.properties?view=diff&rev=126194&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/javaScript.properties&r1=126193&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/javaScript.properties&r2=126194 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/javaScript.properties (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/javaScript.properties Sat Jan 22 20:39:14 2005 @@ -69,7 +69,6 @@ top.opener.{0}(map);\n\ window.close();\n - # This script will run and set the focus onto the named element # It is a page level statement that runs to set the initial focus on # the page. @@ -174,9 +173,6 @@ \ return val;\n\ }\n\ - - - # JavaScript that will become the mapping between the id and real name (legacy mode) singleIdMappingTable=\ // Build the netui_names table to map the tagId attributes\n\ @@ -221,42 +217,6 @@ \ // create the {0} object and initialize it.\n\ \ this.{0} = new {1}();\n\ \ this.{0}.init();\n\n - -# Script that will create the NetUI variable and put the webApp inside it -# in addition, we create the initialization code and run it. [EMAIL PROTECTED]: delete -#createAnchorRewriter=\ -#// Create the NetUI anchor rewriter method\n\ -#function NetUIAnchorRewriter(node)\n\ -#'{'\n\ -#{1}\n\ -#}\n\ -#\n - -# Script that will create the NetUI variable and put the webApp inside it -# in addition, we create the initialization code and run it. -createFormRewriter=\ -// Create the NetUI form rewriter method\n\ -function NetUIFormRewriter(node)\n\ -'{'\n\ -{1}\n\ -}\n\ -\n - -#create the anchor rewriter. -createAnchorRewriterLine=\ -\ // create the {0} object and initialize it.\n\ -\ netUI.{0}.rewriteAnchor(node);\n\n - -#create the anchor rewriter. -createFormRewriterLine=\ -\ // create the {0} object and initialize it.\n\ -\ netUI.{0}.rewriteForm(node);\n - - -#create the anchor rewriter if there is already an onclick defined -createAnchorRewriterOnClickExists=\ -return NetUIAnchorInvoke(this,"{0}"); #This method will invoke the NetUICommand infrastructure netuiAction=\ Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java?view=diff&rev=126194&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java&r1=126193&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java&r2=126194 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java Sat Jan 22 20:39:14 2005 @@ -114,8 +114,6 @@ private String _dataSource = null; // The name of the tree. private String _tagId; // tag that should uniquely indentify a tree. Required for multiple tree using auto expand - //@todo: delete - //private String[] _expanded = null; private boolean _runAtClient = false; // run at client private boolean _escapeContent = false; // esapce the content of labels private boolean _outputJavaScript = false; // cause the base javascript support to be output @@ -657,10 +655,6 @@ TreeHelpers.processTreeRequest(treeId, treeRoot, request); } - // check for the nodes that are expanded... - //@todo: delete - //_expanded = request.getParameterValues("tree-state"); - // Add the script support for the tree. if (_runAtClient) { IScriptReporter sr = getScriptReporter(); @@ -671,7 +665,6 @@ return; } sr.addInitMethod(TreeElement.TREE_JAVASCRIPT_CLASS); - sr.addAnchorPostRewriter(TreeElement.TREE_JAVASCRIPT_CLASS); } // create a containing tree level <div> and place the tree level styles on it. @@ -990,9 +983,6 @@ if (_runAtClient) { String action = node.getClientAction(); if (action != null) { - // @todo: delete - //action = "NetUIAnchorRewriter(this);"; - //else { action = HtmlUtils.escapeEscapes(action); action = JavaScriptUtils.getString("netuiAction", new Object[]{action}); } @@ -1144,13 +1134,6 @@ TreeElement node, String encodedNodeName) { if (!node.isLeaf()) { - // @todo: delete - //boolean expanded = nodeIsExpanded(node, encodedNodeName); - //if (node.isExpanded() != expanded) { - // node.onExpand(); - // node.setExpanded(expanded); - //} - boolean expanded = node.isExpanded(); _anchorState.clear(); _anchorState.href = ""; @@ -1165,23 +1148,6 @@ } return false; } - - /** - * @param node - * @param nodeName - * @return - */ - //@todo: delete - //private boolean nodeIsExpanded(TreeElement node, String nodeName) - //{ - // if (_expanded == null) - // return node.isExpanded(); - // for (int i = 0; i < _expanded.length; i++) { - // if (nodeName.equals(_expanded[i])) - // return true; - // } - // return false; - //} /** * Replace any occurrence of the specified placeholder in the specified Modified: incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/DivPanel.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/DivPanel.java?view=diff&rev=126194&p1=incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/DivPanel.java&r1=126193&p2=incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/DivPanel.java&r2=126194 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/DivPanel.java (original) +++ incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/DivPanel.java Sat Jan 22 20:39:14 2005 @@ -108,7 +108,6 @@ // @Todo: this needs to verify it is inside a script container that is run at client enabled. } sr.addInitMethod(JAVASCRIPT_CLASS); - sr.addAnchorPostRewriter(JAVASCRIPT_CLASS); StringBuilder results = new StringBuilder(128); results.append("<div "); Modified: incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/netui-config.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/netui-config.xml?view=diff&rev=126194&p1=incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/netui-config.xml&r1=126193&p2=incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/netui-config.xml&r2=126194 ============================================================================== --- incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/netui-config.xml (original) +++ incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/netui-config.xml Sat Jan 22 20:39:14 2005 @@ -12,4 +12,8 @@ </expression-language> </expression-languages> + <request-interceptors> + <interceptor-class>org.apache.beehive.netui.tags.tree.ClientRequestInterceptor</interceptor-class> + </request-interceptors> + </netui-config> Modified: incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/web.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/web.xml?view=diff&rev=126194&p1=incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/web.xml&r1=126193&p2=incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/web.xml&r2=126194 ============================================================================== --- incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/web.xml (original) +++ incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/web.xml Sat Jan 22 20:39:14 2005 @@ -68,6 +68,12 @@ <load-on-startup>2</load-on-startup> </servlet> + <!-- The XmlHttpRequest handler Servlet --> + <servlet> + <servlet-name>XmlHttpRequestServlet</servlet-name> + <servlet-class>org.apache.beehive.netui.pageflow.xmlhttprequest.XmlHttpRequestServlet</servlet-class> + </servlet> + <!-- Struts Action Servlet Mappings --> <!-- Note that because Struts takes the *last* mapping here as the extension to add to actions posted from forms, we must have *.do come after *.jpf. --> @@ -79,6 +85,12 @@ <servlet-mapping> <servlet-name>action</servlet-name> <url-pattern>*.do</url-pattern> + </servlet-mapping> + + <!-- XmlHttpRequest Servlet --> + <servlet-mapping> + <servlet-name>XmlHttpRequestServlet</servlet-name> + <url-pattern>*.xmlHttpRequest</url-pattern> </servlet-mapping> <welcome-file-list> Modified: incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/web.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/web.xml?view=diff&rev=126194&p1=incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/web.xml&r1=126193&p2=incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/web.xml&r2=126194 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/web.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/web.xml Sat Jan 22 20:39:14 2005 @@ -123,6 +123,12 @@ <load-on-startup>2</load-on-startup> </servlet> + <!-- The XmlHttpRequest handler Servlet --> + <servlet> + <servlet-name>XmlHttpRequestServlet</servlet-name> + <servlet-class>org.apache.beehive.netui.pageflow.xmlhttprequest.XmlHttpRequestServlet</servlet-class> + </servlet> + <!-- Struts Action Servlet Mapping --> <!-- Note that because Struts takes the *last* mapping here as the extension to add to @@ -135,6 +141,12 @@ <servlet-mapping> <servlet-name>action</servlet-name> <url-pattern>*.do</url-pattern> + </servlet-mapping> + + <!-- XmlHttpRequest Servlet --> + <servlet-mapping> + <servlet-name>XmlHttpRequestServlet</servlet-name> + <url-pattern>*.xmlHttpRequest</url-pattern> </servlet-mapping> <!-- Faces Servlet --> Modified: incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/web.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/web.xml?view=diff&rev=126194&p1=incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/web.xml&r1=126193&p2=incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/web.xml&r2=126194 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/web.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/web.xml Sat Jan 22 20:39:14 2005 @@ -91,6 +91,12 @@ <load-on-startup>2</load-on-startup> </servlet> + <!-- The XmlHttpRequest handler Servlet --> + <servlet> + <servlet-name>XmlHttpRequestServlet</servlet-name> + <servlet-class>org.apache.beehive.netui.pageflow.xmlhttprequest.XmlHttpRequestServlet</servlet-class> + </servlet> + <!-- Struts Action Servlet Mappings --> <!-- Note that because Struts takes the *last* mapping here as the extension to add to actions posted from forms, we must have *.do come after *.jpf. --> @@ -102,6 +108,12 @@ <servlet-mapping> <servlet-name>action</servlet-name> <url-pattern>*.do</url-pattern> + </servlet-mapping> + + <!-- XmlHttpRequest Servlet --> + <servlet-mapping> + <servlet-name>XmlHttpRequestServlet</servlet-name> + <url-pattern>*.xmlHttpRequest</url-pattern> </servlet-mapping> <!-- TestRecorder Control Servlet -->
