beehive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ekon...@apache.org
Subject svn commit: r124232 - in incubator/beehive/trunk/netui: src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/pager src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid test/src/junitTests/org/apache/beehive/netui/test/datagrid test/src/junitTests/org/apache/beehive/netui/test/servlet test/webapps/drt test/webapps/drt/coreWeb/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles test/webapps/drt/coreWeb/databinding/datagrid/basic test/webapps/drt/coreWeb/databinding/datagrid/pager/incaption test/webapps/drt/coreWeb/databinding/datagrid/scriptlettagfile test/webapps/drt/coreWeb/databinding/datagrid/site test/webapps/drt/testRecorder/tests
Date Wed, 05 Jan 2005 17:35:27 GMT
Author: ekoneil
Date: Wed Jan  5 09:35:19 2005
New Revision: 124232

URL: http://svn.apache.org/viewcvs?view=rev&rev=124232
Log:
Rewrite the paging infrastructure for the grid.

Page references in the URL are now based on absolute row number.  The PagerService is used to abstract parsing page data from the URL.  The PagerModel is an API for users to programmatically control the row / page / page size.  Update the pager renderers accordingly.  

Other changes:
- add tests for the PagerService / PagerModel
- switch to a .tag file for adding the Portfolio data to the PageContext (instead of an include)

BB: self
DRT: NetUI pass
BVT: NetUI pass



Added:
   incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java   (contents, props changed)
   incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerModelTest.java   (contents, props changed)
   incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerRendererTest.java   (contents, props changed)
   incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerServiceTest.java   (contents, props changed)
   incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles/portfolioXmlBean.tag   (contents, props changed)
Modified:
   incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java
   incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java
   incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/AbstractPagerRenderer.java
   incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/FirstPreviousNextLastPagerRenderer.java
   incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/PreviousNextPagerRenderer.java
   incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java
   incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/pager/PagerService.java
   incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java
   incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java
   incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java
   incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortServiceTest.java
   incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/HttpServletRequestHandler.java
   incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/ServletHandler.java
   incubator/beehive/trunk/netui/test/webapps/drt/build.xml
   incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles/jumpToPage.tag
   incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/basic/index.jsp
   incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/incaption/index.jsp
   incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/scriptlettagfile/index.jsp
   incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/site/template.jsp
   incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerBasic.xml
   incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerCustomSelect.xml
   incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerInCaption.xml
   incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerInFooter.xml
   incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridSmokeTest.xml

Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java?view=diff&rev=124232&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java&r1=124231&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java&r2=124232
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java	(original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java	Wed Jan  5 09:35:19 2005
@@ -24,7 +24,6 @@
 import org.apache.beehive.netui.databinding.datagrid.rendering.table.TableRenderer;
 import org.apache.beehive.netui.databinding.datagrid.rendering.pager.IPagerRenderer;
 import org.apache.beehive.netui.databinding.datagrid.rendering.pager.PreviousNextPagerRenderer;
-import org.apache.beehive.netui.databinding.datagrid.services.pager.PagerService;
 import org.apache.beehive.netui.databinding.datagrid.services.DataGridStateService;
 import org.apache.beehive.netui.databinding.datagrid.util.PagedDataSet;
 import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
@@ -40,17 +39,15 @@
     public static final int FOOTER_RENDER_STATE = 40;
     public static final int END_RENDER_STATE = 50;
 
+    private int _renderState = START_RENDER_STATE;
     private String _name = null;
+    private JspContext _jspContext = null;
+
     private StylePolicy _cssPolicy = null;
-    private PagerService _pagerService = null;
     private IPagerRenderer _pagerRenderer = null;
     private PagerModel _pagerModel = null;
-    private JspContext _jspContext = null;
     private PagedDataSet _dataSet = null;
     private TableRenderer _tableRenderer = null;
-
-    private int _renderState = START_RENDER_STATE;
-
     private DataGridStateService _dataGridStateService = null;
 
     public DataGridModel(JspContext jspContext, String name, PagedDataSet dataSet)
@@ -60,110 +57,64 @@
         _name = name;
         _jspContext = jspContext;
         _dataSet = dataSet;
+        _pagerModel = new PagerModel(this);
     }
 
