You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by do...@apache.org on 2010/10/24 21:49:08 UTC
svn commit: r1026872 - in /incubator/empire-db/trunk/empire-db-examples:
empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/
empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/actions/
e...
Author: doebele
Date: Sun Oct 24 19:49:08 2010
New Revision: 1026872
URL: http://svn.apache.org/viewvc?rev=1026872&view=rev
Log:
EMPIREDB-89
Modified:
incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/SampleApplication.java
incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/SampleRequest.java
incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/SampleSession.java
incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/actions/EmployeeListAction.java
incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/actions/LoginAction.java
incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/actiontypes/SampleAction.java
incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/ws/SampleBeanDomain.java
incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/resources/struts.xml
incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/webapp/WEB-INF/empire-tags.tld
incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleApplication.java
incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleRequest.java
incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleSession.java
incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/actions/EmployeeDetailAction.java
incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/actions/EmployeeListAction.java
incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/actions/LoginAction.java
incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/actiontypes/Action.java
incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/resources/struts.xml
incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/webapp/WEB-INF/empire-tags.tld
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/SampleApplication.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/SampleApplication.java?rev=1026872&r1=1026871&r2=1026872&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/SampleApplication.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/SampleApplication.java Sun Oct 24 19:49:08 2010
@@ -18,13 +18,12 @@
*/
package org.apache.empire.struts2.websample.web;
-import javax.servlet.ServletContext;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.empire.samples.cxf.wssample.client.EmployeeServiceClient;
import org.apache.empire.struts2.actionsupport.TextProviderActionSupport;
import org.apache.empire.struts2.html.HtmlTagDictionary;
+import org.apache.empire.struts2.web.AppContext;
import org.apache.empire.struts2.web.WebApplication;
import org.apache.empire.struts2.websample.ws.SampleBeanDomain;
@@ -46,7 +45,7 @@ public class SampleApplication implement
private EmployeeServiceClient ws = new EmployeeServiceClient(config
.getServiceAddress());
- public void init(ServletContext servletContext) {
+ public void init(AppContext appContext) {
try {
// Application
@@ -59,13 +58,13 @@ public class SampleApplication implement
// register all controls
// InputControlManager.registerControl("myType", new
// MyTypeInputControl());
- config.init(servletContext.getRealPath("WEB-INF/config.xml"));
+ config.init(appContext.getRealPath("WEB-INF/config.xml"));
// Set Html Dictionary
HtmlTagDictionary.set(new SampleHtmlTagDictionary());
// Set Database to Servlet Context
- servletContext.setAttribute("db", beanDomain);
+ appContext.setAttribute("db", beanDomain);
// Get a Webservice Connection
log.info("*** testing Webservice Connection ***");
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/SampleRequest.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/SampleRequest.java?rev=1026872&r1=1026871&r2=1026872&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/SampleRequest.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/SampleRequest.java Sun Oct 24 19:49:08 2010
@@ -18,12 +18,11 @@
*/
package org.apache.empire.struts2.websample.web;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.empire.struts2.web.EmpireStrutsDispatcher;
+import org.apache.empire.struts2.web.EmpireThreadManager;
+import org.apache.empire.struts2.web.RequestContext;
+import org.apache.empire.struts2.web.ResponseContext;
import org.apache.empire.struts2.web.WebRequest;
@@ -32,19 +31,19 @@ public class SampleRequest implements We
// Logger
protected static Log log = LogFactory.getLog(SampleRequest.class);
- private HttpServletRequest httpRequest;
- private HttpServletResponse httpResponse;
- private SampleSession session;
+ private RequestContext requestContext;
+ private ResponseContext responseContext;
+ private SampleSession session;
public static SampleRequest getInstance()
{
- return (SampleRequest)EmpireStrutsDispatcher.getCurrentRequest();
+ return (SampleRequest)EmpireThreadManager.getCurrentRequest();
}
- public boolean init(HttpServletRequest request, HttpServletResponse response, Object session)
+ public boolean init(RequestContext request, ResponseContext response, Object session)
{
- this.httpRequest = request;
- this.httpResponse = response;
+ this.requestContext = request;
+ this.responseContext = response;
// Set Internal objects
this.session = (SampleSession)session;
if (this.session==null)
@@ -59,8 +58,8 @@ public class SampleRequest implements We
public void exit(int exitCode)
{
// Release objects
- this.httpRequest = null;
- this.httpResponse = null;
+ this.requestContext = null;
+ this.responseContext = null;
}
// Get Session
@@ -75,14 +74,16 @@ public class SampleRequest implements We
return session.getApplication();
}
- public HttpServletRequest getHttpRequest()
+ // Get Request Context
+ public RequestContext getRequestContext()
{
- return httpRequest;
+ return requestContext;
}
- public HttpServletResponse getHttpResponse()
+ // Get Response Context
+ public ResponseContext getResponseContext()
{
- return httpResponse;
+ return responseContext;
}
}
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/SampleSession.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/SampleSession.java?rev=1026872&r1=1026871&r2=1026872&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/SampleSession.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/SampleSession.java Sun Oct 24 19:49:08 2010
@@ -20,13 +20,11 @@ package org.apache.empire.struts2.websam
import java.util.HashMap;
-import javax.servlet.http.HttpSession;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.empire.struts2.web.SessionContext;
import org.apache.empire.struts2.web.WebSession;
-
public class SampleSession implements WebSession
{
// Logger
@@ -38,7 +36,7 @@ public class SampleSession implements We
public HashMap<String, Object> objectMap = new HashMap<String, Object>();
// Init Session
- public void init(HttpSession session, Object application)
+ public void init(SessionContext session, Object application)
{
this.application = (SampleApplication) application;
if (this.application==null)
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/actions/EmployeeListAction.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/actions/EmployeeListAction.java?rev=1026872&r1=1026871&r2=1026872&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/actions/EmployeeListAction.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/actions/EmployeeListAction.java Sun Oct 24 19:49:08 2010
@@ -102,7 +102,7 @@ public class EmployeeListAction extends
public EmployeeListAction()
{
-
+ // Empty
}
// ------- Action Properties -------
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/actions/LoginAction.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/actions/LoginAction.java?rev=1026872&r1=1026871&r2=1026872&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/actions/LoginAction.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/actions/LoginAction.java Sun Oct 24 19:49:08 2010
@@ -29,7 +29,6 @@ import org.apache.empire.struts2.websamp
import com.opensymphony.xwork2.config.entities.Parameterizable;
-@SuppressWarnings("serial")
public class LoginAction extends SampleAction implements Parameterizable // StaticParametersInterceptor
{
// Login Targets
@@ -187,7 +186,8 @@ public class LoginAction extends SampleA
* CHANGE: added method "asKey(String key)"
* Reason: The interface com.opensymphony.xwork2.config.entities.Parameterizable changed
*/
- public boolean hasKey(String key) {
+ @Override
+ public boolean hasKey(String key) {
return this.actionConfigParams.containsKey(key);
}
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/actiontypes/SampleAction.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/actiontypes/SampleAction.java?rev=1026872&r1=1026871&r2=1026872&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/actiontypes/SampleAction.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/actiontypes/SampleAction.java Sun Oct 24 19:49:08 2010
@@ -32,7 +32,8 @@ import org.apache.empire.struts2.websamp
public abstract class SampleAction extends WebAction
{
// Logger
- protected static Log log = LogFactory.getLog(SampleAction.class);
+ @SuppressWarnings("hiding")
+ protected static Log log = LogFactory.getLog(SampleAction.class);
private EmployeeServiceClient service = null;
public SampleAction()
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/ws/SampleBeanDomain.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/ws/SampleBeanDomain.java?rev=1026872&r1=1026871&r2=1026872&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/ws/SampleBeanDomain.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/ws/SampleBeanDomain.java Sun Oct 24 19:49:08 2010
@@ -19,6 +19,7 @@
package org.apache.empire.struts2.websample.ws;
import org.apache.empire.commons.Options;
+import org.apache.empire.data.DataMode;
import org.apache.empire.data.DataType;
import org.apache.empire.data.bean.BeanDomain;
import org.apache.empire.data.bean.BeanProperty;
@@ -48,11 +49,11 @@ public class SampleBeanDomain extends Be
{
super("DEPARTMENTS", dom);
// ID
- C_DEPARTMENT_ID = addProp("departmentId", DataType.AUTOINC, 0, true);
- C_NAME = addProp("name", DataType.TEXT, 80, true);
- C_HEAD = addProp("head", DataType.TEXT, 80, false);
- C_BUSINESS_UNIT = addProp("businessUnit", DataType.TEXT, 4, true);
- C_UPDATE_TIMESTAMP= addProp("updateTimestamp", DataType.DATETIME, 0, true);
+ C_DEPARTMENT_ID = addProp("departmentId", DataType.AUTOINC, 0, DataMode.NotNull);
+ C_NAME = addProp("name", DataType.TEXT, 80, DataMode.NotNull);
+ C_HEAD = addProp("head", DataType.TEXT, 80, DataMode.Nullable);
+ C_BUSINESS_UNIT = addProp("businessUnit", DataType.TEXT, 4, DataMode.NotNull);
+ C_UPDATE_TIMESTAMP= addProp("updateTimestamp", DataType.DATETIME, 0, DataMode.AutoGenerated);
// Primary Key
setKeyColumn(C_DEPARTMENT_ID);
@@ -85,17 +86,17 @@ public class SampleBeanDomain extends Be
{
super("EMPLOYEES", dom);
// ID
- C_EMPLOYEE_ID = addProp("employeeId", DataType.AUTOINC, 0, true);
- C_SALUTATION = addProp("salutation", DataType.TEXT, 20, false);
- C_FIRSTNAME = addProp("firstname", DataType.TEXT, 40, true);
- C_LASTNAME = addProp("lastname", DataType.TEXT, 40, true);
- C_DATE_OF_BIRTH = addProp("dateOfBirth", DataType.DATE, 0, false);
- C_DEPARTMENT_ID = addProp("departmentId", DataType.INTEGER, 0, true,"select");
- C_GENDER = addProp("gender", DataType.TEXT, 1, false,"select");
- C_PHONE_NUMBER = addProp("phoneNumber", DataType.TEXT, 40, false,"phone");
- C_EMAIL = addProp("email", DataType.TEXT, 80, false);
- C_RETIRED = addProp("retired", DataType.BOOL, 0, true);
- C_UPDATE_TIMESTAMP= addProp("updateTimestamp", DataType.DATETIME, 0, true,"text",true);
+ C_EMPLOYEE_ID = addProp("employeeId", DataType.AUTOINC, 0, DataMode.NotNull);
+ C_SALUTATION = addProp("salutation", DataType.TEXT, 20, DataMode.Nullable);
+ C_FIRSTNAME = addProp("firstname", DataType.TEXT, 40, DataMode.NotNull);
+ C_LASTNAME = addProp("lastname", DataType.TEXT, 40, DataMode.NotNull);
+ C_DATE_OF_BIRTH = addProp("dateOfBirth", DataType.DATE, 0, DataMode.Nullable);
+ C_DEPARTMENT_ID = addProp("departmentId", DataType.INTEGER, 0, DataMode.NotNull, "select");
+ C_GENDER = addProp("gender", DataType.TEXT, 1, DataMode.Nullable, "select");
+ C_PHONE_NUMBER = addProp("phoneNumber", DataType.TEXT, 40, DataMode.Nullable, "phone");
+ C_EMAIL = addProp("email", DataType.TEXT, 80, DataMode.Nullable);
+ C_RETIRED = addProp("retired", DataType.BOOL, 0, DataMode.NotNull);
+ C_UPDATE_TIMESTAMP= addProp("updateTimestamp", DataType.DATETIME, 0, DataMode.AutoGenerated, "text");
// Primary Key
setKeyColumn(C_EMPLOYEE_ID);
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/resources/struts.xml?rev=1026872&r1=1026871&r2=1026872&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/resources/struts.xml (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/resources/struts.xml Sun Oct 24 19:49:08 2010
@@ -17,9 +17,9 @@
specific language governing permissions and limitations
under the License.
-->
-<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
- "http://struts.apache.org/dtds/struts-2.0.dtd">
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN"
+ "http://struts.apache.org/dtds/struts-2.1.7.dtd">
<struts>
<!--
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/webapp/WEB-INF/empire-tags.tld
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/webapp/WEB-INF/empire-tags.tld?rev=1026872&r1=1026871&r2=1026872&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/webapp/WEB-INF/empire-tags.tld (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/webapp/WEB-INF/empire-tags.tld Sun Oct 24 19:49:08 2010
@@ -21,7 +21,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
version="2.0">
- <tlib-version>1.0</tlib-version>
+ <tlib-version>1.1</tlib-version>
<short-name>e</short-name>
<uri>/empire-tags</uri>
<!-- Float Clear Tag -->
@@ -44,7 +44,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -61,7 +61,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -96,7 +96,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -208,7 +208,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -274,7 +274,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -307,6 +307,12 @@
<type>org.apache.empire.data.Record</type>
</attribute>
<attribute>
+ <name>recordProperty</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
<name>property</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -435,7 +441,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -470,13 +476,13 @@
<attribute>
<name>default</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -592,7 +598,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -604,13 +610,13 @@
<attribute>
<name>cssOddClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
<name>cssOddStyle</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -622,19 +628,19 @@
<attribute>
<name>currentClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
<name>columnClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
<name>columnStyle</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -727,6 +733,11 @@
<type>java.lang.String</type>
</attribute>
<attribute>
+ <name>urlType</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<name>item</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -805,7 +816,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -852,7 +863,7 @@
<attribute>
<name>currentClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -870,13 +881,13 @@
<attribute>
<name>columnClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
<name>columnStyle</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -894,7 +905,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1004,7 +1015,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1091,6 +1102,11 @@
<type>java.lang.String</type>
</attribute>
<attribute>
+ <name>urlType</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<name>item</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -1135,7 +1151,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1161,6 +1177,11 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <name>urlType</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<name>item</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -1191,7 +1212,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1252,6 +1273,11 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <name>urlType</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<name>item</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -1282,7 +1308,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1394,7 +1420,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1421,12 +1447,6 @@
<type>java.lang.String</type>
</attribute>
<attribute>
- <name>checked</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
<name>check</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -1501,7 +1521,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1528,7 +1548,7 @@
<type>java.lang.String</type>
</attribute>
<attribute>
- <name>checked</name>
+ <name>check</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
<type>java.lang.Object</type>
@@ -1546,6 +1566,12 @@
<type>java.lang.String</type>
</attribute>
<attribute>
+ <name>column</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <type>org.apache.empire.data.Column</type>
+ </attribute>
+ <attribute>
<name>record</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -1596,7 +1622,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1643,13 +1669,13 @@
<attribute>
<name>linkClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1690,7 +1716,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1749,7 +1775,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1775,6 +1801,11 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <name>urlType</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<name>item</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -1815,9 +1846,15 @@
<type>java.lang.Object</type>
</attribute>
<attribute>
+ <name>onclick</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <type>java.lang.Object</type>
+ </attribute>
+ <attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1984,7 +2021,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleApplication.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleApplication.java?rev=1026872&r1=1026871&r2=1026872&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleApplication.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleApplication.java Sun Oct 24 19:49:08 2010
@@ -21,8 +21,6 @@ package org.apache.empire.struts2.websam
import java.sql.Connection;
import java.sql.DriverManager;
-import javax.servlet.ServletContext;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.empire.commons.StringUtils;
@@ -36,6 +34,7 @@ import org.apache.empire.db.oracle.DBDat
import org.apache.empire.db.sqlserver.DBDatabaseDriverMSSQL;
import org.apache.empire.struts2.actionsupport.TextProviderActionSupport;
import org.apache.empire.struts2.html.HtmlTagDictionary;
+import org.apache.empire.struts2.web.AppContext;
import org.apache.empire.struts2.web.WebApplication;
import org.apache.empire.struts2.websample.db.SampleDB;
@@ -58,7 +57,7 @@ public class SampleApplication implement
private Connection conn = null;
- public void init(ServletContext servletContext) {
+ public void init(AppContext servletContext) {
try {
// Application
@@ -130,12 +129,12 @@ public class SampleApplication implement
/*
* getJDBCConnection
*/
- private Connection getJDBCConnection(ServletContext servletContext) {
+ private Connection getJDBCConnection(AppContext appContext) {
// Establish a new database connection
Connection conn = null;
String jdbcURL = config.getJdbcURL();
if (jdbcURL.indexOf("file:")>0)
- jdbcURL = StringUtils.replace(jdbcURL, "file:", "file:"+servletContext.getRealPath("/"));
+ jdbcURL = StringUtils.replace(jdbcURL, "file:", "file:"+appContext.getRealPath("/"));
// Connect
log.info("Connecting to Database'" + jdbcURL + "' / User=" + config.getJdbcUser());
try { // Connect to the databse
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleRequest.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleRequest.java?rev=1026872&r1=1026871&r2=1026872&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleRequest.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleRequest.java Sun Oct 24 19:49:08 2010
@@ -20,12 +20,11 @@ package org.apache.empire.struts2.websam
import java.sql.Connection;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.empire.struts2.web.EmpireStrutsDispatcher;
+import org.apache.empire.struts2.web.EmpireThreadManager;
+import org.apache.empire.struts2.web.RequestContext;
+import org.apache.empire.struts2.web.ResponseContext;
import org.apache.empire.struts2.web.WebRequest;
@@ -34,20 +33,20 @@ public class SampleRequest implements We
// Logger
protected static Log log = LogFactory.getLog(SampleRequest.class);
- private HttpServletRequest httpRequest;
- private HttpServletResponse httpResponse;
+ private RequestContext externalRequest;
+ private ResponseContext externalResponse;
private SampleSession session;
private Connection connection; // Connection for this request
public static SampleRequest getInstance()
{
- return (SampleRequest)EmpireStrutsDispatcher.getCurrentRequest();
+ return (SampleRequest)EmpireThreadManager.getCurrentRequest();
}
- public boolean init(HttpServletRequest request, HttpServletResponse response, Object session)
+ public boolean init(RequestContext request, ResponseContext response, Object session)
{
- this.httpRequest = request;
- this.httpResponse = response;
+ this.externalRequest = request;
+ this.externalResponse = response;
// Set Internal objects
this.session = (SampleSession)session;
if (this.session==null)
@@ -79,8 +78,8 @@ public class SampleRequest implements We
connection= null;
}
// Release objects
- this.httpRequest = null;
- this.httpResponse = null;
+ this.externalRequest = null;
+ this.externalResponse = null;
}
// Get Session
@@ -105,14 +104,14 @@ public class SampleRequest implements We
return connection;
}
- public HttpServletRequest getHttpRequest()
+ public RequestContext getRequestContext()
{
- return httpRequest;
+ return externalRequest;
}
- public HttpServletResponse getHttpResponse()
+ public ResponseContext getResponseContext()
{
- return httpResponse;
+ return externalResponse;
}
}
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleSession.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleSession.java?rev=1026872&r1=1026871&r2=1026872&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleSession.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleSession.java Sun Oct 24 19:49:08 2010
@@ -20,13 +20,11 @@ package org.apache.empire.struts2.websam
import java.util.HashMap;
-import javax.servlet.http.HttpSession;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.empire.struts2.web.SessionContext;
import org.apache.empire.struts2.web.WebSession;
-
public class SampleSession implements WebSession
{
// Logger
@@ -38,7 +36,7 @@ public class SampleSession implements We
public HashMap<String, Object> objectMap = new HashMap<String, Object>();
// Init Session
- public void init(HttpSession session, Object application)
+ public void init(SessionContext session, Object application)
{
this.application = (SampleApplication) application;
if (this.application==null)
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/actions/EmployeeDetailAction.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/actions/EmployeeDetailAction.java?rev=1026872&r1=1026871&r2=1026872&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/actions/EmployeeDetailAction.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/actions/EmployeeDetailAction.java Sun Oct 24 19:49:08 2010
@@ -26,8 +26,6 @@ import org.apache.empire.struts2.websamp
import org.apache.empire.struts2.websample.web.actiontypes.DetailAction;
import org.apache.struts2.interceptor.NoParameters;
-
-@SuppressWarnings("serial")
/**
* EmployeeDetailAction
* <p>
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/actions/EmployeeListAction.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/actions/EmployeeListAction.java?rev=1026872&r1=1026871&r2=1026872&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/actions/EmployeeListAction.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/actions/EmployeeListAction.java Sun Oct 24 19:49:08 2010
@@ -31,8 +31,6 @@ import org.apache.empire.struts2.actions
import org.apache.empire.struts2.websample.db.SampleDB;
import org.apache.empire.struts2.websample.web.actiontypes.Action;
-
-@SuppressWarnings("serial")
/**
* EmployeeListAction
* <p>
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/actions/LoginAction.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/actions/LoginAction.java?rev=1026872&r1=1026871&r2=1026872&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/actions/LoginAction.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/actions/LoginAction.java Sun Oct 24 19:49:08 2010
@@ -26,8 +26,6 @@ import org.apache.empire.struts2.websamp
import com.opensymphony.xwork2.config.entities.Parameterizable;
-
-@SuppressWarnings("serial")
public class LoginAction extends Action
implements Parameterizable // StaticParametersInterceptor
{
@@ -138,7 +136,7 @@ public class LoginAction extends Action
actionConfigParams.put(name, value);
}
- public Map getParams()
+ public Map<String, String> getParams()
{
return actionConfigParams;
}
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/actiontypes/Action.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/actiontypes/Action.java?rev=1026872&r1=1026871&r2=1026872&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/actiontypes/Action.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/actiontypes/Action.java Sun Oct 24 19:49:08 2010
@@ -31,8 +31,6 @@ import org.apache.empire.struts2.websamp
import org.apache.empire.struts2.websample.web.SampleSession;
import org.apache.empire.struts2.websample.web.SampleUser;
-
-@SuppressWarnings("serial")
public abstract class Action extends WebAction
implements SampleContext
{
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/resources/struts.xml?rev=1026872&r1=1026871&r2=1026872&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/resources/struts.xml (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/resources/struts.xml Sun Oct 24 19:49:08 2010
@@ -17,9 +17,9 @@
specific language governing permissions and limitations
under the License.
-->
-<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
- "http://struts.apache.org/dtds/struts-2.0.dtd">
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN"
+ "http://struts.apache.org/dtds/struts-2.1.7.dtd">
<struts>
<!--
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/webapp/WEB-INF/empire-tags.tld
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/webapp/WEB-INF/empire-tags.tld?rev=1026872&r1=1026871&r2=1026872&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/webapp/WEB-INF/empire-tags.tld (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/webapp/WEB-INF/empire-tags.tld Sun Oct 24 19:49:08 2010
@@ -21,7 +21,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
version="2.0">
- <tlib-version>1.0</tlib-version>
+ <tlib-version>1.1</tlib-version>
<short-name>e</short-name>
<uri>/empire-tags</uri>
<!-- Float Clear Tag -->
@@ -44,7 +44,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -61,7 +61,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -96,7 +96,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -208,7 +208,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -274,7 +274,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -307,6 +307,12 @@
<type>org.apache.empire.data.Record</type>
</attribute>
<attribute>
+ <name>recordProperty</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
<name>property</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -435,7 +441,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -470,13 +476,13 @@
<attribute>
<name>default</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -592,7 +598,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -604,13 +610,13 @@
<attribute>
<name>cssOddClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
<name>cssOddStyle</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -622,19 +628,19 @@
<attribute>
<name>currentClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
<name>columnClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
<name>columnStyle</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -727,6 +733,11 @@
<type>java.lang.String</type>
</attribute>
<attribute>
+ <name>urlType</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<name>item</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -805,7 +816,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -852,7 +863,7 @@
<attribute>
<name>currentClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -870,13 +881,13 @@
<attribute>
<name>columnClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
<name>columnStyle</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -894,7 +905,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1004,7 +1015,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1091,6 +1102,11 @@
<type>java.lang.String</type>
</attribute>
<attribute>
+ <name>urlType</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<name>item</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -1135,7 +1151,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1161,6 +1177,11 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <name>urlType</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<name>item</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -1191,7 +1212,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1252,6 +1273,11 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <name>urlType</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<name>item</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -1282,7 +1308,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1394,7 +1420,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1421,12 +1447,6 @@
<type>java.lang.String</type>
</attribute>
<attribute>
- <name>checked</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
<name>check</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -1501,7 +1521,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1528,7 +1548,7 @@
<type>java.lang.String</type>
</attribute>
<attribute>
- <name>checked</name>
+ <name>check</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
<type>java.lang.Object</type>
@@ -1546,6 +1566,12 @@
<type>java.lang.String</type>
</attribute>
<attribute>
+ <name>column</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <type>org.apache.empire.data.Column</type>
+ </attribute>
+ <attribute>
<name>record</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -1596,7 +1622,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1643,13 +1669,13 @@
<attribute>
<name>linkClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1690,7 +1716,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1749,7 +1775,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1775,6 +1801,11 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <name>urlType</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<name>item</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -1815,9 +1846,15 @@
<type>java.lang.Object</type>
</attribute>
<attribute>
+ <name>onclick</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <type>java.lang.Object</type>
+ </attribute>
+ <attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1984,7 +2021,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>