You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2004/07/29 02:50:35 UTC
svn commit: rev 30888 - in incubator/beehive/trunk/netui: ant src/tags-databinding/org/apache/beehive/netui/databinding/datagrid src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid src/tags-datagrid/org/apache/beehive/netui/datagrid/model src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl src/tags-datagrid/org/apache/beehive/netui/datagrid/services src/tags-datagrid/org/apache/beehive/netui/datagrid/util src/tags-datagrid/org/apache/beehive/netui/tags/datagrid test/webapps/drt/coreWeb/WEB-INF test/webapps/drt/coreWeb/databinding/datagrid/basic test/webapps/drt/coreWeb/databinding/simplerepeater
Author: ekoneil
Date: Wed Jul 28 17:50:34 2004
New Revision: 30888
Added:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ColumnModel.java
- copied, changed from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/ColumnModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java
- copied, changed from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/DataGridModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/IFilter.java
- copied, changed from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/IFilter.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ISort.java
- copied, changed from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/ISort.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java
- copied, changed from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/PagerModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/StylePolicy.java
- copied, changed from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/StylePolicy.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/AnchorColumnModel.java
- copied, changed from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/AnchorColumnModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultFilter.java
- copied, changed from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/DefaultFilter.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultSort.java
- copied, changed from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/DefaultSort.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultStylePolicy.java
- copied, changed from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/DefaultStylePolicy.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/EmptyStylePolicy.java
- copied, changed from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/EmptyStylePolicy.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/ImageColumnModel.java
- copied, changed from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/ImageColumnModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/LegacyStylePolicy.java
- copied, changed from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/LegacyStylePolicy.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/FilterService.java
- copied, changed from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/services/FilterService.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/IllegalFilterException.java
- copied, changed from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/services/IllegalFilterException.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/PagerService.java
- copied, changed from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/services/PagerService.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/SortService.java
- copied, changed from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/services/SortService.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/AttributeHelper.java
- copied, changed from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/util/AttributeHelper.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java
- copied, changed from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/util/PagedDataSet.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java
- copied, changed from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/tags/datagrid/AbstractColumn.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java
- copied, changed from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/tags/datagrid/AnchorColumn.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Columns.java
- copied, changed from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/tags/datagrid/Columns.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java
- copied, changed from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/tags/datagrid/DataGrid.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java
- copied, changed from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/tags/datagrid/ImageColumn.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java
- copied, changed from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/tags/datagrid/LiteralColumn.java
Removed:
incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/ColumnModel.java
incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/DataGridModel.java
incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/IFilter.java
incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/ISort.java
incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/PagerModel.java
incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/StylePolicy.java
incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/AnchorColumnModel.java
incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/DefaultFilter.java
incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/DefaultSort.java
incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/DefaultStylePolicy.java
incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/EmptyStylePolicy.java
incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/ImageColumnModel.java
incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/LegacyStylePolicy.java
incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/services/FilterService.java
incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/services/IllegalFilterException.java
incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/services/PagerService.java
incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/services/SortService.java
incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/util/AttributeHelper.java
incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/util/PagedDataSet.java
incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/tags/datagrid/AbstractColumn.java
incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/tags/datagrid/AnchorColumn.java
incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/tags/datagrid/Columns.java
incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/tags/datagrid/DataGrid.java
incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/tags/datagrid/ImageColumn.java
incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/tags/datagrid/LiteralColumn.java
Modified:
incubator/beehive/trunk/netui/ant/common.properties
incubator/beehive/trunk/netui/ant/webappTemplate.xml
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/web.xml
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/basic/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/simplerepeater/simpleRepeater.jsp
Log:
Move the datagrid tag library into the data binding tag library.
This reduces the number of taglibs from three to four.
Update the coreWeb web.xml file to reflect this change.
Build file changes to stop expecting to copy beehive-netui-tags-datagrid.(TLD|TLDX|JAR) into the NetUI webapp templates.
BB: self
DRT: NetUI pass
BVT: NetUI pass
CR: Daryl
Modified: incubator/beehive/trunk/netui/ant/common.properties
==============================================================================
--- incubator/beehive/trunk/netui/ant/common.properties (original)
+++ incubator/beehive/trunk/netui/ant/common.properties Wed Jul 28 17:50:34 2004
@@ -86,7 +86,6 @@
tags-html.jar.name=beehive-netui-tags-html.jar
tags-template.jar.name=beehive-netui-tags-template.jar
tags-databinding.jar.name=beehive-netui-tags-databinding.jar
-tags-datagrid.jar.name=beehive-netui-tags-datagrid.jar
util.jar.name=beehive-netui-util.jar
compiler.jar.name=beehive-netui-compiler.jar
pageflow.jar.name=beehive-netui-pageflow.jar
@@ -105,8 +104,6 @@
netui-tags-template.tldx.name=beehive-netui-tags-template.tldx
netui-tags-databinding.tld.name=beehive-netui-tags-databinding.tld
netui-tags-databinding.tldx.name=beehive-netui-tags-databinding.tldx
-netui-tags-datagrid.tld.name=beehive-netui-tags-datagrid.tld
-netui-tags-datagrid.tldx.name=beehive-netui-tags-datagrid.tldx
# ---------------------------------------------------------------------------------
#
@@ -119,7 +116,6 @@
tags.html.jar=${build.lib.dir}/${tags-html.jar.name}
tags.template.jar=${build.lib.dir}/${tags-template.jar.name}
tags.databinding.jar=${build.lib.dir}/${tags-databinding.jar.name}
-tags.datagrid.jar=${build.lib.dir}/${tags-datagrid.jar.name}
util.jar=${build.lib.dir}/${util.jar.name}
compiler.jar=${build.lib.dir}/${compiler.jar.name}
pageflow.jar=${build.lib.dir}/${pageflow.jar.name}
@@ -136,8 +132,6 @@
netui-tags-template.tldx=${build.lib.dir}/${netui-tags-template.tldx.name}
netui-tags-databinding.tld=${build.lib.dir}/${netui-tags-databinding.tld.name}
netui-tags-databinding.tldx=${build.lib.dir}/${netui-tags-databinding.tldx.name}
-netui-tags-datagrid.tld=${build.lib.dir}/${netui-tags-datagrid.tld.name}
-netui-tags-datagrid.tldx=${build.lib.dir}/${netui-tags-datagrid.tldx.name}
# ---------------------------------------------------------------------------------
#
@@ -151,7 +145,6 @@
deployed.tags.html.jar=${webappTemplate.webinf.lib}/${tags-html.jar.name}
deployed.tags.template.jar=${webappTemplate.webinf.lib}/${tags-template.jar.name}
deployed.tags.databinding.jar=${webappTemplate.webinf.lib}/${tags-databinding.jar.name}
-deployed.tags.datagrid.jar=${webappTemplate.webinf.lib}/${tags-datagrid.jar.name}
deployed.util.jar=${webappTemplate.webinf.lib}/${util.jar.name}
deployed.compiler.jar=${webappTemplate.webinf.lib}/${compiler.jar.name}
deployed.pageflow.jar=${webappTemplate.webinf.lib}/${pageflow.jar.name}
@@ -201,8 +194,7 @@
tomcat-webapp,\
tags-html,\
tags-databinding,\
-tags-template,\
-tags-datagrid
+tags-template
# Javadoc properties
j2ee.docs=http://java.sun.com/j2ee/sdk_1.3/techdocs/api/
Modified: incubator/beehive/trunk/netui/ant/webappTemplate.xml
==============================================================================
--- incubator/beehive/trunk/netui/ant/webappTemplate.xml (original)
+++ incubator/beehive/trunk/netui/ant/webappTemplate.xml Wed Jul 28 17:50:34 2004
@@ -94,11 +94,6 @@
<copy todir="${webinf.dir}" file="${netui-tags-databinding.tld}"/>
<copy todir="${webinf.dir}" file="${netui-tags-databinding.tldx}"/>
- <!-- netui-tags-datagrid -->
- <copy todir="${webinf.lib}" file="${tags.datagrid.jar}"/>
- <copy todir="${webinf.dir}" file="${netui-tags-datagrid.tld}"/>
- <copy todir="${webinf.dir}" file="${netui-tags-datagrid.tldx}"/>
-
<!-- deploy the default NetUI server config file -->
<copy todir="${webinf.dir}" file="${template.root.dir}/config/netui-config.xml" overwrite="false"/>
@@ -152,10 +147,6 @@
<include name="WEB-INF/lib/${tags-databinding.jar.name}"/>
<include name="WEB-INF/${netui-tags-databinding.tld.name}"/>
<include name="WEB-INF/${netui-tags-databinding.tldx.name}"/>
-
- <include name="WEB-INF/lib/${tags-datagrid.jar.name}"/>
- <include name="WEB-INF/${netui-tags-datagrid.tld.name}"/>
- <include name="WEB-INF/${netui-tags-datagrid.tldx.name}"/>
<include name="WEB-INF/lib/${util.jar.name}"/>
<include name="WEB-INF/lib/${pageflow.jar.name}"/>
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ColumnModel.java (from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/ColumnModel.java)
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/ColumnModel.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ColumnModel.java Wed Jul 28 17:50:34 2004
@@ -16,7 +16,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.datagrid.model;
+package org.apache.beehive.netui.databinding.datagrid.model;
import java.util.ArrayList;
@@ -26,9 +26,9 @@
import org.apache.beehive.netui.tags.html.FormatTag;
-import org.apache.beehive.netui.datagrid.util.AttributeHelper;
-import org.apache.beehive.netui.datagrid.services.FilterService;
-import org.apache.beehive.netui.datagrid.services.SortService;
+import org.apache.beehive.netui.databinding.datagrid.util.AttributeHelper;
+import org.apache.beehive.netui.databinding.datagrid.services.FilterService;
+import org.apache.beehive.netui.databinding.datagrid.services.SortService;
import org.apache.beehive.netui.pageflow.scoping.ScopedRequest;
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
import org.apache.beehive.netui.pageflow.util.PageflowTagUtils;
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java (from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/DataGridModel.java)
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/DataGridModel.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java Wed Jul 28 17:50:34 2004
@@ -16,7 +16,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.datagrid.model;
+package org.apache.beehive.netui.databinding.datagrid.model;
import java.io.IOException;
import java.io.Writer;
@@ -26,12 +26,12 @@
import javax.servlet.jsp.PageContext;
-import org.apache.beehive.netui.datagrid.services.FilterService;
-import org.apache.beehive.netui.datagrid.services.PagerService;
-import org.apache.beehive.netui.datagrid.services.SortService;
-import org.apache.beehive.netui.datagrid.util.PagedDataSet;
+import org.apache.beehive.netui.databinding.datagrid.services.FilterService;
+import org.apache.beehive.netui.databinding.datagrid.services.PagerService;
+import org.apache.beehive.netui.databinding.datagrid.services.SortService;
+import org.apache.beehive.netui.databinding.datagrid.util.PagedDataSet;
import org.apache.beehive.netui.script.common.IDataAccessProvider;
-import org.apache.beehive.netui.tags.datagrid.DataGrid;
+import org.apache.beehive.netui.tags.databinding.datagrid.DataGrid;
import org.apache.beehive.netui.util.logging.Logger;
/**
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/IFilter.java (from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/IFilter.java)
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/IFilter.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/IFilter.java Wed Jul 28 17:50:34 2004
@@ -16,7 +16,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.datagrid.model;
+package org.apache.beehive.netui.databinding.datagrid.model;
/**
*
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ISort.java (from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/ISort.java)
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/ISort.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ISort.java Wed Jul 28 17:50:34 2004
@@ -16,7 +16,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.datagrid.model;
+package org.apache.beehive.netui.databinding.datagrid.model;
/**
*
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java (from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/PagerModel.java)
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/PagerModel.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java Wed Jul 28 17:50:34 2004
@@ -16,9 +16,9 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.datagrid.model;
+package org.apache.beehive.netui.databinding.datagrid.model;
-import org.apache.beehive.netui.datagrid.services.PagerService;
+import org.apache.beehive.netui.databinding.datagrid.services.PagerService;
import org.apache.beehive.netui.pageflow.util.PageflowTagUtils;
import org.apache.beehive.netui.util.logging.Logger;
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/StylePolicy.java (from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/StylePolicy.java)
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/StylePolicy.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/StylePolicy.java Wed Jul 28 17:50:34 2004
@@ -16,7 +16,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.datagrid.model;
+package org.apache.beehive.netui.databinding.datagrid.model;
import org.apache.beehive.netui.util.logging.Logger;
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/AnchorColumnModel.java (from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/AnchorColumnModel.java)
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/AnchorColumnModel.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/AnchorColumnModel.java Wed Jul 28 17:50:34 2004
@@ -16,14 +16,14 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.datagrid.model.impl;
+package org.apache.beehive.netui.databinding.datagrid.model.impl;
import java.net.MalformedURLException;
import java.util.HashMap;
import javax.servlet.jsp.PageContext;
-import org.apache.beehive.netui.datagrid.model.ColumnModel;
-import org.apache.beehive.netui.datagrid.model.DataGridModel;
+import org.apache.beehive.netui.databinding.datagrid.model.ColumnModel;
+import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
import org.apache.beehive.netui.pageflow.util.URLRewriter;
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultFilter.java (from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/DefaultFilter.java)
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/DefaultFilter.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultFilter.java Wed Jul 28 17:50:34 2004
@@ -16,12 +16,12 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.datagrid.model.impl;
+package org.apache.beehive.netui.databinding.datagrid.model.impl;
import java.util.HashMap;
-import org.apache.beehive.netui.datagrid.model.IFilter;
-import org.apache.beehive.netui.datagrid.services.IllegalFilterException;
+import org.apache.beehive.netui.databinding.datagrid.model.IFilter;
+import org.apache.beehive.netui.databinding.datagrid.services.IllegalFilterException;
import org.apache.beehive.netui.util.logging.Logger;
/**
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultSort.java (from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/DefaultSort.java)
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/DefaultSort.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultSort.java Wed Jul 28 17:50:34 2004
@@ -16,9 +16,9 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.datagrid.model.impl;
+package org.apache.beehive.netui.databinding.datagrid.model.impl;
-import org.apache.beehive.netui.datagrid.model.ISort;
+import org.apache.beehive.netui.databinding.datagrid.model.ISort;
import org.apache.beehive.netui.util.logging.Logger;
/**
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultStylePolicy.java (from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/DefaultStylePolicy.java)
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/DefaultStylePolicy.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultStylePolicy.java Wed Jul 28 17:50:34 2004
@@ -16,9 +16,9 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.datagrid.model.impl;
+package org.apache.beehive.netui.databinding.datagrid.model.impl;
-import org.apache.beehive.netui.datagrid.model.StylePolicy;
+import org.apache.beehive.netui.databinding.datagrid.model.StylePolicy;
import org.apache.beehive.netui.util.logging.Logger;
/**
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/EmptyStylePolicy.java (from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/EmptyStylePolicy.java)
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/EmptyStylePolicy.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/EmptyStylePolicy.java Wed Jul 28 17:50:34 2004
@@ -16,9 +16,9 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.datagrid.model.impl;
+package org.apache.beehive.netui.databinding.datagrid.model.impl;
-import org.apache.beehive.netui.datagrid.model.StylePolicy;
+import org.apache.beehive.netui.databinding.datagrid.model.StylePolicy;
import org.apache.beehive.netui.util.logging.Logger;
/**
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/ImageColumnModel.java (from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/ImageColumnModel.java)
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/ImageColumnModel.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/ImageColumnModel.java Wed Jul 28 17:50:34 2004
@@ -16,9 +16,9 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.datagrid.model.impl;
+package org.apache.beehive.netui.databinding.datagrid.model.impl;
-import org.apache.beehive.netui.datagrid.model.ColumnModel;
+import org.apache.beehive.netui.databinding.datagrid.model.ColumnModel;
import org.apache.beehive.netui.util.logging.Logger;
/**
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/LegacyStylePolicy.java (from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/LegacyStylePolicy.java)
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/model/impl/LegacyStylePolicy.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/LegacyStylePolicy.java Wed Jul 28 17:50:34 2004
@@ -16,9 +16,9 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.datagrid.model.impl;
+package org.apache.beehive.netui.databinding.datagrid.model.impl;
-import org.apache.beehive.netui.datagrid.model.StylePolicy;
+import org.apache.beehive.netui.databinding.datagrid.model.StylePolicy;
/**
*
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/FilterService.java (from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/services/FilterService.java)
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/services/FilterService.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/FilterService.java Wed Jul 28 17:50:34 2004
@@ -16,7 +16,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.datagrid.services;
+package org.apache.beehive.netui.databinding.datagrid.services;
import java.util.ArrayList;
import java.util.Iterator;
@@ -25,7 +25,7 @@
import java.util.Map;
import javax.servlet.ServletRequest;
-import org.apache.beehive.netui.datagrid.model.IFilter;
+import org.apache.beehive.netui.databinding.datagrid.model.IFilter;
import org.apache.beehive.netui.util.logging.Logger;
/**
@@ -357,7 +357,7 @@
if(!queryParams[i].startsWith(namespace + "~"))
continue;
- IFilter f = org.apache.beehive.netui.datagrid.model.impl.DefaultFilter.parse(namespace, queryParams[i]);
+ IFilter f = org.apache.beehive.netui.databinding.datagrid.model.impl.DefaultFilter.parse(namespace, queryParams[i]);
assert f != null;
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/IllegalFilterException.java (from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/services/IllegalFilterException.java)
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/services/IllegalFilterException.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/IllegalFilterException.java Wed Jul 28 17:50:34 2004
@@ -16,7 +16,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.datagrid.services;
+package org.apache.beehive.netui.databinding.datagrid.services;
/**
*
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/PagerService.java (from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/services/PagerService.java)
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/services/PagerService.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/PagerService.java Wed Jul 28 17:50:34 2004
@@ -16,7 +16,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.datagrid.services;
+package org.apache.beehive.netui.databinding.datagrid.services;
import javax.servlet.ServletRequest;
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/SortService.java (from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/services/SortService.java)
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/services/SortService.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/SortService.java Wed Jul 28 17:50:34 2004
@@ -16,7 +16,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.datagrid.services;
+package org.apache.beehive.netui.databinding.datagrid.services;
import java.util.ArrayList;
import java.util.HashMap;
@@ -26,8 +26,8 @@
import java.util.Map;
import javax.servlet.ServletRequest;
-import org.apache.beehive.netui.datagrid.model.ISort;
-import org.apache.beehive.netui.datagrid.model.impl.DefaultSort;
+import org.apache.beehive.netui.databinding.datagrid.model.ISort;
+import org.apache.beehive.netui.databinding.datagrid.model.impl.DefaultSort;
import org.apache.beehive.netui.util.logging.Logger;
/**
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/AttributeHelper.java (from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/util/AttributeHelper.java)
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/util/AttributeHelper.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/AttributeHelper.java Wed Jul 28 17:50:34 2004
@@ -16,7 +16,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.datagrid.util;
+package org.apache.beehive.netui.databinding.datagrid.util;
/**
*
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java (from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/util/PagedDataSet.java)
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/datagrid/util/PagedDataSet.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java Wed Jul 28 17:50:34 2004
@@ -16,7 +16,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.datagrid.util;
+package org.apache.beehive.netui.databinding.datagrid.util;
import java.util.Iterator;
import java.util.ArrayList;
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java (from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/tags/datagrid/AbstractColumn.java)
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/tags/datagrid/AbstractColumn.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java Wed Jul 28 17:50:34 2004
@@ -16,12 +16,12 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.tags.datagrid;
+package org.apache.beehive.netui.tags.databinding.datagrid;
import javax.servlet.jsp.tagext.Tag;
-import org.apache.beehive.netui.datagrid.model.ColumnModel;
-import org.apache.beehive.netui.datagrid.model.DataGridModel;
+import org.apache.beehive.netui.databinding.datagrid.model.ColumnModel;
+import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
import org.apache.beehive.netui.tags.AbstractBaseTag;
import org.apache.beehive.netui.tags.html.Formattable;
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java (from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/tags/datagrid/AnchorColumn.java)
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/tags/datagrid/AnchorColumn.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java Wed Jul 28 17:50:34 2004
@@ -16,14 +16,14 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.tags.datagrid;
+package org.apache.beehive.netui.tags.databinding.datagrid;
// java imports
import javax.servlet.jsp.JspException;
// internal imports
-import org.apache.beehive.netui.datagrid.model.ColumnModel;
-import org.apache.beehive.netui.datagrid.model.impl.AnchorColumnModel;
+import org.apache.beehive.netui.databinding.datagrid.model.ColumnModel;
+import org.apache.beehive.netui.databinding.datagrid.model.impl.AnchorColumnModel;
import org.apache.beehive.netui.tags.AbstractBaseTag;
import org.apache.beehive.netui.tags.html.URLParams;
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Columns.java (from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/tags/datagrid/Columns.java)
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/tags/datagrid/Columns.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Columns.java Wed Jul 28 17:50:34 2004
@@ -16,10 +16,10 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.tags.datagrid;
+package org.apache.beehive.netui.tags.databinding.datagrid;
-import org.apache.beehive.netui.datagrid.model.ColumnModel;
-import org.apache.beehive.netui.datagrid.model.DataGridModel;
+import org.apache.beehive.netui.databinding.datagrid.model.ColumnModel;
+import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
import org.apache.beehive.netui.tags.AbstractBaseTag;
import org.apache.beehive.netui.util.logging.Logger;
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java (from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/tags/datagrid/DataGrid.java)
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/tags/datagrid/DataGrid.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java Wed Jul 28 17:50:34 2004
@@ -16,7 +16,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.tags.datagrid;
+package org.apache.beehive.netui.tags.databinding.datagrid;
import java.util.List;
import java.util.Iterator;
@@ -24,12 +24,12 @@
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.JspException;
-import org.apache.beehive.netui.datagrid.model.ColumnModel;
-import org.apache.beehive.netui.datagrid.model.DataGridModel;
-import org.apache.beehive.netui.datagrid.model.impl.DefaultStylePolicy;
-import org.apache.beehive.netui.datagrid.model.impl.EmptyStylePolicy;
-import org.apache.beehive.netui.datagrid.model.impl.LegacyStylePolicy;
-import org.apache.beehive.netui.datagrid.util.PagedDataSet;
+import org.apache.beehive.netui.databinding.datagrid.model.ColumnModel;
+import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
+import org.apache.beehive.netui.databinding.datagrid.model.impl.DefaultStylePolicy;
+import org.apache.beehive.netui.databinding.datagrid.model.impl.EmptyStylePolicy;
+import org.apache.beehive.netui.databinding.datagrid.model.impl.LegacyStylePolicy;
+import org.apache.beehive.netui.databinding.datagrid.util.PagedDataSet;
import org.apache.beehive.netui.tags.AbstractBaseTag;
import org.apache.beehive.netui.script.common.IDataAccessProvider;
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java (from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/tags/datagrid/ImageColumn.java)
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/tags/datagrid/ImageColumn.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java Wed Jul 28 17:50:34 2004
@@ -16,10 +16,10 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.tags.datagrid;
+package org.apache.beehive.netui.tags.databinding.datagrid;
-import org.apache.beehive.netui.datagrid.model.impl.ImageColumnModel;
-import org.apache.beehive.netui.datagrid.model.ColumnModel;
+import org.apache.beehive.netui.databinding.datagrid.model.impl.ImageColumnModel;
+import org.apache.beehive.netui.databinding.datagrid.model.ColumnModel;
import org.apache.beehive.netui.util.logging.Logger;
/**
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java (from rev 30882, incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/tags/datagrid/LiteralColumn.java)
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-datagrid/org/apache/beehive/netui/tags/datagrid/LiteralColumn.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java Wed Jul 28 17:50:34 2004
@@ -16,9 +16,9 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.tags.datagrid;
+package org.apache.beehive.netui.tags.databinding.datagrid;
-import org.apache.beehive.netui.datagrid.model.ColumnModel;
+import org.apache.beehive.netui.databinding.datagrid.model.ColumnModel;
import org.apache.beehive.netui.util.logging.Logger;
/**
Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/web.xml
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/web.xml (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/web.xml Wed Jul 28 17:50:34 2004
@@ -198,10 +198,6 @@
<taglib-uri>beehive-netui-tags-template.tld</taglib-uri>
<taglib-location>/WEB-INF/beehive-netui-tags-template.tld</taglib-location>
</taglib>
- <taglib>
- <taglib-uri>beehive-netui-tags-datagrid.tld</taglib-uri>
- <taglib-location>/WEB-INF/beehive-netui-tags-datagrid.tld</taglib-location>
- </taglib>
<!-- Mock Portal -->
<taglib>
<taglib-uri>mockportal.tld</taglib-uri>
Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/basic/index.jsp
==============================================================================
--- 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 Jul 28 17:50:34 2004
@@ -2,7 +2,6 @@
<%@ 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 uri="beehive-netui-tags-datagrid.tld" prefix="netui-datagrid"%>
<%@ page import="org.apache.beehive.netui.script.common.DataAccessProviderBean"%>
<netui-template:template templatePage="../site/template.jsp">
<netui-template:setAttribute name="title" value="Basic Data Grid"/>
@@ -10,16 +9,16 @@
<p>
<%@ include file="../util/portfolioXmlBean.jsp" %>
<br/>
-<netui-datagrid:dataGrid dataSource="pageContext.stocks" name="portfolio">
- <netui-datagrid:columns defaultSortable="true" defaultFilterable="false" sortAction="index.jsp" filterAction="index.jsp">
- <netui-datagrid:literalColumn headerText="Symbol" value="${container.item.symbol}" sortExpression="symbol"/>
- <netui-datagrid:literalColumn sortable="false" headerText="Price" value="${container.item.price}"/>
- <netui-datagrid:anchorColumn headerText="Web" href="${container.item.web}" value="${container.item.name}">
+<netui-data:dataGrid dataSource="pageContext.stocks" name="portfolio">
+ <netui-data:columns defaultSortable="true" defaultFilterable="false" sortAction="index.jsp" filterAction="index.jsp">
+ <netui-data:literalColumn headerText="Symbol" value="${container.item.symbol}" sortExpression="symbol"/>
+ <netui-data:literalColumn sortable="false" headerText="Price" value="${container.item.price}"/>
+ <netui-data:anchorColumn headerText="Web" href="${container.item.web}" value="${container.item.name}">
<netui:parameter name="rowid" value="${container.index}"/>
<netui:parameter name="symbol" value="${container.item.symbol}"/>
- </netui-datagrid:anchorColumn>
- </netui-datagrid:columns>
-</netui-datagrid:dataGrid>
+ </netui-data:anchorColumn>
+ </netui-data:columns>
+</netui-data:dataGrid>
<br/>
<netui:anchor href="index.jsp">Reset</netui:anchor>
<br/>
Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/simplerepeater/simpleRepeater.jsp
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/simplerepeater/simpleRepeater.jsp (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/simplerepeater/simpleRepeater.jsp Wed Jul 28 17:50:34 2004
@@ -2,7 +2,6 @@
<%@ 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 uri="beehive-netui-tags-datagrid.tld" prefix="netui-datagrid"%>
<netui:html>
<head>
<title>Simple Repeater Test</title>