-    public void beforeRender() {
+    public String getName() {
+        return _name;
+    }
 
-        /* todo: need to move to using absolute page references in the URL */
-        if (_pagerModel != null) {
-            int lastPage = (int) Math.ceil((float) _dataSet.getSize() / (float) _pagerModel.getPageSize());
-            assert lastPage >= 0;
-            int startRenderWindow = (_pagerModel.getCurrentPage() - 1) * _pagerModel.getPageSize();
-            int endRenderWindow =
-                    _pagerModel.getCurrentPage() != lastPage ?
-                    startRenderWindow + _pagerModel.getPageSize() :
-                    _dataSet.getSize();
-
-            assert startRenderWindow <= endRenderWindow;
-
-            // set the calculated render window on the data set
-            _dataSet.createWindow(startRenderWindow, endRenderWindow);
-
-            assert _pagerModel != null;
-            _pagerModel.initialize();
-        }
+    public JspContext getJspContext() {
+        return _jspContext;
     }
 
     public int getRenderState() {
         return _renderState;
     }
 
-    public void setRenderState(int renderState)
-    {
+    public void setRenderState(int renderState) {
         /* todo: need to assert that the correct transitions are being made */
         _renderState = renderState;
     }
 
-    public void renderPager(AbstractRenderAppender appender)
-    {
-        // todo: should this be an assert or should it just return null?
-        if(_pagerRenderer == null)
-            _pagerRenderer = new PreviousNextPagerRenderer(this, _pagerModel);
-
-        appender.append(_pagerRenderer.render());
+    public PagedDataSet getDataSet() {
+        return _dataSet;
     }
 
     public void setDataSet(PagedDataSet dataSet) {
         _dataSet = dataSet;
     }
 
-    public PagedDataSet getDataSet() {
-        return _dataSet;
-    }
-
-    public PagerModel getPagerModel(){
+    public PagerModel getPagerModel() {
         return _pagerModel;
     }
 
     public void setPagerModel(PagerModel pagerModel) {
-        _pagerModel = pagerModel;    
-    }
-
-    public void setPagerService(PagerService pagerService) {
-        _pagerService = pagerService;
-    }
-
-    public PagerService getPagerService() {
-        if(_pagerService == null)
-            _pagerService = PagerService.getInstance(_jspContext, _name);
-
-        return _pagerService;
-    }
-
-    public void setPagerRenderer(IPagerRenderer pagerRenderer) {
-        _pagerRenderer = pagerRenderer;
+        _pagerModel = pagerModel;
     }
 
     public IPagerRenderer getPagerRenderer() {
         return _pagerRenderer;
     }
 
-    public String getName() {
-        return _name;
+    public void setPagerRenderer(IPagerRenderer pagerRenderer) {
+        _pagerRenderer = pagerRenderer;
     }
 
-    public JspContext getJspContext() {
-        return _jspContext;
+    public TableRenderer getTableRenderer() {
+        return _tableRenderer;
     }
 
-    public void setCssPolicy(StylePolicy cssPolicy) {
-        _cssPolicy = cssPolicy;
+    public void setTableRenderer(TableRenderer tableRenderer) {
+        _tableRenderer = tableRenderer;
     }
 
     public StylePolicy getCssPolicy() {
         return _cssPolicy;
     }
 
-    public int getDataSetSize() {
-        return _dataSet.getSize();
-    }
-
-    public TableRenderer getTableRenderer() {
-        return _tableRenderer;
-    }
-
-    public void setTableRenderer(TableRenderer tableRenderer) {
-        _tableRenderer = tableRenderer;
+    public void setCssPolicy(StylePolicy cssPolicy) {
+        _cssPolicy = cssPolicy;
     }
 
     public DataGridStateService getDataGridStateService() {
@@ -177,6 +128,15 @@
         _dataGridStateService = dataGridStateService;
     }
 
+    public void renderPager(AbstractRenderAppender appender)
+    {
+        // todo: should this be an assert or should it just return null?
+        if(_pagerRenderer == null)
+            _pagerRenderer = new PreviousNextPagerRenderer(this);
+
+        appender.append(_pagerRenderer.render());
+    }
+
     /* ===========================================================
      *
      * IDataAccessProvider implementation
@@ -187,7 +147,7 @@
     {
         return _dataSet.getCurrentIndex();
     }
-    
+
     public Object getCurrentItem()
     {
         return _dataSet.getCurrentItem();
@@ -195,7 +155,7 @@
 
     public String getDataSource()
     {
-        return _dataSet.getDataSourceRef();
+        return _dataSet.getDataSource();
     }
 
     public Object nextDataItem()

Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java?view=diff&rev=124232&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java&r1=124231&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java&r2=124232
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java	(original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java	Wed Jan  5 09:35:19 2005
@@ -18,71 +18,70 @@
 package org.apache.beehive.netui.databinding.datagrid.model;
 
 import org.apache.beehive.netui.databinding.datagrid.services.pager.PagerService;
-import org.apache.beehive.netui.databinding.datagrid.util.JspUtil;
-import org.apache.beehive.netui.pageflow.internal.InternalUtils;
-import org.apache.beehive.netui.util.logging.Logger;
-
-import javax.servlet.jsp.PageContext;
-import javax.servlet.http.HttpServletRequest;
 
 /**
- * todo: need to throw IllegalStateExceptions when pager model getters are called before the PagerModel is intiailized
+ *
  */
 public class PagerModel {
-    private static final Logger _logger = Logger.getInstance(PagerModel.class);
-    private static final int DEFAULT_PAGE_SIZE = 10;
 
-    public static final int FIRST_PAGE = 1;
+    public static final int FIRST_PAGE = 0;
+    public static final int DEFAULT_PAGE = FIRST_PAGE;
+
+    public static final int FIRST_ROW = 0;
+    public static final int DEFAULT_ROW = FIRST_ROW;
+
+    public static final int DEFAULT_PAGE_SIZE = 10;
 
-    private DataGridModel _model = null;
-    private PagerService _pagerService = null;
+    private static final String EMPTY_STRING = "";
+    private static final String EQUALS = "=";
+
+    private DataGridModel _dataGridModel;
 
     private String _pageHref = null;
     private String _pageAction = null;
-    private String _action = null;
-    private String _format = null;
+    private String _pagerParamKey = null;
     private Integer _currentPage = null;
-    private Integer _pageSize = null;
+    private Integer _currentPageSize = null;
+    private Integer _currentRow = null;
 
-    private int _dataSetSize = -1;
     private int _lastPage = -1;
     private int _prevPage = -1;
     private int _nextPage = -1;
 
-    public PagerModel(DataGridModel model) {
-        _model = model;
-        _pagerService = model.getPagerService();
-    }
+    public PagerModel(DataGridModel dataGridModel) {
+        _dataGridModel = dataGridModel;
 
-    public void initialize() {
-        calculatePageBoundaries();
-    }
+        PagerService pagerService = PagerService.getInstance(_dataGridModel.getJspContext(), dataGridModel.getName());
+        _currentRow = pagerService.getCurrentRow();
+        if(_currentRow == null)
+            _currentRow = DEFAULT_ROW;
 
-    public String getAction() {
-        return _action;
-    }
+        _currentPage = pagerService.getCurrentPage();
+        if(_currentPage == null)
+            _currentPage = DEFAULT_PAGE;
 
-    public void setAction(String action) {
-        _action = action;
-    }
+        _currentPageSize = pagerService.getPageSize();
+        if(_currentPageSize == null)
+            _currentPageSize = DEFAULT_PAGE_SIZE;
 
-    public int getPageSize() {
-        return _pageSize != null ? _pageSize : DEFAULT_PAGE_SIZE;
+        updatePagerState();
     }
 
-    public void setPageSize(int pageSize) {
-        // todo: error checking to ensure that the page size is within a reasonable range
-        _pageSize = pageSize;
+    /* todo: this should be part of a URL service */
+    public String getPagerParamKey() {
+        return _pagerParamKey != null ? _pagerParamKey : PagerService.DEFAULT_ROW_PARAM_NAME;
+    }
 
-        calculatePageBoundaries();
+    public void setPagerParamKey(String pagerParamKey) {
+        _pagerParamKey = pagerParamKey;
     }
 
-    public String getFormat() {
-        return _format;
+    public String getPageAction() {
+        return _pageAction;
     }
 
-    public void setFormat(String format) {
-        _format = format;
+    public void setPageAction(String pageAction) {
+        _pageAction = pageAction;
     }
 
     public String getPageHref() {
@@ -93,42 +92,41 @@
         _pageHref = pageHref;
     }
 
-    public String getPageAction() {
-        return _pageAction;
+    public int getPageSize() {
+        return _currentPageSize;
     }
 
-    public void setPageAction(String pageAction) {
-        _pageAction = pageAction;
-    }
+    public void setPageSize(int pageSize) {
+        if(pageSize < 1)
+            throw new IllegalArgumentException("Can not set a page size that is less than one.");
 
-    // todo: what needs to happen here with re-writing the URI when it's an HREF?
-    public String getPageUri() {
-        String pageUri = null;
-        if (_pageAction != null) {
-            PageContext pageContext = JspUtil.getPageContext(_model.getJspContext());
-            String qualifiedAction = InternalUtils.qualifyAction(pageContext.getServletContext(), _pageAction);
-            pageUri = InternalUtils.createActionURL((HttpServletRequest) pageContext.getRequest(), qualifiedAction);
-        } else if (_pageHref != null) {
-            pageUri = _pageHref;
-        }
+        _currentPageSize = pageSize;
 
-        return pageUri;
+        updatePagerState();
     }
 
-    public PagerService getPagerService() {
-        return _pagerService;
+    public int getPage() {
+        return _currentPage;
     }
 
-    public int getCurrentPageFromURL() {
-        return _pagerService.getCurrentPage();
+    /* todo: need to check that the new 'current' page is in range given the first/last boundaries */
+    public void setPage(int page) {
+        _currentPage = new Integer(page);
+
+        updatePagerState();
     }
 
-    public int getDataSetSize() {
-        return _dataSetSize;
+    public int getRow() {
+        return _currentRow;
     }
 
-    public int getLastPage() {
-        return _lastPage;
+    public void setRow(int row) {
+        _currentRow = row;
+        updatePagerState();
+    }
+
+    public int getFirstPage() {
+        return FIRST_PAGE;
     }
 
     public int getPreviousPage() {
@@ -139,46 +137,66 @@
         return _nextPage;
     }
 
-    public String[] getPageParamValues() {
-        String[] params = new String[getLastPage()];
+    public int getLastPage() {
+        return _lastPage;
+    }
 
-        for (int i = 1; i <= params.length; i++) {
-            params[i - 1] = _pagerService.buildQueryParamValueForPage(i);
-        }
+    public String getQueryParamForFirstPage() {
+        return buildQueryParam(FIRST_PAGE, true);
+    }
 
-        return params;
+    public String getQueryParamForNextPage() {
+        return buildQueryParam(_nextPage, true);
     }
 
-    public String getPageParamKey() {
-        return PagerService.DEFAULT_PAGE_PARAM_NAME;
+    public String getQueryParamForPreviousPage() {
+        return buildQueryParam(_prevPage, true);
     }
 
+    public String getQueryParamForLastPage() {
+        return buildQueryParam(_lastPage, true);
+    }
 
-    public int getCurrentPage() {
-        if (_currentPage == null)
-            return getCurrentPageFromURL();
-        else
-            return _currentPage.intValue();
+    public String buildQueryParamForPage(int page) {
+        return buildQueryParam(page, true);
     }
 
-    public void setCurrentPage(int currentPage) {
-        // todo: need to recalculate the computed page information given the new current page.
-        // todo: need to check that the new 'current' page is in range given the first/last boundaries
-        _currentPage = new Integer(currentPage);
+    public String buildQueryParamValueForPage(int page) {
+        return buildQueryParam(page, false);
     }
 
-    private void calculatePageBoundaries() {
-        assert _pagerService != null;
+    public String[] getPagerParamValues() {
+        String[] params = new String[getLastPage() + 1];
 
-        _dataSetSize = _model.getDataSetSize();
-        int pageSize = (_pageSize != null ? _pageSize : DEFAULT_PAGE_SIZE);
-        _currentPage = _pagerService.getCurrentPage();
+        for (int i = 0; i < params.length; i++)
+            params[i] = buildQueryParamForPage(i);
 
-        _lastPage = (int) Math.ceil((float) _dataSetSize / (float) pageSize);
+        return params;
+    }
+
+    private String buildQueryParam(int page, boolean includeKey) {
+        if(page > 0) {
+            StringBuilder sb = new StringBuilder(16);
+            if(includeKey) {
+                sb.append(getPagerParamKey());
+                sb.append(EQUALS);
+            }
+            int row = page * _currentPageSize;
+            sb.append(_dataGridModel.getName());
+            sb.append(PagerService.DELIM);
+            sb.append(row);
+            return sb.toString();
+        }
+        else return EMPTY_STRING;
+    }
 
-        if (_currentPage > _lastPage)
-            _currentPage = _lastPage;
+    private void updatePagerState() {
+        int dataSetSize = _dataGridModel.getDataSet().getSize();
 
+        if(getRow() == 0)
+            _currentPage = DEFAULT_PAGE;
+        else _currentPage = (int)Math.floor((double)getRow() / (double)getPageSize());
+        _lastPage = (int)Math.floor((double)dataSetSize / (double)getPageSize());
         _prevPage = _currentPage - 1;
         _nextPage = _currentPage + 1;
     }

Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/AbstractPagerRenderer.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/AbstractPagerRenderer.java?view=diff&rev=124232&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/AbstractPagerRenderer.java&r1=124231&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/AbstractPagerRenderer.java&r2=124232
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/AbstractPagerRenderer.java	(original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/AbstractPagerRenderer.java	Wed Jan  5 09:35:19 2005
@@ -17,10 +17,13 @@
  */
 package org.apache.beehive.netui.databinding.datagrid.rendering.pager;
 
-import org.apache.beehive.netui.util.logging.Logger;
-import org.apache.beehive.netui.databinding.datagrid.services.pager.PagerService;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.PageContext;
+
 import org.apache.beehive.netui.databinding.datagrid.model.PagerModel;
 import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
+import org.apache.beehive.netui.databinding.datagrid.util.JspUtil;
+import org.apache.beehive.netui.pageflow.internal.InternalUtils;
 
 /**
  * todo: lots of i18n here
@@ -31,32 +34,34 @@
     private PagerModel _pagerModel;
     private DataGridModel _gridModel;
 
-    public AbstractPagerRenderer(DataGridModel gridModel, PagerModel pagerModel)
+    public AbstractPagerRenderer(DataGridModel gridModel)
     {
         super();
-        assert pagerModel != null;
         assert gridModel != null;
 
         _gridModel = gridModel;
-        _pagerModel = pagerModel;
+        _pagerModel = _gridModel.getPagerModel();
     }
 
     public PagerModel getPagerModel() {return _pagerModel;}
 
     public DataGridModel getDataGridModel() {return _gridModel;}
 
-    public String getPageUri()
-    {
-        String uri = _pagerModel.getPageUri();
-
-        if(uri == null)
-            throw new IllegalStateException("Can not render a pager with a null page URI.");
-        else return uri;
+    public String buildPageUri() {
+        String pageUri = null;
+        if (_pagerModel.getPageAction() != null) {
+            PageContext pageContext = JspUtil.getPageContext(_gridModel.getJspContext());
+            String qualifiedAction = InternalUtils.qualifyAction(pageContext.getServletContext(), _pagerModel.getPageAction());
+            pageUri = InternalUtils.createActionURL((HttpServletRequest) pageContext.getRequest(), qualifiedAction);
+        } else if (_pagerModel.getPageHref() != null) {
+            pageUri = _pagerModel.getPageHref();
+        }
+        return pageUri;
     }
 
     public String render()
     {
-        if(_pagerModel.getDataSetSize() == 0)
+        if(_gridModel.getDataSet().getSize() == 0)
             return noDataRender();
         else return internalRender();
     }
@@ -68,12 +73,12 @@
 
     protected abstract String internalRender();
 
-    protected static final void buildLiveFirstLink(StringBuilder buf, PagerService pagerService, String pageUri)
+    protected static final void buildLiveFirstLink(StringBuilder buf, PagerModel pagerModel, String pageUri)
     {
         buf.append("<a href=\"");
         buf.append(pageUri);
         buf.append("?");
-        buf.append(pagerService.buildQueryParamForPage(PagerModel.FIRST_PAGE));
+        buf.append(pagerModel.getQueryParamForFirstPage());
         buf.append("\">First</a>");
     }
 
@@ -82,12 +87,12 @@
         buf.append("First");
     }
 
-    protected static final void buildLivePreviousLink(StringBuilder buf, PagerService pagerService, String pageUri)
+    protected static final void buildLivePreviousLink(StringBuilder buf, PagerModel pagerModel, String pageUri)
     {
         buf.append("<a href=\"");
         buf.append(pageUri);
         buf.append("?");
-        buf.append(pagerService.getPrevPageQueryParam());
+        buf.append(pagerModel.getQueryParamForPreviousPage());
         buf.append("\">Previous</a>");
     }
 
@@ -96,12 +101,12 @@
         buf.append("Previous");
     }
 
-    protected static final void buildLiveNextPageLink(StringBuilder buf, PagerService pagerService, String pageUri)
+    protected static final void buildLiveNextPageLink(StringBuilder buf, PagerModel pagerModel, String pageUri)
     {
         buf.append("<a href=\"");
         buf.append(pageUri);
         buf.append("?");
-        buf.append(pagerService.getNextPageQueryParam());
+        buf.append(pagerModel.getQueryParamForNextPage());
         buf.append("\">Next</a>");
     }
 
@@ -110,12 +115,12 @@
         buf.append("Next");
     }
 
-    protected static final void buildLiveLastLink(StringBuilder buf, PagerService pagerService, String pageUri, int lastPage)
+    protected static final void buildLiveLastLink(StringBuilder buf, PagerModel pagerModel, String pageUri)
     {
         buf.append("<a href=\"");
         buf.append(pageUri);
         buf.append("?");
-        buf.append(pagerService.buildQueryParamForPage(lastPage));
+        buf.append(pagerModel.getQueryParamForLastPage());
         buf.append("\">Last</a>");
     }
 

Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/FirstPreviousNextLastPagerRenderer.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/FirstPreviousNextLastPagerRenderer.java?view=diff&rev=124232&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/FirstPreviousNextLastPagerRenderer.java&r1=124231&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/FirstPreviousNextLastPagerRenderer.java&r2=124232
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/FirstPreviousNextLastPagerRenderer.java	(original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/FirstPreviousNextLastPagerRenderer.java	Wed Jan  5 09:35:19 2005
@@ -17,55 +17,51 @@
  */
 package org.apache.beehive.netui.databinding.datagrid.rendering.pager;
 
-import org.apache.beehive.netui.util.logging.Logger;
 import org.apache.beehive.netui.databinding.datagrid.model.PagerModel;
 import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
-import org.apache.beehive.netui.databinding.datagrid.services.pager.PagerService;
 
 public class FirstPreviousNextLastPagerRenderer
     extends AbstractPagerRenderer
 {
-    public FirstPreviousNextLastPagerRenderer(DataGridModel gridModel, PagerModel pagerModel)
+    public FirstPreviousNextLastPagerRenderer(DataGridModel gridModel)
     {
-        super(gridModel, pagerModel);
+        super(gridModel);
     }
 
     protected String internalRender()
     {
         StringBuilder buf = new StringBuilder();
         PagerModel pagerModel = getPagerModel();
-        PagerService pagerService = pagerModel.getPagerService();
-        DataGridModel gridModel = getDataGridModel();
-        int currentPage = pagerModel.getCurrentPage();
+        int currentPage = pagerModel.getPage();
         int lastPage = pagerModel.getLastPage();
 
         buf.append("Page ");
-        buf.append(currentPage);
+        buf.append(currentPage+1);
         buf.append(" of ");
-        buf.append(pagerModel.getLastPage());
+        buf.append(pagerModel.getLastPage()+1);
         buf.append("&nbsp;&nbsp;");
 
-        String pageUri = pagerModel.getPageUri();
-        
+        String pageUri = buildPageUri();
+
         if(currentPage > PagerModel.FIRST_PAGE)
-            buildLiveFirstLink(buf, pagerService, pageUri);
+            buildLiveFirstLink(buf, pagerModel, pageUri);
         else buildDeadFirstLink(buf);
 
         buf.append("&nbsp;/&nbsp;");
-        if(pagerModel.getPreviousPage() > 0)
-            buildLivePreviousLink(buf, pagerService, pageUri);
+        if(pagerModel.getPreviousPage() >= 0)
+            buildLivePreviousLink(buf, pagerModel, pageUri);
         else buildDeadPreviousLink(buf);
 
         buf.append("&nbsp;&nbsp;&nbsp;");
-        if(pagerModel.getNextPage()<= lastPage)
+        if(pagerModel.getNextPage() <= lastPage)
         {
-            buildLiveNextPageLink(buf, pagerService, pageUri);
+            buildLiveNextPageLink(buf, pagerModel, pageUri);
         }
         else buildDeadNextLink(buf);
 
         buf.append("&nbsp;/&nbsp;");
         if(currentPage < lastPage)
-            buildLiveLastLink(buf, pagerService, pageUri, lastPage);
+            buildLiveLastLink(buf, pagerModel, pageUri);
         else buildDeadLastLink(buf);
 
         return buf.toString();

Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/PreviousNextPagerRenderer.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/PreviousNextPagerRenderer.java?view=diff&rev=124232&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/PreviousNextPagerRenderer.java&r1=124231&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/PreviousNextPagerRenderer.java&r2=124232
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/PreviousNextPagerRenderer.java	(original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/PreviousNextPagerRenderer.java	Wed Jan  5 09:35:19 2005
@@ -19,42 +19,38 @@
 
 import org.apache.beehive.netui.databinding.datagrid.model.PagerModel;
 import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
-import org.apache.beehive.netui.databinding.datagrid.services.pager.PagerService;
-import org.apache.beehive.netui.util.logging.Logger;
 
 public class PreviousNextPagerRenderer
     extends AbstractPagerRenderer
 {
-    public PreviousNextPagerRenderer(DataGridModel gridModel, PagerModel pagerModel)
+    public PreviousNextPagerRenderer(DataGridModel gridModel)
     {
-        super(gridModel, pagerModel);
+        super(gridModel);
     }
 
     protected String internalRender()
     {
         StringBuilder buf = new StringBuilder();
         PagerModel pagerModel = getPagerModel();
-        PagerService pagerService = pagerModel.getPagerService();
-        DataGridModel gridModel = getDataGridModel();
-        int currentPage = pagerModel.getCurrentPage();
+        int currentPage = pagerModel.getPage();
         int lastPage = pagerModel.getLastPage();
 
         buf.append("Page ");
-        buf.append(currentPage);
+        buf.append(currentPage+1);
         buf.append(" of ");
-        buf.append(lastPage);
+        buf.append(lastPage+1);
         buf.append("&nbsp;&nbsp;");
 
-        String pageUri = pagerModel.getPageUri();
+        String pageUri = buildPageUri();
 
-        if(pagerModel.getPreviousPage() > 0)
-            buildLivePreviousLink(buf, pagerService, pageUri);
+        if(pagerModel.getPreviousPage() >= 0)
+            buildLivePreviousLink(buf, pagerModel, pageUri);
         else if(lastPage > 1)
             buildDeadPreviousLink(buf);
 
         buf.append("&nbsp;");
         if(pagerModel.getNextPage() <= pagerModel.getLastPage())
-            buildLiveNextPageLink(buf, pagerService, pageUri);
+            buildLiveNextPageLink(buf, pagerModel, pageUri);
         else if(lastPage > 1)
             buildDeadNextLink(buf);
 

Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java?view=diff&rev=124232&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java&r1=124231&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java&r2=124232
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java	(original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java	Wed Jan  5 09:35:19 2005
@@ -25,7 +25,9 @@
 
 import org.apache.beehive.netui.databinding.datagrid.model.sort.ISort;
 import org.apache.beehive.netui.databinding.datagrid.model.sort.DefaultSort;
+import org.apache.beehive.netui.databinding.datagrid.model.PagerModel;
 import org.apache.beehive.netui.databinding.datagrid.services.sort.SortService;
+import org.apache.beehive.netui.databinding.datagrid.services.pager.PagerService;
 
 /**
  * todo: need to support registering URL prefixes that have state service handlers
@@ -50,8 +52,8 @@
     /* todo: need a factory for creating these state services */
     /**
      * Default constructor that builds a DataGridStateService with the default
-     * configuration including support for a {@link org.apache.beehive.netui.databinding.datagrid.services.SortService} and a
-     * {@link org.apache.beehive.netui.databinding.datagrid.services.FilterService}.
+     * configuration including support for a {@link org.apache.beehive.netui.databinding.datagrid.services.sort.SortService} and a
+     * {@link org.apache.beehive.netui.databinding.datagrid.services.filter.FilterService}.
      */
     private DataGridStateService(String namespace) {
         super();

Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/pager/PagerService.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/pager/PagerService.java?view=diff&rev=124232&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/pager/PagerService.java&r1=124231&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/pager/PagerService.java&r2=124232
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/pager/PagerService.java	(original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/pager/PagerService.java	Wed Jan  5 09:35:19 2005
@@ -26,167 +26,89 @@
 /**
  *
  */
-public class PagerService
-{
+public class PagerService {
     private static final Logger LOGGER = Logger.getInstance(PagerService.class);
-    
-    public static String DEFAULT_PAGE_PARAM_NAME = "netui_page";
-    public static String DEFAULT_PAGE_SIZE_PARAM_NAME = "netui_pagesize";
-
-    public static final PagerService getInstance(JspContext jspContext, String namespace)
-    {
-        if(jspContext instanceof PageContext)
-        {
-            ServletRequest request = ((PageContext)jspContext).getRequest();
-            PagerService svc = new PagerService(request, namespace);
-            return svc;
+
+    public static final String DEFAULT_PAGE_PARAM_NAME = "netui_page";
+    public static final String DEFAULT_PAGE_SIZE_PARAM_NAME = "netui_pagesize";
+    public static final String DEFAULT_ROW_PARAM_NAME = "netui_row";
+    public static final String DELIM = "~";
+
+    public static final PagerService getInstance(JspContext jspContext, String namespace) {
+        if (jspContext instanceof PageContext) {
+            ServletRequest servletRequest = ((PageContext) jspContext).getRequest();
+            return getInstance(servletRequest, namespace);
         }
         else throw new IllegalArgumentException("Can not create a PagerService from a JspContext of type " +
                                                 (jspContext != null ? jspContext.getClass().getName() : "null"));
     }
 
-    private static final int DEFAULT_PAGE = 1;
-    private static final int DEFAULT_PAGE_SIZE = 10;
-    private static final String DELIM = "~";
+    public static final PagerService getInstance(ServletRequest servletRequest, String namespace) {
+        return new PagerService(servletRequest, namespace);
+    }
 
-    private String _namespace = null;
     private ServletRequest _request = null;
+
+    private String _namespace = null;
     private Integer _currentPage = null;
     private Integer _pageSize = null;
+    private Integer _currentRow = null;
 
-    public PagerService(ServletRequest request, String namespace)
-    {
+    public PagerService(ServletRequest request, String namespace) {
         _namespace = namespace;
         _request = request;
     }
 
-    public int getCurrentPage()
-    {
-        if(_currentPage == null)
-        {
-            String[] params = _request.getParameterValues(DEFAULT_PAGE_PARAM_NAME);
-
-            if(LOGGER.isDebugEnabled()) LOGGER.debug("found " + (params != null ? ""+params.length : "null") + " page parameters");
-
-            if(params != null)
-            {
-                String prefix = _namespace + DELIM;
-
-                if(LOGGER.isDebugEnabled()) LOGGER.debug("search for prefix: " + prefix);
-
-                for(int i = 0; i < params.length; i++)
-                {
-                    if(params[i].startsWith(prefix))
-                    {
-                        if(LOGGER.isDebugEnabled()) LOGGER.debug("found current page query param: " + params[i]);
-
-                        String pageString = null;
-                        try
-                        {
-                            pageString = params[i].substring(prefix.length());
-
-                            _currentPage = new Integer(pageString);
-                        }
-                        catch(NumberFormatException nfe)
-                        {
-                            if(LOGGER.isErrorEnabled())
-                                LOGGER.error("Invalid current page value \"" + pageString + "\".  Cause: " + nfe, nfe);
-                        }
-                    }
-                }
-            }
-        }
-        
-        int page = _currentPage != null ? _currentPage.intValue() : DEFAULT_PAGE;
-        
-        if(LOGGER.isDebugEnabled())
-            LOGGER.debug("current page: " + page);
+    public Integer getCurrentRow() {
+        _currentRow = parseInt(DEFAULT_ROW_PARAM_NAME);
+        return _currentRow;
+    }
 
-        assert page >= 1;
+    public Integer getCurrentPage() {
+        if(getCurrentRow() != null && getPageSize() != null)
+            _currentPage = (int)Math.ceil((double)getCurrentRow() / (double)getPageSize());
         
-        return page;
+        return _currentPage;
+    }
+
+    public Integer getPageSize() {
+        _pageSize = parseInt(DEFAULT_PAGE_SIZE_PARAM_NAME);
+        return _pageSize;
     }
 
-    public int getPageSize()
-    {
-        if(_pageSize == null)
-        {
-            String[] params = _request.getParameterValues(DEFAULT_PAGE_SIZE_PARAM_NAME);
-            if(params != null)
-            {
-                String prefix = _namespace + DELIM;
-                for(int i = 0; i < params.length; i++)
-                {
-                    if(params[i].startsWith(prefix))
-                    {
-                        String pageSizeString = null;
-                        try
-                        {
-                            pageSizeString = params[i].substring(prefix.length());
-
-                            _pageSize = new Integer(pageSizeString);
-                        }
-                        catch(NumberFormatException nfe)
-                        {
-                            if(LOGGER.isErrorEnabled())
-                                LOGGER.error("Invalid page size value \"" + pageSizeString + "\".  Cause: " + nfe, nfe);
+    private Integer parseInt(String gridParamKey) {
+        assert gridParamKey != null;
 
-                            _pageSize = null;
-                        }
+        String[] params = _request.getParameterValues(gridParamKey);
+        Integer value = null;
+
+        if (LOGGER.isDebugEnabled())
+            LOGGER.debug("found " + (params != null ? "" + params.length : "null") + " parameters for key " + gridParamKey);
+
+        if (params != null) {
+            String prefix = _namespace + DELIM;
+
+            if (LOGGER.isDebugEnabled())
+                LOGGER.debug("search for prefix: " + prefix);
+
+            for (int i = 0; i < params.length; i++) {
+                if (params[i].startsWith(prefix)) {
+                    if (LOGGER.isDebugEnabled())
+                        LOGGER.debug("found page query param: " + params[i]);
+
+                    String intString = null;
+                    try {
+                        intString = params[i].substring(prefix.length());
+
+                        value = new Integer(intString);
+                    } catch (NumberFormatException nfe) {
+                        if (LOGGER.isErrorEnabled())
+                            LOGGER.error("Invalid current page value \"" + intString + "\".  Cause: " + nfe, nfe);
                     }
                 }
             }
         }
-        
-        int size = (_pageSize != null ? _pageSize.intValue() : DEFAULT_PAGE_SIZE);
-        
-        if(LOGGER.isDebugEnabled())
-            LOGGER.debug("page size: " + size);
-        
-        assert size >= 1;
-
-        return size;
-    }
-        
-    public String getCurrentPageParamString()
-    {
-        return buildQueryParamForPage((_currentPage != null ? _currentPage.intValue() : 1));
-    }
-    
-    public String getNextPageQueryParam()
-    {
-        return buildQueryParamForPage((_currentPage != null ? _currentPage.intValue() + 1 : 2));
-    }
-
-    public String getPrevPageQueryParam()
-    {
-        return buildQueryParamForPage((_currentPage != null ? _currentPage.intValue() - 1 : 1));
-    }
-
-    public String buildQueryParamForPage(int page)
-    {
-        StringBuilder sb = new StringBuilder();
-        if(page > 0)
-        {
-            sb.append(DEFAULT_PAGE_PARAM_NAME);
-            sb.append("=");
-            buildPageParamValueString(sb, page);
-        }
-        return sb.toString();
-    }
 
-    public String buildQueryParamValueForPage(int page)
-    {
-        StringBuilder sb = new StringBuilder();
-        if(page > 0)
-            buildPageParamValueString(sb, page);
-        return sb.toString();
-    }
-
-    private void buildPageParamValueString(StringBuilder sb, int page)
-    {
-            sb.append(_namespace);
-            sb.append(DELIM);
-            sb.append(page);
+        return value;
     }
 }

Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java?view=diff&rev=124232&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java&r1=124231&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java&r2=124232
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java	(original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java	Wed Jan  5 09:35:19 2005
@@ -31,11 +31,6 @@
 {
     private Logger LOGGER = Logger.getInstance(PagedDataSet.class);
 
-    private ArrayList _list = null;
-    private Iterator _dataSetIterator = null;
-    private Object _currentItem = null;
-    private String _dataSourceRef = null;
-
     private boolean _advancedToPage = false;
 
     private int _currentIndex = 0;
@@ -43,22 +38,29 @@
     private int _startWindow = -1;
     private int _endWindow = -1;
 
-    public PagedDataSet(String dataSourceRef, Iterator iterator)
+    private ArrayList _list = null;
+    private Iterator _dataSetIterator = null;
+    private Object _currentItem = null;
+    private String _dataSource = null;
+
+    public PagedDataSet(String dataSource, Iterator iterator)
     {
-        _dataSourceRef = dataSourceRef;
+        _dataSource = dataSource;
 
         if(iterator == null)
             _dataSetIterator = Collections.EMPTY_LIST.iterator();
         else _dataSetIterator = iterator;
 
-        if(LOGGER.isDebugEnabled()) LOGGER.debug("iterator type: " + _dataSetIterator.getClass().getName());
+        if(LOGGER.isDebugEnabled())
+            LOGGER.debug("iterator type: " + _dataSetIterator.getClass().getName());
 
         _list = new ArrayList();
         while(_dataSetIterator.hasNext())
         {
             _list.add(_dataSetIterator.next());
             _dataSetSize++;
-            if(LOGGER.isDebugEnabled()) LOGGER.debug("dataSetSize: " + _dataSetSize);
+            if(LOGGER.isDebugEnabled())
+                LOGGER.debug("dataSetSize: " + _dataSetSize);
         }
         _dataSetIterator = _list.iterator();
     }
@@ -71,7 +73,6 @@
 
     public boolean hasNext()
     {
-        // paging support -- advanced to the correct data window if necessary
         if(!_advancedToPage && _startWindow > -1)
         {
             assert _currentIndex == 0;
@@ -85,8 +86,9 @@
         }
         else if(_endWindow > -1 && (_currentIndex >= _endWindow))
         {
-            if(LOGGER.isDebugEnabled()) LOGGER.debug("current index: " + _currentIndex + " _endRenderWindiw: " +
-                                                       _endWindow + " end data set: " + (_currentIndex >= _endWindow));
+            if(LOGGER.isDebugEnabled())
+                LOGGER.debug("current index: " + _currentIndex + " _endRenderWindiw: " +
+                             _endWindow + " end data set: " + (_currentIndex >= _endWindow));
             return false;
         }
 
@@ -112,9 +114,9 @@
         throw new UnsupportedOperationException();
     }
 
-    public String getDataSourceRef()
+    public String getDataSource()
     {
-        return _dataSourceRef;
+        return _dataSource;
     }
 
     public int getSize()

Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java?view=diff&rev=124232&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java&r1=124231&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java&r2=124232
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java	(original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java	Wed Jan  5 09:35:19 2005
@@ -93,19 +93,23 @@
         DataGridModel dgm = DataGridUtil.getDataGridModel(getJspContext());
         assert dgm != null;
 
-        PagerModel pm = new PagerModel(dgm);
+        PagerModel pm = dgm.getPagerModel();
+        assert pm != null;
+
         IPagerRenderer pagerRenderer = null;
 
         if(_pageSize != null)
             pm.setPageSize(_pageSize);
 
-        /* todo: support pluggable pager renderers as opposed to this fixed list */
+        /* todo: support pluggable pager renderers */
         if (_pagerFormat != null) {
             if (_pagerFormat.equals(FIRST_LAST_PREV_NEXT))
-                pagerRenderer = new FirstPreviousNextLastPagerRenderer(dgm, pm);
+                pagerRenderer = new FirstPreviousNextLastPagerRenderer(dgm);
             else if (_pagerFormat.equals(PREV_NEXT))
-                pagerRenderer = new PreviousNextPagerRenderer(dgm, pm);
+                pagerRenderer = new PreviousNextPagerRenderer(dgm);
             else throw new JspException("The pagerFormat \"" + _pagerFormat + "\" is not supported");
+
+            dgm.setPagerRenderer(pagerRenderer);
         }
 
         if (_pageHref != null && _pageAction != null)
@@ -120,10 +124,6 @@
         if (_pageAction != null)
             pm.setPageAction(_pageAction);
 
-        dgm.setPagerModel(pm);
-        dgm.setPagerRenderer(pagerRenderer);
-
         return;
     }
-
 }

Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java?view=diff&rev=124232&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java&r1=124231&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java&r2=124232
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java	(original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java	Wed Jan  5 09:35:19 2005
@@ -146,7 +146,7 @@
             StringBuilder builder = new StringBuilder(2048);
             AbstractRenderAppender appender = new StringBuilderRenderAppender(builder);
 
-            /* todo: optimize -- this doesn't need to happen when the data set is empty */
+            /* todo: perf -- this doesn't need to happen when the data set is empty */
             DataAccessProviderStack.addDataAccessProvider(this, getJspContext());
             DataGridUtil.putDataGridModel(getJspContext(), _gridModel);
 
@@ -155,18 +155,19 @@
                this makes it possible to have tags out of order and to
                have rendering work correctly
 
-               todo: should you be able to turn this off for perf?
+               todo: perf -- should you be able to turn this off for perf?
              */
             StringWriter sw = new StringWriter();
             fragment.invoke(sw);
 
-            if(_gridModel.getPagerModel() == null)
-                _gridModel.setPagerModel(new PagerModel(_gridModel));
+            /* todo: this needs to move into the DataGridModel */
+            PagerModel pm = _gridModel.getPagerModel();
+            _gridModel.getDataSet().createWindow(pm.getRow(), pm.getRow() + pm.getPageSize());
 
             /*
               now that the model objects have been initialized, it's time to start rendering
              */
-            _gridModel.beforeRender();
+            //_gridModel.beforeRender();
             _gridModel.setRenderState(DataGridModel.START_RENDER_STATE);
 
             if (!_disableDefaultPager)

Added: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java?view=auto&rev=124232
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java	Wed Jan  5 09:35:19 2005
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package org.apache.beehive.netui.test.datagrid;
+
+import java.lang.reflect.Proxy;
+import java.util.ArrayList;
+import java.util.Collections;
+import javax.servlet.ServletRequest;
+import javax.servlet.jsp.JspContext;
+import javax.servlet.jsp.PageContext;
+
+import org.apache.beehive.netui.test.servlet.HttpServletRequestHandler;
+import org.apache.beehive.netui.databinding.datagrid.util.PagedDataSet;
+import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
+
+/**
+ *
+ */
+public class DataGridTestUtil {
+
+    public static final String DEFAULT_DATA_GRID_NAME = "testgrid";
+
+    /* do not construct */
+    private DataGridTestUtil() {}
+
+    public static final void initQueryString(ServletRequest request, String queryString) {
+        assert Proxy.getInvocationHandler(request) instanceof HttpServletRequestHandler;
+
+        HttpServletRequestHandler handler = (HttpServletRequestHandler) Proxy.getInvocationHandler(request);
+        handler.setQueryString(queryString);
+    }
+
+    public static final void initQueryString(JspContext jspContext, String queryString) {
+        initQueryString(((PageContext)jspContext).getRequest(), queryString);
+    }
+
+    public static final DataGridModel getDataGridModel(JspContext jspContext) {
+        return buildDataGridModel(jspContext, DEFAULT_DATA_GRID_NAME, getPagedDataSet());
+    }
+
+    public static final DataGridModel getDataGridModel(JspContext jspContext, String name) {
+        return buildDataGridModel(jspContext, name, getEmptyPagedDataSet());
+    }
+
+    public static final DataGridModel getEmptyDataGridModel(JspContext jspContext) {
+        return buildDataGridModel(jspContext, DEFAULT_DATA_GRID_NAME, getEmptyPagedDataSet());
+    }
+
+    public static final PagedDataSet getEmptyPagedDataSet() {
+        return new PagedDataSet("${actionForm.emptyDataSource}", Collections.EMPTY_LIST.iterator());
+    }
+
+    public static final PagedDataSet getPagedDataSet() {
+        ArrayList<String> list = new ArrayList<String>();
+        list.add("abc");
+        list.add("def");
+        list.add("ghi");
+        list.add("jkl");
+        list.add("mno");
+        list.add("pqr");
+        list.add("stu");
+        list.add("vwx");
+        list.add("yz");
+        list.add("123");
+        list.add("456");
+        list.add("789");
+        return new PagedDataSet("${actionForm.dataSource}", list.iterator());
+    }
+
+    private static final DataGridModel buildDataGridModel(JspContext jspContext, String name, PagedDataSet dataSet) {
+        DataGridModel dgm = new DataGridModel(jspContext, name, dataSet);
+        dgm.getPagerModel().setPageAction("fauxPageAction.do");
+
+        return dgm;
+    }
+}

Added: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerModelTest.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerModelTest.java?view=auto&rev=124232
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerModelTest.java	Wed Jan  5 09:35:19 2005
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package org.apache.beehive.netui.test.datagrid;
+
+import javax.servlet.jsp.JspContext;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.apache.beehive.netui.test.servlet.ServletFactory;
+import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
+import org.apache.beehive.netui.databinding.datagrid.model.PagerModel;
+
+/**
+ *
+ */
+public class PagerModelTest
+    extends TestCase {
+
+    private JspContext _jspContext = null;
+
+    public void testEmptyPagerModel() {
+        DataGridModel dgm = DataGridTestUtil.getDataGridModel(_jspContext);
+        PagerModel pm = dgm.getPagerModel();
+
+        int page = pm.getPage();
+        assert page == PagerModel.DEFAULT_PAGE : "Expected default page of " + PagerModel.DEFAULT_PAGE + " received page: " + page;
+
+        int pageSize = pm.getPageSize();
+        assert pageSize == PagerModel.DEFAULT_PAGE_SIZE;
+
+        int row = pm.getRow();
+        assert row == PagerModel.DEFAULT_ROW;
+    }
+
+    public void testPagerModel1() {
+        /*
+          row: 4
+          pagesize: 2
+          current page: 2
+         */
+        String name = "bugs";
+        DataGridTestUtil.initQueryString(_jspContext, "netui_row=bugs~4&netui_pagesize=bugs~2");
+        DataGridModel dgm = DataGridTestUtil.getDataGridModel(_jspContext, name);
+        PagerModel pm = dgm.getPagerModel();
+
+        int row = pm.getRow();
+        assert row == 4 : "Expected row 4; received row: " + row;
+
+        int pageSize = pm.getPageSize();
+        assert pageSize == 2 : "Expected page size 2; received page: " + pageSize;
+
+        int page = pm.getPage();
+        assert page == 2 : "Expected page 2; received page: " + page;
+    }
+
+    public void testPagerModel2() {
+        /*
+          row: 7
+          pagesize: 3
+          current page: 2
+         */
+        String name = "bugs";
+        DataGridTestUtil.initQueryString(_jspContext, "netui_row=bugs~7&netui_pagesize=bugs~3");
+        DataGridModel dgm = DataGridTestUtil.getDataGridModel(_jspContext, name);
+        PagerModel pm = dgm.getPagerModel();
+
+        int row = pm.getRow();
+        assert row == 7 : "Expected row 7; received row: " + row;
+
+        int pageSize = pm.getPageSize();
+        assert pageSize == 3 : "Expected page size 3; received page: " + pageSize;
+
+        int page = pm.getPage();
+        assert page == 2 : "Expected page 2; received page: " + page;
+    }
+
+    public void testPagerModel3() {
+        /*
+          row: 9
+          pagesize: 10, set to 5
+          current page: 1
+          last page: 2
+         */
+        DataGridTestUtil.initQueryString(_jspContext, "netui_row=" + DataGridTestUtil.DEFAULT_DATA_GRID_NAME + "~9");
+        DataGridModel dgm = DataGridTestUtil.getDataGridModel(_jspContext);
+        dgm.getPagerModel().setPageSize(5);
+        PagerModel pm = dgm.getPagerModel();
+
+        System.out.println("data set size: " + dgm.getDataSet().getSize());
+        int row = pm.getRow();
+        assert row == 9 : "Expected row 7; received row: " + row;
+
+        int pageSize = pm.getPageSize();
+        assert pageSize == 5 : "Expected page size 5; received page: " + pageSize;
+
+        int page = pm.getPage();
+        assert page == 1 : "Expected page 1; received page: " + page;
+
+        int lastPage = pm.getLastPage();
+        assert lastPage == 2 : "Expected last page of 2; received page: " + lastPage;
+
+        int previousPage = pm.getPreviousPage();
+        assert previousPage == 0 : "Expected previous page of 0; received page: " + previousPage;
+
+        int nextPage = pm.getNextPage();
+        assert nextPage == 2 : "Expected next page of 2; received page: " + nextPage;
+
+        String[] pagerParamValules = pm.getPagerParamValues();
+        assert pagerParamValules != null : "Expected non-null pagerParamValues";
+        assert pagerParamValules.length == 3 : "Expected 3 pages; received page count: " + pagerParamValules.length;
+        assert pagerParamValules[0].equals("") : "Expected empty pagerParamValue[0]; received: " + pagerParamValules[0];
+    }
+
+    protected void setUp() {
+        _jspContext = ServletFactory.getPageContext();
+    }
+
+    protected void tearDown() {
+        _jspContext = null;
+    }
+
+    public PagerModelTest(String name) {
+        super(name);
+    }
+
+    public static Test suite() {
+        return new TestSuite(PagerModelTest.class);
+    }
+
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(suite());
+    }
+}
\ No newline at end of file

Added: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerRendererTest.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerRendererTest.java?view=auto&rev=124232
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerRendererTest.java	Wed Jan  5 09:35:19 2005
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package org.apache.beehive.netui.test.datagrid;
+
+import javax.servlet.jsp.JspContext;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.apache.beehive.netui.test.servlet.ServletFactory;
+import org.apache.beehive.netui.databinding.datagrid.rendering.pager.FirstPreviousNextLastPagerRenderer;
+import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
+
+/**
+ *
+ */
+public class PagerRendererTest
+    extends TestCase {
+
+    private JspContext _jspContext = null;
+
+    public void testFPNL() {
+
+        DataGridModel dgm = DataGridTestUtil.getDataGridModel(_jspContext);
+        FirstPreviousNextLastPagerRenderer fpnl = new FirstPreviousNextLastPagerRenderer(dgm);
+        String pager = fpnl.render();
+
+        System.out.println(pager);
+    }
+
+    public void testFPNL2() {
+
+        DataGridModel dgm = DataGridTestUtil.getDataGridModel(_jspContext);
+        dgm.getPagerModel().setPageSize(5);
+        FirstPreviousNextLastPagerRenderer fpnl = new FirstPreviousNextLastPagerRenderer(dgm);
+        String pager = fpnl.render();
+
+        System.out.println(pager);
+    }
+
+    public void testFPNL3() {
+
+        DataGridTestUtil.initQueryString(_jspContext, "netui_row=" + DataGridTestUtil.DEFAULT_DATA_GRID_NAME + "~9");
+        DataGridModel dgm = DataGridTestUtil.getDataGridModel(_jspContext);
+        dgm.getPagerModel().setPageSize(5);
+        FirstPreviousNextLastPagerRenderer fpnl = new FirstPreviousNextLastPagerRenderer(dgm);
+        String pager = fpnl.render();
+
+        System.out.println(pager);
+    }
+
+    protected void setUp() {
+        _jspContext = ServletFactory.getPageContext();
+    }
+
+    protected void tearDown() {
+        _jspContext = null;
+    }
+
+    public PagerRendererTest(String name) {
+        super(name);
+    }
+
+    public static Test suite() {
+        return new TestSuite(PagerRendererTest.class);
+    }
+
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(suite());
+    }
+}
\ No newline at end of file

Added: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerServiceTest.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerServiceTest.java?view=auto&rev=124232
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerServiceTest.java	Wed Jan  5 09:35:19 2005
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package org.apache.beehive.netui.test.datagrid;
+
+import javax.servlet.http.HttpServletRequest;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.apache.beehive.netui.test.servlet.ServletFactory;
+import org.apache.beehive.netui.databinding.datagrid.services.pager.PagerService;
+
+/**
+ *
+ */
+public class PagerServiceTest
+    extends TestCase {
+
+    private HttpServletRequest _request = null;
+
+    public void testPagerServiceDefaults() {
+        String namespace = "bugs";
+
+        PagerService pagerService = PagerService.getInstance(_request, namespace);
+        Integer currentRow = pagerService.getCurrentRow();
+        assert currentRow == null;
+
+        Integer currentPage = pagerService.getCurrentPage();
+        assert currentPage == null;
+    }
+
+    public void testPagerService1() {
+        String namespace = "bugs";
+
+        DataGridTestUtil.initQueryString(_request, "netui_row=bugs~21");
+        PagerService pagerService = PagerService.getInstance(_request, namespace);
+
+        int currentRow = pagerService.getCurrentRow();
+        assert currentRow == 21;
+
+        Integer currentPage = pagerService.getCurrentPage();
+        assert currentPage == null : "Expected null currentPage; received currentPage of " + currentPage;
+    }
+
+    public void testPagerService2() {
+        String namespace = "bugs";
+
+        DataGridTestUtil.initQueryString(_request, "netui_row=bugs~21&netui_pagesize=bugs~6");
+        PagerService pagerService = PagerService.getInstance(_request, namespace);
+
+        int currentRow = pagerService.getCurrentRow();
+        assert currentRow == 21;
+
+        int currentPage = pagerService.getCurrentPage();
+        assert currentPage == 4 : "Expected currentPage of 4; received currentPage of " + currentPage;
+    }
+
+    public void testPagerService3() {
+        String namespace = "bugs";
+
+        DataGridTestUtil.initQueryString(_request, "netui_row=bugs~21&netui_pagesize=bugs~6&netui_row=issues~39");
+        PagerService pagerService = PagerService.getInstance(_request, namespace);
+
+        int currentRow = pagerService.getCurrentRow();
+        assert currentRow == 21;
+
+        int currentPage = pagerService.getCurrentPage();
+        assert currentPage == 4 : "Expected currentPage of 4; received currentPage of " + currentPage;
+
+        PagerService pagerService2 = PagerService.getInstance(_request, "issues");
+        assert pagerService2.getCurrentRow() == 39;
+    }
+
+    protected void setUp() {
+        _request = ServletFactory.getServletRequest();
+    }
+
+    protected void tearDown() {
+        _request = null;
+    }
+
+    public PagerServiceTest(String name) {
+        super(name);
+    }
+
+    public static Test suite() {
+        return new TestSuite(PagerServiceTest.class);
+    }
+
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(suite());
+    }
+}
\ No newline at end of file

Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortServiceTest.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortServiceTest.java?view=diff&rev=124232&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortServiceTest.java&r1=124231&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortServiceTest.java&r2=124232
==============================================================================
--- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortServiceTest.java	(original)
+++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortServiceTest.java	Wed Jan  5 09:35:19 2005
@@ -43,18 +43,11 @@
         return _request;
     }
 
-    private void initQueryString(String queryString) {
-        assert Proxy.getInvocationHandler(_request) instanceof HttpServletRequestHandler;
-
-        HttpServletRequestHandler handler = (HttpServletRequestHandler)Proxy.getInvocationHandler(_request);
-        handler.setQueryString(queryString);
-    }
-
     public void testSingleAscendingSort() {
         SortService svc = SortService.getInstance(getRequest(), _namespace);
         assert svc.getSorts() == null;
 
-        initQueryString("netui_sort=" + _namespace + "~CUSTOMERNAME");
+        DataGridTestUtil.initQueryString(_request, "netui_sort=" + _namespace + "~CUSTOMERNAME");
         svc.handleRequest(getRequest());
         ISort[] sorts = svc.getSorts();
 
@@ -68,9 +61,9 @@
         SortService svc = SortService.getInstance(getRequest(), _namespace);
         assert svc.getSorts() == null;
 
-        initQueryString("?netui_sort=" + _namespace + "~CUSTOMERNAME" +
-                        "&netui_sort=" + _namespace + "~-UNITPRICE&" +
-                        "&netui_sort=productGrid~QUANTITY");
+        DataGridTestUtil.initQueryString(_request, "?netui_sort=" + _namespace + "~CUSTOMERNAME" +
+                                                   "&netui_sort=" + _namespace + "~-UNITPRICE&" +
+                                                   "&netui_sort=productGrid~QUANTITY");
         svc.handleRequest(getRequest());
         ISort[] sorts = svc.getSorts();
 
@@ -93,7 +86,7 @@
         SortService svc = SortService.getInstance(getRequest(), _namespace);
         assert svc.getSorts() == null;
 
-        initQueryString("netui_sort=" + _namespace + "~-CUSTOMERNAME");
+        DataGridTestUtil.initQueryString(_request, "netui_sort=" + _namespace + "~-CUSTOMERNAME");
         svc.handleRequest(getRequest());
         ISort[] sorts = svc.getSorts();
 

Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/HttpServletRequestHandler.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/HttpServletRequestHandler.java?view=diff&rev=124232&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/HttpServletRequestHandler.java&r1=124231&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/HttpServletRequestHandler.java&r2=124232
==============================================================================
--- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/HttpServletRequestHandler.java	(original)
+++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/HttpServletRequestHandler.java	Wed Jan  5 09:35:19 2005
@@ -111,7 +111,7 @@
             String key = (String)args[0];
 
             Object o = _params.get(key);
-            
+
             if(o == null)
                 return null;
             else if(o instanceof List)
@@ -169,8 +169,12 @@
                 return Boolean.TRUE;
             else return Boolean.FALSE;
         }
+        else if(method.getName().equals("getContextPath"))
+            return "/netuiFauxTestWeb";
+        else if(method.getName().equals("getServletPath"))
+            return "/netuiFauxTestWeb/fauxServlet";
         else return super.invoke(proxy, method, args);
-    }   
+    }
 
     private String[] listToStrAry(List list)
     {

Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/ServletHandler.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/ServletHandler.java?view=diff&rev=124232&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/ServletHandler.java&r1=124231&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/ServletHandler.java&r2=124232
==============================================================================
--- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/ServletHandler.java	(original)
+++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/ServletHandler.java	Wed Jan  5 09:35:19 2005
@@ -17,17 +17,11 @@
  */
 package org.apache.beehive.netui.test.servlet;
 
-// java imports
 import java.lang.reflect.Method;
 import java.lang.reflect.InvocationHandler;
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-
-// internal imports
-
-// external imports
 
 /**
  *

Modified: incubator/beehive/trunk/netui/test/webapps/drt/build.xml
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/build.xml?view=diff&rev=124232&p1=incubator/beehive/trunk/netui/test/webapps/drt/build.xml&r1=124231&p2=incubator/beehive/trunk/netui/test/webapps/drt/build.xml&r2=124232
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/build.xml	(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/build.xml	Wed Jan  5 09:35:19 2005
@@ -264,11 +264,9 @@
         </waitfor>
     </target>
 
-    <target name="fix.crlf">
-        <echo>Fix CRLF on file(s) ${file}</echo>
-        <fixcrlf srcdir="." eol="unix">
-            <include name="${file}"/>
-        </fixcrlf>
+    <target name="fix.tr.eol">
+        <echo>Fix CRLF on pattern ${pattern}</echo>
+        <fixcrlf srcdir="${basedir}/testRecorder/tests" destDir="foo" eol="lf" includes="${pattern}"/>
     </target>
 
 </project>

Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles/jumpToPage.tag
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles/jumpToPage.tag?view=diff&rev=124232&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles/jumpToPage.tag&r1=124231&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles/jumpToPage.tag&r2=124232
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles/jumpToPage.tag	(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles/jumpToPage.tag	Wed Jan  5 09:35:19 2005
@@ -6,22 +6,22 @@
 <%@ taglib uri="beehive-netui-tags-template.tld" prefix="netui-template"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 
-<c:if test="${dataGrid.pagerModel.dataSetSize > 0}">
+<c:if test="${dataGrid.dataSet.size > 0}">
   <netui:form action="doPage" tagId="pageForm">
     Jump to Page:
 <%-- This is the simple pager that uses its own <select> tag --%>
 <script type="text/javascript">
   function doPagerSubmit(comp)
   {
-    var form = document.forms[getNetuiTagName("pageForm",this)];
+    var form = document.forms[getNetuiTagName("pageForm",comp)];
     form.method="GET";
     form.submit();
   }
   </script>
-  <select name="${dataGrid.pagerModel.pageParamKey}" onchange="doPagerSubmit(this); return true;">
-    <netui-data:repeater dataSource="pageScope.dataGrid.pagerModel.pageParamValues">
+  <select name="${dataGrid.pagerModel.pagerParamKey}" onchange="doPagerSubmit(this); return true;">
+    <netui-data:repeater dataSource="pageScope.dataGrid.pagerModel.pagerParamValues">
     <c:choose>
-      <c:when test="${container.index+1 == dataGrid.pagerModel.currentPage}">
+      <c:when test="${container.index+1 == dataGrid.pagerModel.row}">
         <option value="${container.item}" selected="true">${container.index+1}</option>
       </c:when>
       <c:otherwise>
@@ -33,38 +33,3 @@
     </netui:form>
 </c:if>
 
-<%-- This is the pager that uses the <netui:select> tag --%>
-<%--
-            <script type="text/javascript">
-              function doPagerSubmit(comp)
-              {
-                var form = document.forms[getNetuiTagName("pageForm",this)];
-                for(var e=0; e<form.length; e++)
-                  form.elements[e].disabled = "true";
-
-                var select = form.elements[getNetuiTagName("portfoliopager", comp)];
-                if(select != null && select.selectedIndex > 0)
-                {
-                  var option = select.options[select.selectedIndex];
-                  var value = option.value;
-                  var hidden = document.createElement('input');
-                  hidden.type = "hidden";
-                  hidden.name = "${dataGrid.pagerModel.pageParamKey}";
-                  hidden.value = value;
-                  form.appendChild(hidden);
-                  form.method="GET";
-                  form.submit();
-                }
-              }
-            </script>
-              <netui:select dataSource="actionForm.currentPage"
-                            optionsDataSource="${dataGrid.pagerModel.pageParamValues}"
-                            defaultValue="${dataGrid.pagerModel.currentPage}"
-                            repeater="true"
-                            onChange="doPagerSubmit(this); return true;"
-                            tagId="portfoliopager">
-                <netui:selectOption repeatingType="Option" value="${container.item}">
-                    ${container.index+1}
-                </netui:selectOption>
-              </netui:select>
---%>
\ No newline at end of file

Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles/portfolioXmlBean.tag
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles/portfolioXmlBean.tag?view=auto&rev=124232
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles/portfolioXmlBean.tag	Wed Jan  5 09:35:19 2005
@@ -0,0 +1,12 @@
+<%@ tag body-content="empty" %>
+<%@ tag import="databinding.datagrid.controls.PortfolioControlBean"%>
+<%@ variable name-given="stocks" variable-class="org.openuri.customerPortfolio.Stock[]" scope="AT_END" %>
+<%--
+    Create a portfolio XMLBean bindable with ${pageScope.stocks}
+--%>
+<jsp:useBean id="portfolioBean" class="databinding.datagrid.controls.PortfolioControlBean" scope="page"/>
+<%
+  // for back-compat with the old way of getting the Portfolio
+  PortfolioControlBean pcb = (PortfolioControlBean)getJspContext().getAttribute("portfolioBean");
+  getJspContext().setAttribute("stocks", pcb.getPortfolio().getStocks().getStockArray());
+%>
\ No newline at end of file

Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/basic/index.jsp
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/basic/index.jsp?view=diff&rev=124232&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/basic/index.jsp&r1=124231&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/basic/index.jsp&r2=124232
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/basic/index.jsp	(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/basic/index.jsp	Wed Jan  5 09:35:19 2005
@@ -2,14 +2,15 @@
 <%@ taglib uri="beehive-netui-tags-html.tld" prefix="netui"%>
 <%@ taglib uri="beehive-netui-tags-databinding.tld" prefix="netui-data"%>
 <%@ taglib uri="beehive-netui-tags-template.tld" prefix="netui-template"%>
-<%@ page import="org.apache.beehive.netui.script.common.DataAccessProviderBean"%>
+<%@ taglib prefix="datagrid" tagdir="/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles" %>
 <netui-template:template templatePage="../site/template.jsp">
     <netui-template:setAttribute name="title" value="Basic Data Grid"/>
     <netui-template:section name="body">
     <p>
-<%@ include file="../util/portfolioXmlBean.jsp" %>
+<datagrid:portfolioXmlBean/>
 <br/>
 <netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio">
+    <netui-data:configurePager pageHref="${pageContext.request.contextPath}"/>
     <netui-data:columns>
         <netui-data:literalColumn headerText="Symbol" value="${container.item.symbol}"/>
         <netui-data:literalColumn headerText="Price" value="${container.item.price}"/>

Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/incaption/index.jsp
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/incaption/index.jsp?view=diff&rev=124232&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/incaption/index.jsp&r1=124231&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/incaption/index.jsp&r2=124232
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/incaption/index.jsp	(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/incaption/index.jsp	Wed Jan  5 09:35:19 2005
@@ -2,11 +2,13 @@
 <%@ taglib uri="beehive-netui-tags-html.tld" prefix="netui"%>
 <%@ taglib uri="beehive-netui-tags-databinding.tld" prefix="netui-data"%>
 <%@ taglib uri="beehive-netui-tags-template.tld" prefix="netui-template"%>
+<%@ taglib prefix="datagrid" tagdir="/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles" %>
+
 <netui-template:template templatePage="../../site/template.jsp">
     <netui-template:setAttribute name="title" value="Paged Data Grid"/>
     <netui-template:section name="body">
     <p>
-    <%@ include file="../../util/portfolioXmlBean.jsp" %>
+    <datagrid:portfolioXmlBean/>
     <br/>
     <netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio" disableDefaultPager="true">
         <netui-data:configurePager pageSize="2" pagerFormat="firstPrevNextLast" pageAction="begin.do"/>

Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/scriptlettagfile/index.jsp
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/scriptlettagfile/index.jsp?view=diff&rev=124232&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/scriptlettagfile/index.jsp&r1=124231&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/scriptlettagfile/index.jsp&r2=124232
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/scriptlettagfile/index.jsp	(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/scriptlettagfile/index.jsp	Wed Jan  5 09:35:19 2005
@@ -4,12 +4,13 @@
 <%@ taglib uri="beehive-netui-tags-template.tld" prefix="netui-template"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib prefix="datagrid" tagdir="/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles" %>
+
 <netui-template:template templatePage="../site/template.jsp">
     <netui-template:setAttribute name="title" value="Basic Data Grid"/>
     <netui-template:section name="body">
     <p>
-<%@ include file="../util/portfolioXmlBean.jsp" %>
-<br/>
+    <%@ include file="../util/portfolioXmlBean.jsp" %>
+    <br/>
 <netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio">
     <netui-data:caption>
       <datagrid:scriptletecho text="This custom caption intentionally left blank"/>

Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/site/template.jsp
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/site/template.jsp?view=diff&rev=124232&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/site/template.jsp&r1=124231&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/site/template.jsp&r2=124232
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/site/template.jsp	(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/site/template.jsp	Wed Jan  5 09:35:19 2005
@@ -8,7 +8,7 @@
     <link rel="stylesheet" href="${pageContext.request.contextPath}/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
   <netui:base/>
-  <body>
+  <netui:body>
     <p>
     <b><netui-template:attribute name="title"/></b>
     <table width="100%">
@@ -21,5 +21,5 @@
     <tr><td><netui:anchor href="/netuiDRT/databinding/datagrid/basic/index.jsp">Home</netui:anchor></td></tr>
     </table>
     </p>
-  </body>
+  </netui:body>
 </netui:html>

Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerBasic.xml
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerBasic.xml?view=diff&rev=124232&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerBasic.xml&r1=124231&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerBasic.xml&r2=124232
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerBasic.xml	(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerBasic.xml	Wed Jan  5 09:35:19 2005
@@ -2,7 +2,7 @@
 <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session">
    <ses:sessionName>DataGridPagerBasic</ses:sessionName>
    <ses:tester>ekoneil</ses:tester>
-   <ses:startDate>03 Nov 2004, 02:30:42.973 PM MST</ses:startDate>
+   <ses:startDate>04 Jan 2005, 01:26:04.779 PM MST</ses:startDate>
    <ses:description>ekoneil</ses:description>
    <ses:tests>
       <ses:test>
@@ -18,7 +18,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>D8C6463BE90B058F6CB913D763EBB403</ses:value>
+                  <ses:value>BEEF025480ADDEFBF561927578402D6F</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -44,7 +44,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=D8C6463BE90B058F6CB913D763EBB403; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=BEEF025480ADDEFBF561927578402D6F; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -56,7 +56,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>5d613590:ffff08a735:-7f37</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f85</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -71,7 +71,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 
-<head>
+  <head>
     <title>NetUI Data Grid Samples</title>
     <link rel="stylesheet" href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
@@ -89,7 +89,7 @@
 
 
     <br/>
-    Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_page=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_page=portfolio~3">Last</a>
+    Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_row=portfolio~4">Last</a>
 <table class="datagrid">
 
         
@@ -166,7 +166,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>D8C6463BE90B058F6CB913D763EBB403</ses:value>
+                  <ses:value>BEEF025480ADDEFBF561927578402D6F</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -192,7 +192,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=D8C6463BE90B058F6CB913D763EBB403; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=BEEF025480ADDEFBF561927578402D6F; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -204,7 +204,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>5d613590:ffff08a735:-7f37</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f85</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -219,7 +219,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 
-<head>
+  <head>
     <title>NetUI Data Grid Samples</title>
     <link rel="stylesheet" href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
@@ -237,7 +237,7 @@
 
 
     <br/>
-    Page 2 of 3&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_page=portfolio~1">First</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_page=portfolio~1">Previous</a>&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_page=portfolio~3">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_page=portfolio~3">Last</a>
+    Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_row=portfolio~4">Last</a>
 <table class="datagrid">
 
         
@@ -257,20 +257,20 @@
 </tr></thead>
 
 <tr class="datagrid-even">
-            <td class="datagrid-data-cell"><span>GE</span></td>
+            <td class="datagrid-data-cell"><span>BEAS</span></td>
 
-            <td class="datagrid-data-cell"><span>59.42</span></td>
+            <td class="datagrid-data-cell"><span>14.35</span></td>
 
-            <td class="datagrid-data-cell"><a href="http://www.ge.com?rowid=3&amp;symbol=GE"><span>General Electric</span></a></td>
+            <td class="datagrid-data-cell"><a href="http://www.bea.com?rowid=1&amp;symbol=BEAS"><span>BEA Systems</span></a></td>
 
         
 </tr>
 <tr class="datagrid-odd">
-            <td class="datagrid-data-cell"><span>RHAT</span></td>
+            <td class="datagrid-data-cell"><span>CSCO</span></td>
 
-            <td class="datagrid-data-cell"><span>18.2</span></td>
+            <td class="datagrid-data-cell"><span>19.42</span></td>
 
-            <td class="datagrid-data-cell"><a href="http://www.redhat.com?rowid=4&amp;symbol=RHAT"><span>RedHat Systems</span></a></td>
+            <td class="datagrid-data-cell"><a href="http://www.cisco.com?rowid=2&amp;symbol=CSCO"><span>Cisco Systems</span></a></td>
 
         
 </tr>
@@ -314,7 +314,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>D8C6463BE90B058F6CB913D763EBB403</ses:value>
+                  <ses:value>BEEF025480ADDEFBF561927578402D6F</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -340,7 +340,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=D8C6463BE90B058F6CB913D763EBB403; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=BEEF025480ADDEFBF561927578402D6F; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -352,7 +352,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>5d613590:ffff08a735:-7f37</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f85</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -367,7 +367,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 
-<head>
+  <head>
     <title>NetUI Data Grid Samples</title>
     <link rel="stylesheet" href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
@@ -385,7 +385,7 @@
 
 
     <br/>
-    Page 3 of 3&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_page=portfolio~1">First</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_page=portfolio~2">Previous</a>&nbsp;&nbsp;&nbsp;Next&nbsp;/&nbsp;Last
+    Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_row=portfolio~4">Last</a>
 <table class="datagrid">
 
         
@@ -405,11 +405,20 @@
 </tr></thead>
 
 <tr class="datagrid-even">
-            <td class="datagrid-data-cell"><span>YHOO</span></td>
+            <td class="datagrid-data-cell"><span>BEAS</span></td>
+
+            <td class="datagrid-data-cell"><span>14.35</span></td>
+
+            <td class="datagrid-data-cell"><a href="http://www.bea.com?rowid=1&amp;symbol=BEAS"><span>BEA Systems</span></a></td>
+
+        
+</tr>
+<tr class="datagrid-odd">
+            <td class="datagrid-data-cell"><span>CSCO</span></td>
 
-            <td class="datagrid-data-cell"><span>48.16</span></td>
+            <td class="datagrid-data-cell"><span>19.42</span></td>
 
-            <td class="datagrid-data-cell"><a href="http://www.yahoo.com?rowid=5&amp;symbol=YHOO"><span>Yahoo Inc</span></a></td>
+            <td class="datagrid-data-cell"><a href="http://www.cisco.com?rowid=2&amp;symbol=CSCO"><span>Cisco Systems</span></a></td>
 
         
 </tr>
@@ -453,7 +462,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>D8C6463BE90B058F6CB913D763EBB403</ses:value>
+                  <ses:value>BEEF025480ADDEFBF561927578402D6F</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -479,7 +488,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=D8C6463BE90B058F6CB913D763EBB403; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=BEEF025480ADDEFBF561927578402D6F; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -491,7 +500,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>5d613590:ffff08a735:-7f37</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f85</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -506,7 +515,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 
-<head>
+  <head>
     <title>NetUI Data Grid Samples</title>
     <link rel="stylesheet" href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
@@ -524,7 +533,7 @@
 
 
     <br/>
-    Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_page=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_page=portfolio~3">Last</a>
+    Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_row=portfolio~4">Last</a>
 <table class="datagrid">
 
         
@@ -601,7 +610,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>D8C6463BE90B058F6CB913D763EBB403</ses:value>
+                  <ses:value>BEEF025480ADDEFBF561927578402D6F</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -627,7 +636,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=D8C6463BE90B058F6CB913D763EBB403; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=BEEF025480ADDEFBF561927578402D6F; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -639,7 +648,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>5d613590:ffff08a735:-7f37</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f85</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -654,7 +663,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 
-<head>
+  <head>
     <title>NetUI Data Grid Samples</title>
     <link rel="stylesheet" href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
@@ -672,7 +681,7 @@
 
 
     <br/>
-    Page 3 of 3&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_page=portfolio~1">First</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_page=portfolio~2">Previous</a>&nbsp;&nbsp;&nbsp;Next&nbsp;/&nbsp;Last
+    Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_row=portfolio~4">Last</a>
 <table class="datagrid">
 
         
@@ -692,11 +701,20 @@
 </tr></thead>
 
 <tr class="datagrid-even">
-            <td class="datagrid-data-cell"><span>YHOO</span></td>
+            <td class="datagrid-data-cell"><span>BEAS</span></td>
+
+            <td class="datagrid-data-cell"><span>14.35</span></td>
+
+            <td class="datagrid-data-cell"><a href="http://www.bea.com?rowid=1&amp;symbol=BEAS"><span>BEA Systems</span></a></td>
+
+        
+</tr>
+<tr class="datagrid-odd">
+            <td class="datagrid-data-cell"><span>CSCO</span></td>
 
-            <td class="datagrid-data-cell"><span>48.16</span></td>
+            <td class="datagrid-data-cell"><span>19.42</span></td>
 
-            <td class="datagrid-data-cell"><a href="http://www.yahoo.com?rowid=5&amp;symbol=YHOO"><span>Yahoo Inc</span></a></td>
+            <td class="datagrid-data-cell"><a href="http://www.cisco.com?rowid=2&amp;symbol=CSCO"><span>Cisco Systems</span></a></td>
 
         
 </tr>
@@ -740,7 +758,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>D8C6463BE90B058F6CB913D763EBB403</ses:value>
+                  <ses:value>BEEF025480ADDEFBF561927578402D6F</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -766,7 +784,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=D8C6463BE90B058F6CB913D763EBB403; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=BEEF025480ADDEFBF561927578402D6F; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -778,7 +796,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>5d613590:ffff08a735:-7f37</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f85</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -793,7 +811,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 
-<head>
+  <head>
     <title>NetUI Data Grid Samples</title>
     <link rel="stylesheet" href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
@@ -811,7 +829,7 @@
 
 
     <br/>
-    Page 2 of 3&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_page=portfolio~1">First</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_page=portfolio~1">Previous</a>&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_page=portfolio~3">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_page=portfolio~3">Last</a>
+    Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_row=portfolio~4">Last</a>
 <table class="datagrid">
 
         
@@ -831,20 +849,20 @@
 </tr></thead>
 
 <tr class="datagrid-even">
-            <td class="datagrid-data-cell"><span>GE</span></td>
+            <td class="datagrid-data-cell"><span>BEAS</span></td>
 
-            <td class="datagrid-data-cell"><span>59.42</span></td>
+            <td class="datagrid-data-cell"><span>14.35</span></td>
 
-            <td class="datagrid-data-cell"><a href="http://www.ge.com?rowid=3&amp;symbol=GE"><span>General Electric</span></a></td>
+            <td class="datagrid-data-cell"><a href="http://www.bea.com?rowid=1&amp;symbol=BEAS"><span>BEA Systems</span></a></td>
 
         
 </tr>
 <tr class="datagrid-odd">
-            <td class="datagrid-data-cell"><span>RHAT</span></td>
+            <td class="datagrid-data-cell"><span>CSCO</span></td>
 
-            <td class="datagrid-data-cell"><span>18.2</span></td>
+            <td class="datagrid-data-cell"><span>19.42</span></td>
 
-            <td class="datagrid-data-cell"><a href="http://www.redhat.com?rowid=4&amp;symbol=RHAT"><span>RedHat Systems</span></a></td>
+            <td class="datagrid-data-cell"><a href="http://www.cisco.com?rowid=2&amp;symbol=CSCO"><span>Cisco Systems</span></a></td>
 
         
 </tr>
@@ -888,7 +906,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>D8C6463BE90B058F6CB913D763EBB403</ses:value>
+                  <ses:value>BEEF025480ADDEFBF561927578402D6F</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -914,7 +932,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=D8C6463BE90B058F6CB913D763EBB403; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=BEEF025480ADDEFBF561927578402D6F; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -926,7 +944,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>5d613590:ffff08a735:-7f37</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f85</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -941,7 +959,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 
-<head>
+  <head>
     <title>NetUI Data Grid Samples</title>
     <link rel="stylesheet" href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
@@ -959,7 +977,7 @@
 
 
     <br/>
-    Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_page=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_page=portfolio~3">Last</a>
+    Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_row=portfolio~4">Last</a>
 <table class="datagrid">
 
         
@@ -1036,7 +1054,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>D8C6463BE90B058F6CB913D763EBB403</ses:value>
+                  <ses:value>BEEF025480ADDEFBF561927578402D6F</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -1062,7 +1080,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=D8C6463BE90B058F6CB913D763EBB403; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=BEEF025480ADDEFBF561927578402D6F; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -1074,7 +1092,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>5d613590:ffff08a735:-7f37</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f85</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -1089,7 +1107,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 
-<head>
+  <head>
     <title>NetUI Data Grid Samples</title>
     <link rel="stylesheet" href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
@@ -1107,7 +1125,7 @@
 
 
     <br/>
-    Page 3 of 3&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_page=portfolio~1">First</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_page=portfolio~2">Previous</a>&nbsp;&nbsp;&nbsp;Next&nbsp;/&nbsp;Last
+    Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_row=portfolio~4">Last</a>
 <table class="datagrid">
 
         
@@ -1127,11 +1145,20 @@
 </tr></thead>
 
 <tr class="datagrid-even">
-            <td class="datagrid-data-cell"><span>YHOO</span></td>
+            <td class="datagrid-data-cell"><span>BEAS</span></td>
+
+            <td class="datagrid-data-cell"><span>14.35</span></td>
+
+            <td class="datagrid-data-cell"><a href="http://www.bea.com?rowid=1&amp;symbol=BEAS"><span>BEA Systems</span></a></td>
+
+        
+</tr>
+<tr class="datagrid-odd">
+            <td class="datagrid-data-cell"><span>CSCO</span></td>
 
-            <td class="datagrid-data-cell"><span>48.16</span></td>
+            <td class="datagrid-data-cell"><span>19.42</span></td>
 
-            <td class="datagrid-data-cell"><a href="http://www.yahoo.com?rowid=5&amp;symbol=YHOO"><span>Yahoo Inc</span></a></td>
+            <td class="datagrid-data-cell"><a href="http://www.cisco.com?rowid=2&amp;symbol=CSCO"><span>Cisco Systems</span></a></td>
 
         
 </tr>
@@ -1175,7 +1202,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>D8C6463BE90B058F6CB913D763EBB403</ses:value>
+                  <ses:value>BEEF025480ADDEFBF561927578402D6F</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -1201,7 +1228,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=D8C6463BE90B058F6CB913D763EBB403; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=BEEF025480ADDEFBF561927578402D6F; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -1213,7 +1240,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>5d613590:ffff08a735:-7f37</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f85</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -1228,7 +1255,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 
-<head>
+  <head>
     <title>NetUI Data Grid Samples</title>
     <link rel="stylesheet" href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
@@ -1246,7 +1273,7 @@
 
 
     <br/>
-    Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_page=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_page=portfolio~3">Last</a>
+    Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/basic/begin.do?netui_row=portfolio~4">Last</a>
 <table class="datagrid">
 
         
@@ -1306,7 +1333,7 @@
          </ses:testResults>
       </ses:test>
    </ses:tests>
-   <ses:endDate>03 Nov 2004, 02:30:44.258 PM MST</ses:endDate>
+   <ses:endDate>04 Jan 2005, 01:26:05.029 PM MST</ses:endDate>
    <ses:sessionStatus>fail</ses:sessionStatus>
    <ses:testCount>9</ses:testCount>
    <ses:passedCount>0</ses:passedCount>

Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerCustomSelect.xml
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerCustomSelect.xml?view=diff&rev=124232&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerCustomSelect.xml&r1=124231&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerCustomSelect.xml&r2=124232
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerCustomSelect.xml	(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerCustomSelect.xml	Wed Jan  5 09:35:19 2005
@@ -2,7 +2,7 @@
 <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session">
    <ses:sessionName>DataGridPagerCustomSelect</ses:sessionName>
    <ses:tester>ekoneil</ses:tester>
-   <ses:startDate>04 Jan 2005, 01:50:51.618 PM MST</ses:startDate>
+   <ses:startDate>04 Jan 2005, 07:43:52.154 PM MST</ses:startDate>
    <ses:description>ekoneil</ses:description>
    <ses:tests>
       <ses:test>
@@ -15,12 +15,7 @@
             <ses:uri>/coreWeb/databinding/datagrid/pager/customselect/Controller.jpf</ses:uri>
             <ses:method>GET</ses:method>
             <ses:parameters/>
-            <ses:cookies>
-               <ses:cookie>
-                  <ses:name>JSESSIONID</ses:name>
-                  <ses:value>F1667D734C9048A87E1C5DDAA3627DCA</ses:value>
-               </ses:cookie>
-            </ses:cookies>
+            <ses:cookies/>
             <ses:headers>
                <ses:header>
                   <ses:name>accept</ses:name>
@@ -43,10 +38,6 @@
                   <ses:value>keep-alive</ses:value>
                </ses:header>
                <ses:header>
-                  <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=F1667D734C9048A87E1C5DDAA3627DCA; $Path=/coreWeb</ses:value>
-               </ses:header>
-               <ses:header>
                   <ses:name>host</ses:name>
                   <ses:value>localhost:8080</ses:value>
                </ses:header>
@@ -56,7 +47,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>-7b82c690:1013f7b13bb:-7dac</ses:value>
+                  <ses:value>-2c36a3b3:10140c1b662:-8000</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -133,7 +124,7 @@
         
         
           <td colspan="2" align="left">
-            Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_page=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_page=portfolio~3">Last</a>
+            Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_row=portfolio~4">Last</a>
           </td>
           <td colspan="1" align="right">
             
@@ -151,31 +142,31 @@
 <script type="text/javascript">
   function doPagerSubmit(comp)
   {
-    var form = document.forms[getNetuiTagName("pageForm",this)];
+    var form = document.forms[getNetuiTagName("pageForm",comp)];
     form.method="GET";
     form.submit();
   }
   </script>
-  <select name="netui_page" onchange="doPagerSubmit(this); return true;">
+  <select name="netui_row" onchange="doPagerSubmit(this); return true;">
     
     
       
-        <option value="portfolio~1" selected="true">1</option>
       
+        <option value="">1</option>
       
     
     
     
       
       
-        <option value="portfolio~2">2</option>
+        <option value="netui_row=portfolio~2">2</option>
       
     
     
     
       
       
-        <option value="portfolio~3">3</option>
+        <option value="netui_row=portfolio~4">3</option>
       
     
     
@@ -220,7 +211,6 @@
 
 
 
-
           </td>
         
     
@@ -264,7 +254,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>F1667D734C9048A87E1C5DDAA3627DCA</ses:value>
+                  <ses:value>996A2E545C2380A527CEF3E60E79E6F6</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -290,7 +280,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=F1667D734C9048A87E1C5DDAA3627DCA; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=996A2E545C2380A527CEF3E60E79E6F6; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -302,7 +292,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>-7b82c690:1013f7b13bb:-7dac</ses:value>
+                  <ses:value>-2c36a3b3:10140c1b662:-8000</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -355,20 +345,20 @@
 </tr></thead>
 
 <tr class="datagrid-even">
-            <td class="datagrid-data-cell"><span>GE</span></td>
+            <td class="datagrid-data-cell"><span>BEAS</span></td>
 
-            <td class="datagrid-data-cell"><span>59.42</span></td>
+            <td class="datagrid-data-cell"><span>14.35</span></td>
 
-            <td class="datagrid-data-cell"><a href="http://www.ge.com?rowid=3&amp;symbol=GE"><span>General Electric</span></a></td>
+            <td class="datagrid-data-cell"><a href="http://www.bea.com?rowid=1&amp;symbol=BEAS"><span>BEA Systems</span></a></td>
 
         
 </tr>
 <tr class="datagrid-odd">
-            <td class="datagrid-data-cell"><span>RHAT</span></td>
+            <td class="datagrid-data-cell"><span>CSCO</span></td>
 
-            <td class="datagrid-data-cell"><span>18.2</span></td>
+            <td class="datagrid-data-cell"><span>19.42</span></td>
 
-            <td class="datagrid-data-cell"><a href="http://www.redhat.com?rowid=4&amp;symbol=RHAT"><span>RedHat Systems</span></a></td>
+            <td class="datagrid-data-cell"><a href="http://www.cisco.com?rowid=2&amp;symbol=CSCO"><span>Cisco Systems</span></a></td>
 
         
 </tr>
@@ -379,7 +369,7 @@
         
         
           <td colspan="2" align="left">
-            Page 2 of 3&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_page=portfolio~1">First</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_page=portfolio~1">Previous</a>&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_page=portfolio~3">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_page=portfolio~3">Last</a>
+            Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_row=portfolio~4">Last</a>
           </td>
           <td colspan="1" align="right">
             
@@ -397,31 +387,31 @@
 <script type="text/javascript">
   function doPagerSubmit(comp)
   {
-    var form = document.forms[getNetuiTagName("pageForm",this)];
+    var form = document.forms[getNetuiTagName("pageForm",comp)];
     form.method="GET";
     form.submit();
   }
   </script>
-  <select name="netui_page" onchange="doPagerSubmit(this); return true;">
+  <select name="netui_row" onchange="doPagerSubmit(this); return true;">
     
     
       
       
-        <option value="portfolio~1">1</option>
+        <option value="">1</option>
       
     
     
     
       
-        <option value="portfolio~2" selected="true">2</option>
       
+        <option value="netui_row=portfolio~2">2</option>
       
     
     
     
       
       
-        <option value="portfolio~3">3</option>
+        <option value="netui_row=portfolio~4">3</option>
       
     
     
@@ -466,7 +456,6 @@
 
 
 
-
           </td>
         
     
@@ -510,7 +499,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>F1667D734C9048A87E1C5DDAA3627DCA</ses:value>
+                  <ses:value>996A2E545C2380A527CEF3E60E79E6F6</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -536,7 +525,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=F1667D734C9048A87E1C5DDAA3627DCA; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=996A2E545C2380A527CEF3E60E79E6F6; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -548,7 +537,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>-7b82c690:1013f7b13bb:-7dac</ses:value>
+                  <ses:value>-2c36a3b3:10140c1b662:-8000</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -601,11 +590,20 @@
 </tr></thead>
 
 <tr class="datagrid-even">
-            <td class="datagrid-data-cell"><span>YHOO</span></td>
+            <td class="datagrid-data-cell"><span>BEAS</span></td>
+
+            <td class="datagrid-data-cell"><span>14.35</span></td>
+
+            <td class="datagrid-data-cell"><a href="http://www.bea.com?rowid=1&amp;symbol=BEAS"><span>BEA Systems</span></a></td>
+
+        
+</tr>
+<tr class="datagrid-odd">
+            <td class="datagrid-data-cell"><span>CSCO</span></td>
 
-            <td class="datagrid-data-cell"><span>48.16</span></td>
+            <td class="datagrid-data-cell"><span>19.42</span></td>
 
-            <td class="datagrid-data-cell"><a href="http://www.yahoo.com?rowid=5&amp;symbol=YHOO"><span>Yahoo Inc</span></a></td>
+            <td class="datagrid-data-cell"><a href="http://www.cisco.com?rowid=2&amp;symbol=CSCO"><span>Cisco Systems</span></a></td>
 
         
 </tr>
@@ -616,7 +614,7 @@
         
         
           <td colspan="2" align="left">
-            Page 3 of 3&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_page=portfolio~1">First</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_page=portfolio~2">Previous</a>&nbsp;&nbsp;&nbsp;Next&nbsp;/&nbsp;Last
+            Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_row=portfolio~4">Last</a>
           </td>
           <td colspan="1" align="right">
             
@@ -634,31 +632,31 @@
 <script type="text/javascript">
   function doPagerSubmit(comp)
   {
-    var form = document.forms[getNetuiTagName("pageForm",this)];
+    var form = document.forms[getNetuiTagName("pageForm",comp)];
     form.method="GET";
     form.submit();
   }
   </script>
-  <select name="netui_page" onchange="doPagerSubmit(this); return true;">
+  <select name="netui_row" onchange="doPagerSubmit(this); return true;">
     
     
       
       
-        <option value="portfolio~1">1</option>
+        <option value="">1</option>
       
     
     
     
       
       
-        <option value="portfolio~2">2</option>
+        <option value="netui_row=portfolio~2">2</option>
       
     
     
     
       
-        <option value="portfolio~3" selected="true">3</option>
       
+        <option value="netui_row=portfolio~4">3</option>
       
     
     
@@ -703,7 +701,6 @@
 
 
 
-
           </td>
         
     
@@ -747,7 +744,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>F1667D734C9048A87E1C5DDAA3627DCA</ses:value>
+                  <ses:value>996A2E545C2380A527CEF3E60E79E6F6</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -773,7 +770,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=F1667D734C9048A87E1C5DDAA3627DCA; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=996A2E545C2380A527CEF3E60E79E6F6; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -785,7 +782,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>-7b82c690:1013f7b13bb:-7dac</ses:value>
+                  <ses:value>-2c36a3b3:10140c1b662:-8000</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -862,7 +859,7 @@
         
         
           <td colspan="2" align="left">
-            Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_page=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_page=portfolio~3">Last</a>
+            Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_row=portfolio~4">Last</a>
           </td>
           <td colspan="1" align="right">
             
@@ -880,31 +877,31 @@
 <script type="text/javascript">
   function doPagerSubmit(comp)
   {
-    var form = document.forms[getNetuiTagName("pageForm",this)];
+    var form = document.forms[getNetuiTagName("pageForm",comp)];
     form.method="GET";
     form.submit();
   }
   </script>
-  <select name="netui_page" onchange="doPagerSubmit(this); return true;">
+  <select name="netui_row" onchange="doPagerSubmit(this); return true;">
     
     
       
-        <option value="portfolio~1" selected="true">1</option>
       
+        <option value="">1</option>
       
     
     
     
       
       
-        <option value="portfolio~2">2</option>
+        <option value="netui_row=portfolio~2">2</option>
       
     
     
     
       
       
-        <option value="portfolio~3">3</option>
+        <option value="netui_row=portfolio~4">3</option>
       
     
     
@@ -949,7 +946,6 @@
 
 
 
-
           </td>
         
     
@@ -993,7 +989,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>F1667D734C9048A87E1C5DDAA3627DCA</ses:value>
+                  <ses:value>996A2E545C2380A527CEF3E60E79E6F6</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -1019,7 +1015,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=F1667D734C9048A87E1C5DDAA3627DCA; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=996A2E545C2380A527CEF3E60E79E6F6; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -1031,7 +1027,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>-7b82c690:1013f7b13bb:-7dac</ses:value>
+                  <ses:value>-2c36a3b3:10140c1b662:-8000</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -1084,20 +1080,20 @@
 </tr></thead>
 
 <tr class="datagrid-even">
-            <td class="datagrid-data-cell"><span>GE</span></td>
+            <td class="datagrid-data-cell"><span>BEAS</span></td>
 
-            <td class="datagrid-data-cell"><span>59.42</span></td>
+            <td class="datagrid-data-cell"><span>14.35</span></td>
 
-            <td class="datagrid-data-cell"><a href="http://www.ge.com?rowid=3&amp;symbol=GE"><span>General Electric</span></a></td>
+            <td class="datagrid-data-cell"><a href="http://www.bea.com?rowid=1&amp;symbol=BEAS"><span>BEA Systems</span></a></td>
 
         
 </tr>
 <tr class="datagrid-odd">
-            <td class="datagrid-data-cell"><span>RHAT</span></td>
+            <td class="datagrid-data-cell"><span>CSCO</span></td>
 
-            <td class="datagrid-data-cell"><span>18.2</span></td>
+            <td class="datagrid-data-cell"><span>19.42</span></td>
 
-            <td class="datagrid-data-cell"><a href="http://www.redhat.com?rowid=4&amp;symbol=RHAT"><span>RedHat Systems</span></a></td>
+            <td class="datagrid-data-cell"><a href="http://www.cisco.com?rowid=2&amp;symbol=CSCO"><span>Cisco Systems</span></a></td>
 
         
 </tr>
@@ -1108,7 +1104,7 @@
         
         
           <td colspan="2" align="left">
-            Page 2 of 3&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_page=portfolio~1">First</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_page=portfolio~1">Previous</a>&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_page=portfolio~3">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_page=portfolio~3">Last</a>
+            Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_row=portfolio~4">Last</a>
           </td>
           <td colspan="1" align="right">
             
@@ -1126,31 +1122,31 @@
 <script type="text/javascript">
   function doPagerSubmit(comp)
   {
-    var form = document.forms[getNetuiTagName("pageForm",this)];
+    var form = document.forms[getNetuiTagName("pageForm",comp)];
     form.method="GET";
     form.submit();
   }
   </script>
-  <select name="netui_page" onchange="doPagerSubmit(this); return true;">
+  <select name="netui_row" onchange="doPagerSubmit(this); return true;">
     
     
       
       
-        <option value="portfolio~1">1</option>
+        <option value="">1</option>
       
     
     
     
       
-        <option value="portfolio~2" selected="true">2</option>
       
+        <option value="netui_row=portfolio~2">2</option>
       
     
     
     
       
       
-        <option value="portfolio~3">3</option>
+        <option value="netui_row=portfolio~4">3</option>
       
     
     
@@ -1195,7 +1191,6 @@
 
 
 
-
           </td>
         
     
@@ -1239,7 +1234,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>F1667D734C9048A87E1C5DDAA3627DCA</ses:value>
+                  <ses:value>996A2E545C2380A527CEF3E60E79E6F6</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -1265,7 +1260,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=F1667D734C9048A87E1C5DDAA3627DCA; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=996A2E545C2380A527CEF3E60E79E6F6; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -1277,7 +1272,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>-7b82c690:1013f7b13bb:-7dac</ses:value>
+                  <ses:value>-2c36a3b3:10140c1b662:-8000</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -1330,11 +1325,20 @@
 </tr></thead>
 
 <tr class="datagrid-even">
-            <td class="datagrid-data-cell"><span>YHOO</span></td>
+            <td class="datagrid-data-cell"><span>BEAS</span></td>
 
-            <td class="datagrid-data-cell"><span>48.16</span></td>
+            <td class="datagrid-data-cell"><span>14.35</span></td>
+
+            <td class="datagrid-data-cell"><a href="http://www.bea.com?rowid=1&amp;symbol=BEAS"><span>BEA Systems</span></a></td>
+
+        
+</tr>
+<tr class="datagrid-odd">
+            <td class="datagrid-data-cell"><span>CSCO</span></td>
+
+            <td class="datagrid-data-cell"><span>19.42</span></td>
 
-            <td class="datagrid-data-cell"><a href="http://www.yahoo.com?rowid=5&amp;symbol=YHOO"><span>Yahoo Inc</span></a></td>
+            <td class="datagrid-data-cell"><a href="http://www.cisco.com?rowid=2&amp;symbol=CSCO"><span>Cisco Systems</span></a></td>
 
         
 </tr>
@@ -1345,7 +1349,7 @@
         
         
           <td colspan="2" align="left">
-            Page 3 of 3&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_page=portfolio~1">First</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_page=portfolio~2">Previous</a>&nbsp;&nbsp;&nbsp;Next&nbsp;/&nbsp;Last
+            Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/customselect/begin.do?netui_row=portfolio~4">Last</a>
           </td>
           <td colspan="1" align="right">
             
@@ -1363,31 +1367,31 @@
 <script type="text/javascript">
   function doPagerSubmit(comp)
   {
-    var form = document.forms[getNetuiTagName("pageForm",this)];
+    var form = document.forms[getNetuiTagName("pageForm",comp)];
     form.method="GET";
     form.submit();
   }
   </script>
-  <select name="netui_page" onchange="doPagerSubmit(this); return true;">
+  <select name="netui_row" onchange="doPagerSubmit(this); return true;">
     
     
       
       
-        <option value="portfolio~1">1</option>
+        <option value="">1</option>
       
     
     
     
       
       
-        <option value="portfolio~2">2</option>
+        <option value="netui_row=portfolio~2">2</option>
       
     
     
     
       
-        <option value="portfolio~3" selected="true">3</option>
       
+        <option value="netui_row=portfolio~4">3</option>
       
     
     
@@ -1432,7 +1436,6 @@
 
 
 
-
           </td>
         
     
@@ -1459,7 +1462,7 @@
          </ses:testResults>
       </ses:test>
    </ses:tests>
-   <ses:endDate>04 Jan 2005, 01:50:53.691 PM MST</ses:endDate>
+   <ses:endDate>04 Jan 2005, 07:43:53.626 PM MST</ses:endDate>
    <ses:sessionStatus>fail</ses:sessionStatus>
    <ses:testCount>6</ses:testCount>
    <ses:passedCount>0</ses:passedCount>

Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerInCaption.xml
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerInCaption.xml?view=diff&rev=124232&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerInCaption.xml&r1=124231&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerInCaption.xml&r2=124232
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerInCaption.xml	(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerInCaption.xml	Wed Jan  5 09:35:19 2005
@@ -2,7 +2,7 @@
 <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session">
    <ses:sessionName>DataGridPagerInCaption</ses:sessionName>
    <ses:tester>ekoneil</ses:tester>
-   <ses:startDate>03 Nov 2004, 02:30:48.105 PM MST</ses:startDate>
+   <ses:startDate>04 Jan 2005, 01:26:05.620 PM MST</ses:startDate>
    <ses:description>ekoneil</ses:description>
    <ses:tests>
       <ses:test>
@@ -18,7 +18,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>D8C6463BE90B058F6CB913D763EBB403</ses:value>
+                  <ses:value>BEEF025480ADDEFBF561927578402D6F</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -44,7 +44,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=D8C6463BE90B058F6CB913D763EBB403; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=BEEF025480ADDEFBF561927578402D6F; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -56,7 +56,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>5d613590:ffff08a735:-7f24</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f72</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -71,7 +71,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 
-<head>
+  <head>
     <title>NetUI Data Grid Samples</title>
     <link rel="stylesheet" href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
@@ -85,7 +85,9 @@
         
     <p>
     
- 
+
+
+
 
 
     <br/>
@@ -95,7 +97,7 @@
 <caption>
         
         
-          <table><tr><td>Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_page=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_page=portfolio~3">Last</a></td></tr></table>
+          <table><tr><td>Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_row=portfolio~4">Last</a></td></tr></table>
         
         
     </caption>
@@ -175,7 +177,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>D8C6463BE90B058F6CB913D763EBB403</ses:value>
+                  <ses:value>BEEF025480ADDEFBF561927578402D6F</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -201,7 +203,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=D8C6463BE90B058F6CB913D763EBB403; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=BEEF025480ADDEFBF561927578402D6F; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -213,7 +215,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>5d613590:ffff08a735:-7f24</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f72</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -228,7 +230,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 
-<head>
+  <head>
     <title>NetUI Data Grid Samples</title>
     <link rel="stylesheet" href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
@@ -242,7 +244,9 @@
         
     <p>
     
- 
+
+
+
 
 
     <br/>
@@ -252,7 +256,7 @@
 <caption>
         
         
-          <table><tr><td>Page 2 of 3&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_page=portfolio~1">First</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_page=portfolio~1">Previous</a>&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_page=portfolio~3">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_page=portfolio~3">Last</a></td></tr></table>
+          <table><tr><td>Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_row=portfolio~4">Last</a></td></tr></table>
         
         
     </caption>
@@ -275,20 +279,20 @@
 </tr></thead>
 
 <tr class="datagrid-even">
-            <td class="datagrid-data-cell"><span>GE</span></td>
+            <td class="datagrid-data-cell"><span>BEAS</span></td>
 
-            <td class="datagrid-data-cell"><span>59.42</span></td>
+            <td class="datagrid-data-cell"><span>14.35</span></td>
 
-            <td class="datagrid-data-cell"><a href="http://www.ge.com?rowid=3&amp;symbol=GE"><span>General Electric</span></a></td>
+            <td class="datagrid-data-cell"><a href="http://www.bea.com?rowid=1&amp;symbol=BEAS"><span>BEA Systems</span></a></td>
 
         
 </tr>
 <tr class="datagrid-odd">
-            <td class="datagrid-data-cell"><span>RHAT</span></td>
+            <td class="datagrid-data-cell"><span>CSCO</span></td>
 
-            <td class="datagrid-data-cell"><span>18.2</span></td>
+            <td class="datagrid-data-cell"><span>19.42</span></td>
 
-            <td class="datagrid-data-cell"><a href="http://www.redhat.com?rowid=4&amp;symbol=RHAT"><span>RedHat Systems</span></a></td>
+            <td class="datagrid-data-cell"><a href="http://www.cisco.com?rowid=2&amp;symbol=CSCO"><span>Cisco Systems</span></a></td>
 
         
 </tr>
@@ -332,7 +336,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>D8C6463BE90B058F6CB913D763EBB403</ses:value>
+                  <ses:value>BEEF025480ADDEFBF561927578402D6F</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -358,7 +362,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=D8C6463BE90B058F6CB913D763EBB403; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=BEEF025480ADDEFBF561927578402D6F; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -370,7 +374,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>5d613590:ffff08a735:-7f24</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f72</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -385,7 +389,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 
-<head>
+  <head>
     <title>NetUI Data Grid Samples</title>
     <link rel="stylesheet" href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
@@ -399,7 +403,9 @@
         
     <p>
     
- 
+
+
+
 
 
     <br/>
@@ -409,7 +415,7 @@
 <caption>
         
         
-          <table><tr><td>Page 3 of 3&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_page=portfolio~1">First</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_page=portfolio~2">Previous</a>&nbsp;&nbsp;&nbsp;Next&nbsp;/&nbsp;Last</td></tr></table>
+          <table><tr><td>Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_row=portfolio~4">Last</a></td></tr></table>
         
         
     </caption>
@@ -432,11 +438,20 @@
 </tr></thead>
 
 <tr class="datagrid-even">
-            <td class="datagrid-data-cell"><span>YHOO</span></td>
+            <td class="datagrid-data-cell"><span>BEAS</span></td>
+
+            <td class="datagrid-data-cell"><span>14.35</span></td>
+
+            <td class="datagrid-data-cell"><a href="http://www.bea.com?rowid=1&amp;symbol=BEAS"><span>BEA Systems</span></a></td>
+
+        
+</tr>
+<tr class="datagrid-odd">
+            <td class="datagrid-data-cell"><span>CSCO</span></td>
 
-            <td class="datagrid-data-cell"><span>48.16</span></td>
+            <td class="datagrid-data-cell"><span>19.42</span></td>
 
-            <td class="datagrid-data-cell"><a href="http://www.yahoo.com?rowid=5&amp;symbol=YHOO"><span>Yahoo Inc</span></a></td>
+            <td class="datagrid-data-cell"><a href="http://www.cisco.com?rowid=2&amp;symbol=CSCO"><span>Cisco Systems</span></a></td>
 
         
 </tr>
@@ -480,7 +495,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>D8C6463BE90B058F6CB913D763EBB403</ses:value>
+                  <ses:value>BEEF025480ADDEFBF561927578402D6F</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -506,7 +521,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=D8C6463BE90B058F6CB913D763EBB403; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=BEEF025480ADDEFBF561927578402D6F; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -518,7 +533,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>5d613590:ffff08a735:-7f24</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f72</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -533,7 +548,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 
-<head>
+  <head>
     <title>NetUI Data Grid Samples</title>
     <link rel="stylesheet" href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
@@ -547,7 +562,9 @@
         
     <p>
     
- 
+
+
+
 
 
     <br/>
@@ -557,7 +574,7 @@
 <caption>
         
         
-          <table><tr><td>Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_page=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_page=portfolio~3">Last</a></td></tr></table>
+          <table><tr><td>Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_row=portfolio~4">Last</a></td></tr></table>
         
         
     </caption>
@@ -637,7 +654,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>D8C6463BE90B058F6CB913D763EBB403</ses:value>
+                  <ses:value>BEEF025480ADDEFBF561927578402D6F</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -663,7 +680,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=D8C6463BE90B058F6CB913D763EBB403; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=BEEF025480ADDEFBF561927578402D6F; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -675,7 +692,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>5d613590:ffff08a735:-7f24</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f72</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -690,7 +707,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 
-<head>
+  <head>
     <title>NetUI Data Grid Samples</title>
     <link rel="stylesheet" href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
@@ -704,7 +721,9 @@
         
     <p>
     
- 
+
+
+
 
 
     <br/>
@@ -714,7 +733,7 @@
 <caption>
         
         
-          <table><tr><td>Page 3 of 3&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_page=portfolio~1">First</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_page=portfolio~2">Previous</a>&nbsp;&nbsp;&nbsp;Next&nbsp;/&nbsp;Last</td></tr></table>
+          <table><tr><td>Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_row=portfolio~4">Last</a></td></tr></table>
         
         
     </caption>
@@ -737,11 +756,20 @@
 </tr></thead>
 
 <tr class="datagrid-even">
-            <td class="datagrid-data-cell"><span>YHOO</span></td>
+            <td class="datagrid-data-cell"><span>BEAS</span></td>
 
-            <td class="datagrid-data-cell"><span>48.16</span></td>
+            <td class="datagrid-data-cell"><span>14.35</span></td>
 
-            <td class="datagrid-data-cell"><a href="http://www.yahoo.com?rowid=5&amp;symbol=YHOO"><span>Yahoo Inc</span></a></td>
+            <td class="datagrid-data-cell"><a href="http://www.bea.com?rowid=1&amp;symbol=BEAS"><span>BEA Systems</span></a></td>
+
+        
+</tr>
+<tr class="datagrid-odd">
+            <td class="datagrid-data-cell"><span>CSCO</span></td>
+
+            <td class="datagrid-data-cell"><span>19.42</span></td>
+
+            <td class="datagrid-data-cell"><a href="http://www.cisco.com?rowid=2&amp;symbol=CSCO"><span>Cisco Systems</span></a></td>
 
         
 </tr>
@@ -785,7 +813,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>D8C6463BE90B058F6CB913D763EBB403</ses:value>
+                  <ses:value>BEEF025480ADDEFBF561927578402D6F</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -811,7 +839,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=D8C6463BE90B058F6CB913D763EBB403; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=BEEF025480ADDEFBF561927578402D6F; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -823,7 +851,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>5d613590:ffff08a735:-7f24</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f72</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -838,7 +866,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 
-<head>
+  <head>
     <title>NetUI Data Grid Samples</title>
     <link rel="stylesheet" href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
@@ -852,7 +880,9 @@
         
     <p>
     
- 
+
+
+
 
 
     <br/>
@@ -862,7 +892,7 @@
 <caption>
         
         
-          <table><tr><td>Page 2 of 3&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_page=portfolio~1">First</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_page=portfolio~1">Previous</a>&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_page=portfolio~3">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_page=portfolio~3">Last</a></td></tr></table>
+          <table><tr><td>Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_row=portfolio~4">Last</a></td></tr></table>
         
         
     </caption>
@@ -885,20 +915,20 @@
 </tr></thead>
 
 <tr class="datagrid-even">
-            <td class="datagrid-data-cell"><span>GE</span></td>
+            <td class="datagrid-data-cell"><span>BEAS</span></td>
 
-            <td class="datagrid-data-cell"><span>59.42</span></td>
+            <td class="datagrid-data-cell"><span>14.35</span></td>
 
-            <td class="datagrid-data-cell"><a href="http://www.ge.com?rowid=3&amp;symbol=GE"><span>General Electric</span></a></td>
+            <td class="datagrid-data-cell"><a href="http://www.bea.com?rowid=1&amp;symbol=BEAS"><span>BEA Systems</span></a></td>
 
         
 </tr>
 <tr class="datagrid-odd">
-            <td class="datagrid-data-cell"><span>RHAT</span></td>
+            <td class="datagrid-data-cell"><span>CSCO</span></td>
 
-            <td class="datagrid-data-cell"><span>18.2</span></td>
+            <td class="datagrid-data-cell"><span>19.42</span></td>
 
-            <td class="datagrid-data-cell"><a href="http://www.redhat.com?rowid=4&amp;symbol=RHAT"><span>RedHat Systems</span></a></td>
+            <td class="datagrid-data-cell"><a href="http://www.cisco.com?rowid=2&amp;symbol=CSCO"><span>Cisco Systems</span></a></td>
 
         
 </tr>
@@ -942,7 +972,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>D8C6463BE90B058F6CB913D763EBB403</ses:value>
+                  <ses:value>BEEF025480ADDEFBF561927578402D6F</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -968,7 +998,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=D8C6463BE90B058F6CB913D763EBB403; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=BEEF025480ADDEFBF561927578402D6F; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -980,7 +1010,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>5d613590:ffff08a735:-7f24</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f72</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -995,7 +1025,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 
-<head>
+  <head>
     <title>NetUI Data Grid Samples</title>
     <link rel="stylesheet" href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
@@ -1009,7 +1039,9 @@
         
     <p>
     
- 
+
+
+
 
 
     <br/>
@@ -1019,7 +1051,7 @@
 <caption>
         
         
-          <table><tr><td>Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_page=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_page=portfolio~3">Last</a></td></tr></table>
+          <table><tr><td>Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_row=portfolio~4">Last</a></td></tr></table>
         
         
     </caption>
@@ -1099,7 +1131,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>D8C6463BE90B058F6CB913D763EBB403</ses:value>
+                  <ses:value>BEEF025480ADDEFBF561927578402D6F</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -1125,7 +1157,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=D8C6463BE90B058F6CB913D763EBB403; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=BEEF025480ADDEFBF561927578402D6F; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -1137,7 +1169,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>5d613590:ffff08a735:-7f24</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f72</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -1152,7 +1184,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 
-<head>
+  <head>
     <title>NetUI Data Grid Samples</title>
     <link rel="stylesheet" href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
@@ -1166,7 +1198,9 @@
         
     <p>
     
- 
+
+
+
 
 
     <br/>
@@ -1176,7 +1210,7 @@
 <caption>
         
         
-          <table><tr><td>Page 3 of 3&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_page=portfolio~1">First</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_page=portfolio~2">Previous</a>&nbsp;&nbsp;&nbsp;Next&nbsp;/&nbsp;Last</td></tr></table>
+          <table><tr><td>Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_row=portfolio~4">Last</a></td></tr></table>
         
         
     </caption>
@@ -1199,11 +1233,20 @@
 </tr></thead>
 
 <tr class="datagrid-even">
-            <td class="datagrid-data-cell"><span>YHOO</span></td>
+            <td class="datagrid-data-cell"><span>BEAS</span></td>
+
+            <td class="datagrid-data-cell"><span>14.35</span></td>
+
+            <td class="datagrid-data-cell"><a href="http://www.bea.com?rowid=1&amp;symbol=BEAS"><span>BEA Systems</span></a></td>
+
+        
+</tr>
+<tr class="datagrid-odd">
+            <td class="datagrid-data-cell"><span>CSCO</span></td>
 
-            <td class="datagrid-data-cell"><span>48.16</span></td>
+            <td class="datagrid-data-cell"><span>19.42</span></td>
 
-            <td class="datagrid-data-cell"><a href="http://www.yahoo.com?rowid=5&amp;symbol=YHOO"><span>Yahoo Inc</span></a></td>
+            <td class="datagrid-data-cell"><a href="http://www.cisco.com?rowid=2&amp;symbol=CSCO"><span>Cisco Systems</span></a></td>
 
         
 </tr>
@@ -1247,7 +1290,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>D8C6463BE90B058F6CB913D763EBB403</ses:value>
+                  <ses:value>BEEF025480ADDEFBF561927578402D6F</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -1273,7 +1316,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=D8C6463BE90B058F6CB913D763EBB403; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=BEEF025480ADDEFBF561927578402D6F; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -1285,7 +1328,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>5d613590:ffff08a735:-7f24</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f72</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -1300,7 +1343,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 
-<head>
+  <head>
     <title>NetUI Data Grid Samples</title>
     <link rel="stylesheet" href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
@@ -1314,7 +1357,9 @@
         
     <p>
     
- 
+
+
+
 
 
     <br/>
@@ -1324,7 +1369,7 @@
 <caption>
         
         
-          <table><tr><td>Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_page=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_page=portfolio~3">Last</a></td></tr></table>
+          <table><tr><td>Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/incaption/begin.do?netui_row=portfolio~4">Last</a></td></tr></table>
         
         
     </caption>
@@ -1387,7 +1432,7 @@
          </ses:testResults>
       </ses:test>
    </ses:tests>
-   <ses:endDate>03 Nov 2004, 02:30:49.511 PM MST</ses:endDate>
+   <ses:endDate>04 Jan 2005, 01:26:05.990 PM MST</ses:endDate>
    <ses:sessionStatus>fail</ses:sessionStatus>
    <ses:testCount>9</ses:testCount>
    <ses:passedCount>0</ses:passedCount>

Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerInFooter.xml
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerInFooter.xml?view=diff&rev=124232&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerInFooter.xml&r1=124231&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerInFooter.xml&r2=124232
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerInFooter.xml	(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerInFooter.xml	Wed Jan  5 09:35:19 2005
@@ -2,7 +2,7 @@
 <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session">
    <ses:sessionName>DataGridPagerInFooter</ses:sessionName>
    <ses:tester>ekoneil</ses:tester>
-   <ses:startDate>03 Nov 2004, 02:30:49.631 PM MST</ses:startDate>
+   <ses:startDate>04 Jan 2005, 01:26:06.191 PM MST</ses:startDate>
    <ses:description>ekoneil</ses:description>
    <ses:tests>
       <ses:test>
@@ -18,7 +18,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>D8C6463BE90B058F6CB913D763EBB403</ses:value>
+                  <ses:value>BEEF025480ADDEFBF561927578402D6F</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -44,7 +44,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=D8C6463BE90B058F6CB913D763EBB403; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=BEEF025480ADDEFBF561927578402D6F; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -56,7 +56,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>5d613590:ffff08a735:-7f1a</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f68</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -71,7 +71,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 
-<head>
+  <head>
     <title>NetUI Data Grid Samples</title>
     <link rel="stylesheet" href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
@@ -133,7 +133,7 @@
         
         
           <td colspan="3" align="right">
-            Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_page=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_page=portfolio~3">Last</a>
+            Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_row=portfolio~4">Last</a>
           </td>
         
     
@@ -177,7 +177,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>D8C6463BE90B058F6CB913D763EBB403</ses:value>
+                  <ses:value>BEEF025480ADDEFBF561927578402D6F</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -203,7 +203,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=D8C6463BE90B058F6CB913D763EBB403; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=BEEF025480ADDEFBF561927578402D6F; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -215,7 +215,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>5d613590:ffff08a735:-7f1a</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f68</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -230,7 +230,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 
-<head>
+  <head>
     <title>NetUI Data Grid Samples</title>
     <link rel="stylesheet" href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
@@ -268,20 +268,20 @@
 </tr></thead>
 
 <tr class="datagrid-even">
-            <td class="datagrid-data-cell"><span>GE</span></td>
+            <td class="datagrid-data-cell"><span>BEAS</span></td>
 
-            <td class="datagrid-data-cell"><span>59.42</span></td>
+            <td class="datagrid-data-cell"><span>14.35</span></td>
 
-            <td class="datagrid-data-cell"><a href="http://www.ge.com?rowid=3&amp;symbol=GE"><span>General Electric</span></a></td>
+            <td class="datagrid-data-cell"><a href="http://www.bea.com?rowid=1&amp;symbol=BEAS"><span>BEA Systems</span></a></td>
 
         
 </tr>
 <tr class="datagrid-odd">
-            <td class="datagrid-data-cell"><span>RHAT</span></td>
+            <td class="datagrid-data-cell"><span>CSCO</span></td>
 
-            <td class="datagrid-data-cell"><span>18.2</span></td>
+            <td class="datagrid-data-cell"><span>19.42</span></td>
 
-            <td class="datagrid-data-cell"><a href="http://www.redhat.com?rowid=4&amp;symbol=RHAT"><span>RedHat Systems</span></a></td>
+            <td class="datagrid-data-cell"><a href="http://www.cisco.com?rowid=2&amp;symbol=CSCO"><span>Cisco Systems</span></a></td>
 
         
 </tr>
@@ -292,7 +292,7 @@
         
         
           <td colspan="3" align="right">
-            Page 2 of 3&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_page=portfolio~1">First</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_page=portfolio~1">Previous</a>&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_page=portfolio~3">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_page=portfolio~3">Last</a>
+            Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_row=portfolio~4">Last</a>
           </td>
         
     
@@ -336,7 +336,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>D8C6463BE90B058F6CB913D763EBB403</ses:value>
+                  <ses:value>BEEF025480ADDEFBF561927578402D6F</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -362,7 +362,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=D8C6463BE90B058F6CB913D763EBB403; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=BEEF025480ADDEFBF561927578402D6F; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -374,7 +374,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>5d613590:ffff08a735:-7f1a</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f68</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -389,7 +389,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 
-<head>
+  <head>
     <title>NetUI Data Grid Samples</title>
     <link rel="stylesheet" href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
@@ -427,11 +427,20 @@
 </tr></thead>
 
 <tr class="datagrid-even">
-            <td class="datagrid-data-cell"><span>YHOO</span></td>
+            <td class="datagrid-data-cell"><span>BEAS</span></td>
+
+            <td class="datagrid-data-cell"><span>14.35</span></td>
+
+            <td class="datagrid-data-cell"><a href="http://www.bea.com?rowid=1&amp;symbol=BEAS"><span>BEA Systems</span></a></td>
+
+        
+</tr>
+<tr class="datagrid-odd">
+            <td class="datagrid-data-cell"><span>CSCO</span></td>
 
-            <td class="datagrid-data-cell"><span>48.16</span></td>
+            <td class="datagrid-data-cell"><span>19.42</span></td>
 
-            <td class="datagrid-data-cell"><a href="http://www.yahoo.com?rowid=5&amp;symbol=YHOO"><span>Yahoo Inc</span></a></td>
+            <td class="datagrid-data-cell"><a href="http://www.cisco.com?rowid=2&amp;symbol=CSCO"><span>Cisco Systems</span></a></td>
 
         
 </tr>
@@ -442,7 +451,7 @@
         
         
           <td colspan="3" align="right">
-            Page 3 of 3&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_page=portfolio~1">First</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_page=portfolio~2">Previous</a>&nbsp;&nbsp;&nbsp;Next&nbsp;/&nbsp;Last
+            Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_row=portfolio~4">Last</a>
           </td>
         
     
@@ -486,7 +495,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>D8C6463BE90B058F6CB913D763EBB403</ses:value>
+                  <ses:value>BEEF025480ADDEFBF561927578402D6F</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -512,7 +521,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=D8C6463BE90B058F6CB913D763EBB403; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=BEEF025480ADDEFBF561927578402D6F; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -524,7 +533,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>5d613590:ffff08a735:-7f1a</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f68</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -539,7 +548,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 
-<head>
+  <head>
     <title>NetUI Data Grid Samples</title>
     <link rel="stylesheet" href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
@@ -601,7 +610,7 @@
         
         
           <td colspan="3" align="right">
-            Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_page=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_page=portfolio~3">Last</a>
+            Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_row=portfolio~4">Last</a>
           </td>
         
     
@@ -645,7 +654,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>D8C6463BE90B058F6CB913D763EBB403</ses:value>
+                  <ses:value>BEEF025480ADDEFBF561927578402D6F</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -671,7 +680,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=D8C6463BE90B058F6CB913D763EBB403; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=BEEF025480ADDEFBF561927578402D6F; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -683,7 +692,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>5d613590:ffff08a735:-7f1a</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f68</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -698,7 +707,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 
-<head>
+  <head>
     <title>NetUI Data Grid Samples</title>
     <link rel="stylesheet" href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
@@ -736,11 +745,20 @@
 </tr></thead>
 
 <tr class="datagrid-even">
-            <td class="datagrid-data-cell"><span>YHOO</span></td>
+            <td class="datagrid-data-cell"><span>BEAS</span></td>
+
+            <td class="datagrid-data-cell"><span>14.35</span></td>
+
+            <td class="datagrid-data-cell"><a href="http://www.bea.com?rowid=1&amp;symbol=BEAS"><span>BEA Systems</span></a></td>
+
+        
+</tr>
+<tr class="datagrid-odd">
+            <td class="datagrid-data-cell"><span>CSCO</span></td>
 
-            <td class="datagrid-data-cell"><span>48.16</span></td>
+            <td class="datagrid-data-cell"><span>19.42</span></td>
 
-            <td class="datagrid-data-cell"><a href="http://www.yahoo.com?rowid=5&amp;symbol=YHOO"><span>Yahoo Inc</span></a></td>
+            <td class="datagrid-data-cell"><a href="http://www.cisco.com?rowid=2&amp;symbol=CSCO"><span>Cisco Systems</span></a></td>
 
         
 </tr>
@@ -751,7 +769,7 @@
         
         
           <td colspan="3" align="right">
-            Page 3 of 3&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_page=portfolio~1">First</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_page=portfolio~2">Previous</a>&nbsp;&nbsp;&nbsp;Next&nbsp;/&nbsp;Last
+            Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_row=portfolio~4">Last</a>
           </td>
         
     
@@ -795,7 +813,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>D8C6463BE90B058F6CB913D763EBB403</ses:value>
+                  <ses:value>BEEF025480ADDEFBF561927578402D6F</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -821,7 +839,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=D8C6463BE90B058F6CB913D763EBB403; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=BEEF025480ADDEFBF561927578402D6F; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -833,7 +851,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>5d613590:ffff08a735:-7f1a</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f68</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -848,7 +866,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 
-<head>
+  <head>
     <title>NetUI Data Grid Samples</title>
     <link rel="stylesheet" href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
@@ -886,20 +904,20 @@
 </tr></thead>
 
 <tr class="datagrid-even">
-            <td class="datagrid-data-cell"><span>GE</span></td>
+            <td class="datagrid-data-cell"><span>BEAS</span></td>
 
-            <td class="datagrid-data-cell"><span>59.42</span></td>
+            <td class="datagrid-data-cell"><span>14.35</span></td>
 
-            <td class="datagrid-data-cell"><a href="http://www.ge.com?rowid=3&amp;symbol=GE"><span>General Electric</span></a></td>
+            <td class="datagrid-data-cell"><a href="http://www.bea.com?rowid=1&amp;symbol=BEAS"><span>BEA Systems</span></a></td>
 
         
 </tr>
 <tr class="datagrid-odd">
-            <td class="datagrid-data-cell"><span>RHAT</span></td>
+            <td class="datagrid-data-cell"><span>CSCO</span></td>
 
-            <td class="datagrid-data-cell"><span>18.2</span></td>
+            <td class="datagrid-data-cell"><span>19.42</span></td>
 
-            <td class="datagrid-data-cell"><a href="http://www.redhat.com?rowid=4&amp;symbol=RHAT"><span>RedHat Systems</span></a></td>
+            <td class="datagrid-data-cell"><a href="http://www.cisco.com?rowid=2&amp;symbol=CSCO"><span>Cisco Systems</span></a></td>
 
         
 </tr>
@@ -910,7 +928,7 @@
         
         
           <td colspan="3" align="right">
-            Page 2 of 3&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_page=portfolio~1">First</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_page=portfolio~1">Previous</a>&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_page=portfolio~3">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_page=portfolio~3">Last</a>
+            Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_row=portfolio~4">Last</a>
           </td>
         
     
@@ -954,7 +972,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>D8C6463BE90B058F6CB913D763EBB403</ses:value>
+                  <ses:value>BEEF025480ADDEFBF561927578402D6F</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -980,7 +998,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=D8C6463BE90B058F6CB913D763EBB403; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=BEEF025480ADDEFBF561927578402D6F; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -992,7 +1010,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>5d613590:ffff08a735:-7f1a</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f68</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -1007,7 +1025,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 
-<head>
+  <head>
     <title>NetUI Data Grid Samples</title>
     <link rel="stylesheet" href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
@@ -1069,7 +1087,7 @@
         
         
           <td colspan="3" align="right">
-            Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_page=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_page=portfolio~3">Last</a>
+            Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_row=portfolio~4">Last</a>
           </td>
         
     
@@ -1113,7 +1131,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>D8C6463BE90B058F6CB913D763EBB403</ses:value>
+                  <ses:value>BEEF025480ADDEFBF561927578402D6F</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -1139,7 +1157,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=D8C6463BE90B058F6CB913D763EBB403; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=BEEF025480ADDEFBF561927578402D6F; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -1151,7 +1169,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>5d613590:ffff08a735:-7f1a</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f68</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -1166,7 +1184,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 
-<head>
+  <head>
     <title>NetUI Data Grid Samples</title>
     <link rel="stylesheet" href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
@@ -1204,11 +1222,20 @@
 </tr></thead>
 
 <tr class="datagrid-even">
-            <td class="datagrid-data-cell"><span>YHOO</span></td>
+            <td class="datagrid-data-cell"><span>BEAS</span></td>
+
+            <td class="datagrid-data-cell"><span>14.35</span></td>
+
+            <td class="datagrid-data-cell"><a href="http://www.bea.com?rowid=1&amp;symbol=BEAS"><span>BEA Systems</span></a></td>
+
+        
+</tr>
+<tr class="datagrid-odd">
+            <td class="datagrid-data-cell"><span>CSCO</span></td>
 
-            <td class="datagrid-data-cell"><span>48.16</span></td>
+            <td class="datagrid-data-cell"><span>19.42</span></td>
 
-            <td class="datagrid-data-cell"><a href="http://www.yahoo.com?rowid=5&amp;symbol=YHOO"><span>Yahoo Inc</span></a></td>
+            <td class="datagrid-data-cell"><a href="http://www.cisco.com?rowid=2&amp;symbol=CSCO"><span>Cisco Systems</span></a></td>
 
         
 </tr>
@@ -1219,7 +1246,7 @@
         
         
           <td colspan="3" align="right">
-            Page 3 of 3&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_page=portfolio~1">First</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_page=portfolio~2">Previous</a>&nbsp;&nbsp;&nbsp;Next&nbsp;/&nbsp;Last
+            Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_row=portfolio~4">Last</a>
           </td>
         
     
@@ -1263,7 +1290,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>D8C6463BE90B058F6CB913D763EBB403</ses:value>
+                  <ses:value>BEEF025480ADDEFBF561927578402D6F</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -1289,7 +1316,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=D8C6463BE90B058F6CB913D763EBB403; $Path=/coreWeb</ses:value>
+                  <ses:value>$Version=0; JSESSIONID=BEEF025480ADDEFBF561927578402D6F; $Path=/coreWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -1301,7 +1328,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>5d613590:ffff08a735:-7f1a</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f68</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -1316,7 +1343,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 
-<head>
+  <head>
     <title>NetUI Data Grid Samples</title>
     <link rel="stylesheet" href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
   </head>
@@ -1378,7 +1405,7 @@
         
         
           <td colspan="3" align="right">
-            Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_page=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_page=portfolio~3">Last</a>
+            Page 1 of 3&nbsp;&nbsp;First&nbsp;/&nbsp;Previous&nbsp;&nbsp;&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_row=portfolio~2">Next</a>&nbsp;/&nbsp;<a href="/coreWeb/databinding/datagrid/pager/infooter/begin.do?netui_row=portfolio~4">Last</a>
           </td>
         
     
@@ -1405,7 +1432,7 @@
          </ses:testResults>
       </ses:test>
    </ses:tests>
-   <ses:endDate>03 Nov 2004, 02:30:51.520 PM MST</ses:endDate>
+   <ses:endDate>04 Jan 2005, 01:26:06.461 PM MST</ses:endDate>
    <ses:sessionStatus>fail</ses:sessionStatus>
    <ses:testCount>9</ses:testCount>
    <ses:passedCount>0</ses:passedCount>

Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridSmokeTest.xml
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridSmokeTest.xml?view=diff&rev=124232&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridSmokeTest.xml&r1=124231&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridSmokeTest.xml&r2=124232
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridSmokeTest.xml	(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridSmokeTest.xml	Wed Jan  5 09:35:19 2005
@@ -2,7 +2,7 @@
 <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session">
    <ses:sessionName>DataGridSmokeTest</ses:sessionName>
    <ses:tester>ekoneil</ses:tester>
-   <ses:startDate>05 Nov 2004, 09:20:47.431 AM MST</ses:startDate>
+   <ses:startDate>04 Jan 2005, 01:26:02.535 PM MST</ses:startDate>
    <ses:description>ekoneil</ses:description>
    <ses:tests>
       <ses:test>
@@ -15,12 +15,7 @@
             <ses:uri>/coreWeb/databinding/datagrid/basic/Controller.jpf</ses:uri>
             <ses:method>GET</ses:method>
             <ses:parameters/>
-            <ses:cookies>
-               <ses:cookie>
-                  <ses:name>JSESSIONID</ses:name>
-                  <ses:value>E41EF027A52A8872B048DE39F5BB8BA7</ses:value>
-               </ses:cookie>
-            </ses:cookies>
+            <ses:cookies/>
             <ses:headers>
                <ses:header>
                   <ses:name>accept</ses:name>
@@ -43,10 +38,6 @@
                   <ses:value>keep-alive</ses:value>
                </ses:header>
                <ses:header>
-                  <ses:name>cookie</ses:name>
-                  <ses:value>$Version=0; JSESSIONID=E41EF027A52A8872B048DE39F5BB8BA7; $Path=/coreWeb</ses:value>
-               </ses:header>
-               <ses:header>
                   <ses:name>host</ses:name>
                   <ses:value>localhost:8080</ses:value>
                </ses:header>
@@ -56,7 +47,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>testrecorder.playback.testid</ses:name>
-                  <ses:value>36e4da92:1000988e50d:-7f98</ses:value>
+                  <ses:value>77528ecf:1013f391217:-7f99</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -85,7 +76,9 @@
         
     <p>
 
- 
+
+
+
 
 
 <br/>
@@ -93,6 +86,7 @@
 <table class="datagrid">
 
     
+    
 <thead>
 <tr class="datagrid-header">
         <th class="datagrid-header-cell">Symbol</th>
@@ -175,9 +169,9 @@
          </ses:testResults>
       </ses:test>
    </ses:tests>
-   <ses:endDate>05 Nov 2004, 09:20:49.254 AM MST</ses:endDate>
+   <ses:endDate>04 Jan 2005, 01:26:03.567 PM MST</ses:endDate>
    <ses:sessionStatus>fail</ses:sessionStatus>
    <ses:testCount>1</ses:testCount>
    <ses:passedCount>0</ses:passedCount>
    <ses:failedCount>1</ses:failedCount>
-</ses:recorderSession>
\ No newline at end of file
+</ses:recorderSession>

Mime
View raw message