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 2006/04/26 18:44:58 UTC
svn commit: r397233 [2/2] - in /beehive/trunk/controls/test:
src/drivers/org/apache/beehive/controls/test/driver/composition/ webapps/
webapps/common/milton/resources/milton/jsp/ webapps/src/binding/
webapps/src/composition/ webapps/src/context/getothe...
Modified: beehive/trunk/controls/test/webapps/src/extension/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/src/extension/Controller.java?rev=397233&r1=397232&r2=397233&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/src/extension/Controller.java (original)
+++ beehive/trunk/controls/test/webapps/src/extension/Controller.java Wed Apr 26 09:44:55 2006
@@ -17,105 +17,96 @@
*/
package extension;
-
-import java.lang.InterruptedException;
-import java.lang.Thread;
-
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.FormData;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-
import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.api.bean.ControlBean;
+import org.apache.beehive.controls.api.events.EventHandler;
import org.apache.beehive.controls.test.controls.extension.SubControlBean;
import org.apache.beehive.controls.test.driver.extension.DriveSubControl;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
import org.apache.beehive.test.tools.milton.common.Report;
-import org.apache.beehive.controls.api.events.EventHandler;
-
-/* Test control inheritance by invoking methods on a sub control instance*/
+/**
+ * Test control inheritance by invoking methods on a sub control instance
+ */
@Jpf.Controller(
forwards = {
- @Jpf.Forward(name=Report.RESULTS,path = Report.RESULTSJSP)
- })
-public class Controller extends PageFlowController
-{
-
- private boolean superClassEventReceived=false;
- private boolean subClassEventReceived=false;
-
+ @Jpf.Forward(name = Report.RESULTS, path = Report.RESULTSJSP)
+ })
+public class Controller extends PageFlowController {
+
+ private boolean superClassEventReceived = false;
+ private boolean subClassEventReceived = false;
+
@Control
public SubControlBean subcontrol;
+ /**
+ * EventHandler that receives SuperClassEvent from subcontrol
+ */
+ @EventHandler(field = "subcontrol", eventSet = SubControlBean.SuperClassEvent.class, eventName = "method1")
+ public void subcontrolMessageHandler() {
+ superClassEventReceived = true;
+ }
+
+ /**
+ * EventHandler that receives SubClassEvent from subcontrol
+ */
+ @EventHandler(field = "subcontrol", eventSet = SubControlBean.SubClassEvent.class, eventName = "method1")
+ public void subcontrolMessageHandler2() {
+ subClassEventReceived = true;
+ }
+
+ @Jpf.Action
+ protected Forward begin() {
+ /*
+ DriveSubControl driver=new DriveSubControl();
+ driver.setControl(hellobean);
+ Report report=driver.doTest();
+ */
+ Report report = new Report();
+ report.setStatus(Report.PASS);
+ report.setMessage("This is a bogus test.");
- /** EventHandler that receives SuperClassEvent from subcontrol*/
- @EventHandler (field="subcontrol", eventSet= SubControlBean.SuperClassEvent.class,
- eventName="method1")
- public void subcontrolMessageHandler()
- {
- superClassEventReceived=true;
- }
-
- /** EventHandler that receives SubClassEvent from subcontrol*/
- @EventHandler (field="subcontrol", eventSet= SubControlBean.SubClassEvent.class,
- eventName="method1")
- public void subcontrolMessageHandler2()
- {
- subClassEventReceived=true;
- }
-
-
- @Jpf.Action(
- )
- protected Forward begin(){
- /*
- DriveSubControl driver=new DriveSubControl();
- driver.setControl(hellobean);
- Report report=driver.doTest();
- */
- Report report =new Report();
- report.setStatus(Report.PASS);
- report.setMessage("This is a bogus test.");
-
return new Forward(Report.RESULTS, Report.KEY, report);
}
+
/*
- * Invokes an inherited method on a subcontrol instantiated declaratively
- */
+ * Invokes an inherited method on a subcontrol instantiated declaratively
+ */
@Jpf.Action(
- )
- protected Forward testInheritedMethod(){
+ )
+ protected Forward testInheritedMethod() {
+
+ DriveSubControl driver = new DriveSubControl();
+ driver.setControl(subcontrol);
+ Report report = driver.doInvokeInheritedMethod();
- DriveSubControl driver=new DriveSubControl();
- driver.setControl(subcontrol);
- Report report=driver.doInvokeInheritedMethod();
-
return new Forward(Report.RESULTS, Report.KEY, report);
- }
+ }
/*
- * Invokes an inherited method on a subcontrol instantiated programmatically
- */
+ * Invokes an inherited method on a subcontrol instantiated programmatically
+ */
@Jpf.Action(
- )
- protected Forward testInheritedMethodP(){
+ )
+ protected Forward testInheritedMethodP() {
- DriveSubControl driver=new DriveSubControl();
- Report report=new Report();
- try{
- SubControlBean subbean=(SubControlBean)java.beans.Beans.instantiate(
- Thread.currentThread().getContextClassLoader() ,
- "org.apache.beehive.controls.test.controls.extension.SubControlBean");
- driver.setControl(subbean);
- report=driver.doInvokeInheritedMethod();
- }
- catch(Exception e){
-
- report.setStatus(Report.FAIL);
- report.setExceptionStack(e);
+ DriveSubControl driver = new DriveSubControl();
+ Report report = new Report();
+ try {
+ SubControlBean subbean = (SubControlBean) java.beans.Beans.instantiate(
+ Thread.currentThread().getContextClassLoader(),
+ "org.apache.beehive.controls.test.controls.extension.SubControlBean");
+ driver.setControl(subbean);
+ report = driver.doInvokeInheritedMethod();
}
-
+ catch (Exception e) {
+
+ report.setStatus(Report.FAIL);
+ report.setExceptionStack(e);
+ }
+
return new Forward(Report.RESULTS, Report.KEY, report);
}
@@ -123,342 +114,341 @@
* Invokes an extended method on a subcontrol instantiated declaratively
*/
@Jpf.Action(
- )
- protected Forward testExtendedMethod(){
-
- DriveSubControl driver=new DriveSubControl();
- driver.setControl(subcontrol);
- Report report=driver.doInvokeExtendedMethod();
-
+ )
+ protected Forward testExtendedMethod() {
+
+ DriveSubControl driver = new DriveSubControl();
+ driver.setControl(subcontrol);
+ Report report = driver.doInvokeExtendedMethod();
+
return new Forward(Report.RESULTS, Report.KEY, report);
- }
+ }
/*
- * Invokes an extended method on a subcontrol instantiated programmatically
- */
+ * Invokes an extended method on a subcontrol instantiated programmatically
+ */
@Jpf.Action(
- )
- protected Forward testExtendedMethodP(){
+ )
+ protected Forward testExtendedMethodP() {
- DriveSubControl driver=new DriveSubControl();
- Report report=new Report();
- try{
- SubControlBean subbean=(SubControlBean)java.beans.Beans.instantiate(
- Thread.currentThread().getContextClassLoader() ,
- "org.apache.beehive.controls.test.controls.extension.SubControlBean");
- driver.setControl(subbean);
- report=driver.doInvokeExtendedMethod();
+ DriveSubControl driver = new DriveSubControl();
+ Report report = new Report();
+ try {
+ SubControlBean subbean = (SubControlBean) java.beans.Beans.instantiate(
+ Thread.currentThread().getContextClassLoader(),
+ "org.apache.beehive.controls.test.controls.extension.SubControlBean");
+ driver.setControl(subbean);
+ report = driver.doInvokeExtendedMethod();
}
- catch(Exception e){
-
- report.setStatus(Report.FAIL);
- report.setExceptionStack(e);
+ catch (Exception e) {
+
+ report.setStatus(Report.FAIL);
+ report.setExceptionStack(e);
}
-
+
return new Forward(Report.RESULTS, Report.KEY, report);
}
@Jpf.Action(
- )
- protected Forward testGetInheritedPropertyByContext(){
-
- DriveSubControl driver=new DriveSubControl();
- driver.setControl(subcontrol);
- Report report=driver.doGetInheritedPropertyByContext();
-
+ )
+ protected Forward testGetInheritedPropertyByContext() {
+
+ DriveSubControl driver = new DriveSubControl();
+ driver.setControl(subcontrol);
+ Report report = driver.doGetInheritedPropertyByContext();
+
return new Forward(Report.RESULTS, Report.KEY, report);
- }
+ }
@Jpf.Action(
- )
- protected Forward testGetInheritedPropertyByContextP(){
-
- DriveSubControl driver=new DriveSubControl();
- Report report=new Report();
- try{
- SubControlBean subbean=(SubControlBean)java.beans.Beans.instantiate(
- Thread.currentThread().getContextClassLoader() ,
- "org.apache.beehive.controls.test.controls.extension.SubControlBean");
- driver.setControl(subbean);
- report=driver.doGetInheritedPropertyByContext();
+ )
+ protected Forward testGetInheritedPropertyByContextP() {
+
+ DriveSubControl driver = new DriveSubControl();
+ Report report = new Report();
+ try {
+ SubControlBean subbean = (SubControlBean) java.beans.Beans.instantiate(
+ Thread.currentThread().getContextClassLoader(),
+ "org.apache.beehive.controls.test.controls.extension.SubControlBean");
+ driver.setControl(subbean);
+ report = driver.doGetInheritedPropertyByContext();
}
- catch(Exception e){
-
- report.setStatus(Report.FAIL);
- report.setExceptionStack(e);
+ catch (Exception e) {
+
+ report.setStatus(Report.FAIL);
+ report.setExceptionStack(e);
}
- return new Forward(Report.RESULTS, Report.KEY, report);
+ return new Forward(Report.RESULTS, Report.KEY, report);
}
@Jpf.Action(
- )
- protected Forward testGetInheritedPropertyByGetter(){
-
- DriveSubControl driver=new DriveSubControl();
- driver.setControl(subcontrol);
- Report report=driver.doGetInheritedPropertyByGetter();
-
+ )
+ protected Forward testGetInheritedPropertyByGetter() {
+
+ DriveSubControl driver = new DriveSubControl();
+ driver.setControl(subcontrol);
+ Report report = driver.doGetInheritedPropertyByGetter();
+
return new Forward(Report.RESULTS, Report.KEY, report);
}
@Jpf.Action(
- )
- protected Forward testGetInheritedPropertyByGetterP(){
-
- DriveSubControl driver=new DriveSubControl();
- Report report=new Report();
- try{
- SubControlBean subbean=(SubControlBean)java.beans.Beans.instantiate(
- Thread.currentThread().getContextClassLoader() ,
- "org.apache.beehive.controls.test.controls.extension.SubControlBean");
- driver.setControl(subbean);
- report=driver.doGetInheritedPropertyByGetter();
+ )
+ protected Forward testGetInheritedPropertyByGetterP() {
+
+ DriveSubControl driver = new DriveSubControl();
+ Report report = new Report();
+ try {
+ SubControlBean subbean = (SubControlBean) java.beans.Beans.instantiate(
+ Thread.currentThread().getContextClassLoader(),
+ "org.apache.beehive.controls.test.controls.extension.SubControlBean");
+ driver.setControl(subbean);
+ report = driver.doGetInheritedPropertyByGetter();
}
- catch(Exception e){
-
- report.setStatus(Report.FAIL);
- report.setExceptionStack(e);
+ catch (Exception e) {
+
+ report.setStatus(Report.FAIL);
+ report.setExceptionStack(e);
}
- return new Forward(Report.RESULTS, Report.KEY, report);
+ return new Forward(Report.RESULTS, Report.KEY, report);
}
@Jpf.Action(
- )
- protected Forward testSetInheritedPropertyBySetter(){
-
- DriveSubControl driver=new DriveSubControl();
- driver.setControl(subcontrol);
- Report report=driver.doSetInheritedPropertyBySetter();
-
+ )
+ protected Forward testSetInheritedPropertyBySetter() {
+
+ DriveSubControl driver = new DriveSubControl();
+ driver.setControl(subcontrol);
+ Report report = driver.doSetInheritedPropertyBySetter();
+
return new Forward(Report.RESULTS, Report.KEY, report);
}
@Jpf.Action(
- )
- protected Forward testSetInheritedPropertyBySetterP(){
-
- DriveSubControl driver=new DriveSubControl();
- Report report=new Report();
- try{
- SubControlBean subbean=(SubControlBean)java.beans.Beans.instantiate(
- Thread.currentThread().getContextClassLoader() ,
- "org.apache.beehive.controls.test.controls.extension.SubControlBean");
- driver.setControl(subbean);
- report=driver.doSetInheritedPropertyBySetter();
+ )
+ protected Forward testSetInheritedPropertyBySetterP() {
+
+ DriveSubControl driver = new DriveSubControl();
+ Report report = new Report();
+ try {
+ SubControlBean subbean = (SubControlBean) java.beans.Beans.instantiate(
+ Thread.currentThread().getContextClassLoader(),
+ "org.apache.beehive.controls.test.controls.extension.SubControlBean");
+ driver.setControl(subbean);
+ report = driver.doSetInheritedPropertyBySetter();
}
- catch(Exception e){
-
- report.setStatus(Report.FAIL);
- report.setExceptionStack(e);
+ catch (Exception e) {
+
+ report.setStatus(Report.FAIL);
+ report.setExceptionStack(e);
}
- return new Forward(Report.RESULTS, Report.KEY, report);
+ return new Forward(Report.RESULTS, Report.KEY, report);
}
-
@Jpf.Action(
- )
- protected Forward testGetExtendedPropertyByContext(){
-
- DriveSubControl driver=new DriveSubControl();
- driver.setControl(subcontrol);
- Report report=driver.doGetExtendedPropertyByContext();
-
+ )
+ protected Forward testGetExtendedPropertyByContext() {
+
+ DriveSubControl driver = new DriveSubControl();
+ driver.setControl(subcontrol);
+ Report report = driver.doGetExtendedPropertyByContext();
+
return new Forward(Report.RESULTS, Report.KEY, report);
}
@Jpf.Action(
- )
- protected Forward testGetExtendedPropertyByContextP(){
-
- DriveSubControl driver=new DriveSubControl();
- Report report=new Report();
- try{
- SubControlBean subbean=(SubControlBean)java.beans.Beans.instantiate(
- Thread.currentThread().getContextClassLoader() ,
- "org.apache.beehive.controls.test.controls.extension.SubControlBean");
- driver.setControl(subbean);
- report=driver.doGetExtendedPropertyByContext();
- }
- catch(Exception e){
-
- report.setStatus(Report.FAIL);
- report.setExceptionStack(e);
+ )
+ protected Forward testGetExtendedPropertyByContextP() {
+
+ DriveSubControl driver = new DriveSubControl();
+ Report report = new Report();
+ try {
+ SubControlBean subbean = (SubControlBean) java.beans.Beans.instantiate(
+ Thread.currentThread().getContextClassLoader(),
+ "org.apache.beehive.controls.test.controls.extension.SubControlBean");
+ driver.setControl(subbean);
+ report = driver.doGetExtendedPropertyByContext();
+ }
+ catch (Exception e) {
+
+ report.setStatus(Report.FAIL);
+ report.setExceptionStack(e);
}
- return new Forward(Report.RESULTS, Report.KEY, report);
+ return new Forward(Report.RESULTS, Report.KEY, report);
}
-
+
@Jpf.Action(
- )
- protected Forward testGetExtendedPropertyByGetter(){
-
- DriveSubControl driver=new DriveSubControl();
- driver.setControl(subcontrol);
- Report report=driver.doGetExtendedPropertyByGetter();
-
+ )
+ protected Forward testGetExtendedPropertyByGetter() {
+
+ DriveSubControl driver = new DriveSubControl();
+ driver.setControl(subcontrol);
+ Report report = driver.doGetExtendedPropertyByGetter();
+
return new Forward(Report.RESULTS, Report.KEY, report);
}
@Jpf.Action(
- )
- protected Forward testGetExtendedPropertyByGetterP(){
-
- DriveSubControl driver=new DriveSubControl();
- Report report=new Report();
- try{
- SubControlBean subbean=(SubControlBean)java.beans.Beans.instantiate(
- Thread.currentThread().getContextClassLoader() ,
- "org.apache.beehive.controls.test.controls.extension.SubControlBean");
- driver.setControl(subbean);
- report=driver.doGetExtendedPropertyByGetter();
- }
- catch(Exception e){
-
- report.setStatus(Report.FAIL);
- report.setExceptionStack(e);
+ )
+ protected Forward testGetExtendedPropertyByGetterP() {
+
+ DriveSubControl driver = new DriveSubControl();
+ Report report = new Report();
+ try {
+ SubControlBean subbean = (SubControlBean) java.beans.Beans.instantiate(
+ Thread.currentThread().getContextClassLoader(),
+ "org.apache.beehive.controls.test.controls.extension.SubControlBean");
+ driver.setControl(subbean);
+ report = driver.doGetExtendedPropertyByGetter();
}
+ catch (Exception e) {
- return new Forward(Report.RESULTS, Report.KEY, report);
+ report.setStatus(Report.FAIL);
+ report.setExceptionStack(e);
+ }
+
+ return new Forward(Report.RESULTS, Report.KEY, report);
}
-
+
@Jpf.Action(
- )
- protected Forward testSetExtendedPropertyBySetter(){
-
- DriveSubControl driver=new DriveSubControl();
- driver.setControl(subcontrol);
- Report report=driver.doSetExtendedPropertyBySetter();
-
+ )
+ protected Forward testSetExtendedPropertyBySetter() {
+
+ DriveSubControl driver = new DriveSubControl();
+ driver.setControl(subcontrol);
+ Report report = driver.doSetExtendedPropertyBySetter();
+
return new Forward(Report.RESULTS, Report.KEY, report);
}
@Jpf.Action(
- )
- protected Forward testSetExtendedPropertyBySetterP(){
-
- DriveSubControl driver=new DriveSubControl();
- Report report=new Report();
- try{
- SubControlBean subbean=(SubControlBean)java.beans.Beans.instantiate(
- Thread.currentThread().getContextClassLoader() ,
- "org.apache.beehive.controls.test.controls.extension.SubControlBean");
- driver.setControl(subbean);
- report=driver.doSetExtendedPropertyBySetter();
+ )
+ protected Forward testSetExtendedPropertyBySetterP() {
+
+ DriveSubControl driver = new DriveSubControl();
+ Report report = new Report();
+ try {
+ SubControlBean subbean = (SubControlBean) java.beans.Beans.instantiate(
+ Thread.currentThread().getContextClassLoader(),
+ "org.apache.beehive.controls.test.controls.extension.SubControlBean");
+ driver.setControl(subbean);
+ report = driver.doSetExtendedPropertyBySetter();
}
- catch(Exception e){
-
- report.setStatus(Report.FAIL);
- report.setExceptionStack(e);
+ catch (Exception e) {
+
+ report.setStatus(Report.FAIL);
+ report.setExceptionStack(e);
}
- return new Forward(Report.RESULTS, Report.KEY, report);
+ return new Forward(Report.RESULTS, Report.KEY, report);
}
@Jpf.Action(
- )
- protected Forward testGetReconfiguredPropertyByContext(){
-
- DriveSubControl driver=new DriveSubControl();
- driver.setControl(subcontrol);
- Report report=driver.doGetReconfiguredPropertyByContext();
-
+ )
+ protected Forward testGetReconfiguredPropertyByContext() {
+
+ DriveSubControl driver = new DriveSubControl();
+ driver.setControl(subcontrol);
+ Report report = driver.doGetReconfiguredPropertyByContext();
+
return new Forward(Report.RESULTS, Report.KEY, report);
}
@Jpf.Action(
- )
- protected Forward testGetReconfiguredPropertyByContextP(){
-
- DriveSubControl driver=new DriveSubControl();
- Report report=new Report();
- try{
- SubControlBean subbean=(SubControlBean)java.beans.Beans.instantiate(
- Thread.currentThread().getContextClassLoader() ,
- "org.apache.beehive.controls.test.controls.extension.SubControlBean");
- driver.setControl(subbean);
- report=driver.doGetReconfiguredPropertyByContext();
+ )
+ protected Forward testGetReconfiguredPropertyByContextP() {
+
+ DriveSubControl driver = new DriveSubControl();
+ Report report = new Report();
+ try {
+ SubControlBean subbean = (SubControlBean) java.beans.Beans.instantiate(
+ Thread.currentThread().getContextClassLoader(),
+ "org.apache.beehive.controls.test.controls.extension.SubControlBean");
+ driver.setControl(subbean);
+ report = driver.doGetReconfiguredPropertyByContext();
}
- catch(Exception e){
-
- report.setStatus(Report.FAIL);
- report.setExceptionStack(e);
+ catch (Exception e) {
+
+ report.setStatus(Report.FAIL);
+ report.setExceptionStack(e);
}
- return new Forward(Report.RESULTS, Report.KEY, report);
+ return new Forward(Report.RESULTS, Report.KEY, report);
}
@Jpf.Action(
- )
- protected Forward testGetReconfiguredPropertyByGetter(){
-
- DriveSubControl driver=new DriveSubControl();
- driver.setControl(subcontrol);
- Report report=driver.doGetReconfiguredPropertyByGetter();
-
+ )
+ protected Forward testGetReconfiguredPropertyByGetter() {
+
+ DriveSubControl driver = new DriveSubControl();
+ driver.setControl(subcontrol);
+ Report report = driver.doGetReconfiguredPropertyByGetter();
+
return new Forward(Report.RESULTS, Report.KEY, report);
}
@Jpf.Action(
- )
- protected Forward testGetReconfiguredPropertyByGetterP(){
-
- DriveSubControl driver=new DriveSubControl();
- Report report=new Report();
- try{
- SubControlBean subbean=(SubControlBean)java.beans.Beans.instantiate(
- Thread.currentThread().getContextClassLoader() ,
- "org.apache.beehive.controls.test.controls.extension.SubControlBean");
- driver.setControl(subbean);
- report=driver.doGetReconfiguredPropertyByGetter();
+ )
+ protected Forward testGetReconfiguredPropertyByGetterP() {
+
+ DriveSubControl driver = new DriveSubControl();
+ Report report = new Report();
+ try {
+ SubControlBean subbean = (SubControlBean) java.beans.Beans.instantiate(
+ Thread.currentThread().getContextClassLoader(),
+ "org.apache.beehive.controls.test.controls.extension.SubControlBean");
+ driver.setControl(subbean);
+ report = driver.doGetReconfiguredPropertyByGetter();
}
- catch(Exception e){
-
- report.setStatus(Report.FAIL);
- report.setExceptionStack(e);
+ catch (Exception e) {
+
+ report.setStatus(Report.FAIL);
+ report.setExceptionStack(e);
}
- return new Forward(Report.RESULTS, Report.KEY, report);
+ return new Forward(Report.RESULTS, Report.KEY, report);
}
@Jpf.Action(
- )
- protected Forward testSetReconfiguredPropertyBySetter(){
-
- DriveSubControl driver=new DriveSubControl();
- driver.setControl(subcontrol);
- Report report=driver.doSetReconfiguredPropertyBySetter();
-
+ )
+ protected Forward testSetReconfiguredPropertyBySetter() {
+
+ DriveSubControl driver = new DriveSubControl();
+ driver.setControl(subcontrol);
+ Report report = driver.doSetReconfiguredPropertyBySetter();
+
return new Forward(Report.RESULTS, Report.KEY, report);
}
@Jpf.Action(
- )
- protected Forward testSetReconfiguredPropertyBySetterP(){
-
- DriveSubControl driver=new DriveSubControl();
- Report report=new Report();
- try{
- SubControlBean subbean=(SubControlBean)java.beans.Beans.instantiate(
- Thread.currentThread().getContextClassLoader() ,
- "org.apache.beehive.controls.test.controls.extension.SubControlBean");
- driver.setControl(subbean);
- report=driver.doSetReconfiguredPropertyBySetter();
- }
- catch(Exception e){
-
- report.setStatus(Report.FAIL);
- report.setExceptionStack(e);
+ )
+ protected Forward testSetReconfiguredPropertyBySetterP() {
+
+ DriveSubControl driver = new DriveSubControl();
+ Report report = new Report();
+ try {
+ SubControlBean subbean = (SubControlBean) java.beans.Beans.instantiate(
+ Thread.currentThread().getContextClassLoader(),
+ "org.apache.beehive.controls.test.controls.extension.SubControlBean");
+ driver.setControl(subbean);
+ report = driver.doSetReconfiguredPropertyBySetter();
}
+ catch (Exception e) {
- return new Forward(Report.RESULTS, Report.KEY, report);
+ report.setStatus(Report.FAIL);
+ report.setExceptionStack(e);
+ }
+
+ return new Forward(Report.RESULTS, Report.KEY, report);
}
/*
@@ -467,52 +457,53 @@
}
*/
@Jpf.Action(
- )
- protected Forward testInvokeExtendedEvent(){
-
- Report report=new Report();
- int result=subcontrol.invokeExtendedEventFromSubControl();
- try{Thread.currentThread().sleep(500);}
- catch(InterruptedException e){}
- if (result==0){
- if (subClassEventReceived)
- report.setStatus(Report.PASS);
- else{
- report.setStatus(Report.FAIL);
- report.setMessage("The inherited event is NOT received");
- }
-
- }
- else{
- report.setStatus(Report.FAIL);
- report.setMessage("The event on subcontrol is not triggered successfully");
- }
+ )
+ protected Forward testInvokeExtendedEvent() {
+
+ Report report = new Report();
+ int result = subcontrol.invokeExtendedEventFromSubControl();
+ try {
+ Thread.currentThread().sleep(500);
+ }
+ catch (InterruptedException e) {
+ }
+ if (result == 0) {
+ if (subClassEventReceived)
+ report.setStatus(Report.PASS);
+ else {
+ report.setStatus(Report.FAIL);
+ report.setMessage("The inherited event is NOT received");
+ }
+
+ } else {
+ report.setStatus(Report.FAIL);
+ report.setMessage("The event on subcontrol is not triggered successfully");
+ }
return new Forward(Report.RESULTS, Report.KEY, report);
}
@Jpf.Action(
- )
- protected Forward testInvokeInheritedEvent(){
-
- Report report=new Report();
- int result=subcontrol.invokeInheritedEventFromSubControl();
-
- if (result==0){
- if (superClassEventReceived)
- report.setStatus(Report.PASS);
- else{
- report.setStatus(Report.FAIL);
- report.setMessage("The extended event is NOT received");
- }
-
- }
- else{
- report.setStatus(Report.FAIL);
- report.setMessage("The event on subcontrol is not triggered successfully");
- }
+ )
+ protected Forward testInvokeInheritedEvent() {
+
+ Report report = new Report();
+ int result = subcontrol.invokeInheritedEventFromSubControl();
+
+ if (result == 0) {
+ if (superClassEventReceived)
+ report.setStatus(Report.PASS);
+ else {
+ report.setStatus(Report.FAIL);
+ report.setMessage("The extended event is NOT received");
+ }
+
+ } else {
+ report.setStatus(Report.FAIL);
+ report.setMessage("The event on subcontrol is not triggered successfully");
+ }
return new Forward(Report.RESULTS, Report.KEY, report);
}
-
+
}
Modified: beehive/trunk/controls/test/webapps/src/instantiate/declarewithproperty/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/src/instantiate/declarewithproperty/Controller.java?rev=397233&r1=397232&r2=397233&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/src/instantiate/declarewithproperty/Controller.java (original)
+++ beehive/trunk/controls/test/webapps/src/instantiate/declarewithproperty/Controller.java Wed Apr 26 09:44:55 2006
@@ -17,42 +17,35 @@
*/
package instantiate.declarewithproperty;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.FormData;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-
import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.api.bean.ControlBean;
import org.apache.beehive.controls.test.controls.property.SingleProperty;
import org.apache.beehive.controls.test.controls.property.SinglePropertyBean;
import org.apache.beehive.controls.test.driver.instantiate.DriveSingleProperty;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
import org.apache.beehive.test.tools.milton.common.Report;
-/* Instantiate a custom control declaratively with property*/
-
+/**
+ * Instantiate a custom control declaratively with property
+ */
@Jpf.Controller(
forwards = {
- @Jpf.Forward(name=Report.RESULTS,path = Report.RESULTSJSP)
- })
-public class Controller extends PageFlowController
-{
+ @Jpf.Forward(name = Report.RESULTS, path = Report.RESULTSJSP)
+ })
+public class Controller extends PageFlowController {
@Control
- @SingleProperty.Greeting(GreetWord="Good evening!")
+ @SingleProperty.Greeting(GreetWord = "Good evening!")
public SinglePropertyBean myPropertyBean;
-
- /**
- * @jpf:action
- */
- @Jpf.Action(
- )
- protected Forward begin(){
-
- DriveSingleProperty driver=new DriveSingleProperty();
- driver.setControl(myPropertyBean);
- Report report=driver.doTest();
-
+
+ @Jpf.Action
+ protected Forward begin() {
+
+ DriveSingleProperty driver = new DriveSingleProperty();
+ driver.setControl(myPropertyBean);
+ Report report = driver.doTest();
+
return new Forward(Report.RESULTS, Report.KEY, report);
}
Modified: beehive/trunk/controls/test/webapps/src/instantiate/programwithproperty/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/src/instantiate/programwithproperty/Controller.java?rev=397233&r1=397232&r2=397233&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/src/instantiate/programwithproperty/Controller.java (original)
+++ beehive/trunk/controls/test/webapps/src/instantiate/programwithproperty/Controller.java Wed Apr 26 09:44:55 2006
@@ -17,45 +17,43 @@
*/
package instantiate.programwithproperty;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.FormData;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-
import org.apache.beehive.controls.api.bean.Controls;
import org.apache.beehive.controls.api.properties.BeanPropertyMap;
import org.apache.beehive.controls.test.controls.property.SingleProperty;
import org.apache.beehive.controls.test.controls.property.SinglePropertyBean;
import org.apache.beehive.controls.test.driver.instantiate.DriveSingleProperty;
-
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
import org.apache.beehive.test.tools.milton.common.Report;
-/* Instantiate a custom control programmatically with property*/
-
+/**
+ * Instantiate a custom control programmatically with property
+ */
@Jpf.Controller(
forwards = {
- @Jpf.Forward(name=Report.RESULTS,path = Report.RESULTSJSP)
- })
+ @Jpf.Forward(name = Report.RESULTS, path = Report.RESULTSJSP)
+ })
public class Controller
extends PageFlowController {
@Jpf.Action()
- protected Forward begin(){
-
- Report report=new Report();
- try{
+ protected Forward begin() {
+
+ Report report = new Report();
+ try {
BeanPropertyMap greetAttr = new BeanPropertyMap(SingleProperty.Greeting.class);
- greetAttr.setProperty(SinglePropertyBean.GreetWordKey,"Good afternoon!");
- SinglePropertyBean spbean = (SinglePropertyBean)Controls.instantiate(
+ greetAttr.setProperty(SinglePropertyBean.GreetWordKey, "Good afternoon!");
+ SinglePropertyBean spbean = (SinglePropertyBean) Controls.instantiate(
Thread.currentThread().getContextClassLoader(),
"org.apache.beehive.controls.test.controls.property.SinglePropertyBean",
greetAttr);
- DriveSingleProperty driver=new DriveSingleProperty();
+ DriveSingleProperty driver = new DriveSingleProperty();
driver.setControl(spbean);
- report=driver.doTestReconfiguredProperty("Good afternoon!");
+ report = driver.doTestReconfiguredProperty("Good afternoon!");
}
- catch(Exception e){
+ catch (Exception e) {
report.setStatus(Report.FAIL);
report.setExceptionStack(e);
}
Modified: beehive/trunk/controls/test/webapps/src/property/client_access/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/src/property/client_access/Controller.java?rev=397233&r1=397232&r2=397233&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/src/property/client_access/Controller.java (original)
+++ beehive/trunk/controls/test/webapps/src/property/client_access/Controller.java Wed Apr 26 09:44:55 2006
@@ -17,47 +17,39 @@
*/
package property.client_access;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.FormData;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-
import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.api.bean.ControlBean;
import org.apache.beehive.controls.test.controls.property.PropertyControlBean;
import org.apache.beehive.controls.test.driver.property.DriveGetters;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
import org.apache.beehive.test.tools.milton.common.Report;
-/* Tests client getting control property via getter/setter on control bean
+/**
+ * Tests client getting control property via getter/setter on control bean
* The control bean is instantiated declaratively
*/
-
@Jpf.Controller(
forwards = {
- @Jpf.Forward(name=Report.RESULTS,path = Report.RESULTSJSP)
- })
-public class Controller extends PageFlowController
-{
+ @Jpf.Forward(name = Report.RESULTS, path = Report.RESULTSJSP)
+ })
+public class Controller extends PageFlowController {
@Control
public PropertyControlBean myControl;
-
- /**
- * @jpf:action
- */
- @Jpf.Action(
- )
- protected Forward begin(){
-
- Report report=new Report();
- DriveGetters driver=new DriveGetters();
- try{
- driver.setControl(myControl);
- report=driver.doTest();
+
+ @Jpf.Action
+ protected Forward begin() {
+
+ Report report = new Report();
+ DriveGetters driver = new DriveGetters();
+ try {
+ driver.setControl(myControl);
+ report = driver.doTest();
}
- catch(Exception e){
-
- report.setStatus(Report.FAIL);
- report.setExceptionStack(e);
+ catch (Exception e) {
+
+ report.setStatus(Report.FAIL);
+ report.setExceptionStack(e);
}
return new Forward(Report.RESULTS, Report.KEY, report);
}
Modified: beehive/trunk/controls/test/webapps/src/property/client_access2/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/src/property/client_access2/Controller.java?rev=397233&r1=397232&r2=397233&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/src/property/client_access2/Controller.java (original)
+++ beehive/trunk/controls/test/webapps/src/property/client_access2/Controller.java Wed Apr 26 09:44:55 2006
@@ -17,49 +17,41 @@
*/
package property.client_access2;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.FormData;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-
import java.beans.Beans;
-import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.api.bean.ControlBean;
+
import org.apache.beehive.controls.test.controls.property.PropertyControlBean;
import org.apache.beehive.controls.test.driver.property.DriveGetters;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
import org.apache.beehive.test.tools.milton.common.Report;
-/* Tests client getting control property via getter/setter on control bean.
+/**
+ * Tests client getting control property via getter/setter on control bean.
* The control bean is instantiated programmatically.
*/
-
@Jpf.Controller(
forwards = {
- @Jpf.Forward(name=Report.RESULTS,path = Report.RESULTSJSP)
- })
-public class Controller extends PageFlowController
-{
-
- /**
- * @jpf:action
- */
- @Jpf.Action(
- )
- protected Forward begin(){
-
- Report report=new Report();
- DriveGetters driver=new DriveGetters();
- try{
- PropertyControlBean thebean=(PropertyControlBean)Beans.instantiate(
- Thread.currentThread().getContextClassLoader() ,
- "org.apache.beehive.controls.test.controls.property.PropertyControlBean");
- driver.setControl(thebean);
- report=driver.doTest();
+ @Jpf.Forward(name = Report.RESULTS, path = Report.RESULTSJSP)
+ })
+public class Controller extends PageFlowController {
+
+ @Jpf.Action
+ protected Forward begin() {
+
+ Report report = new Report();
+ DriveGetters driver = new DriveGetters();
+ try {
+ PropertyControlBean thebean = (PropertyControlBean) Beans.instantiate(
+ Thread.currentThread().getContextClassLoader(),
+ "org.apache.beehive.controls.test.controls.property.PropertyControlBean");
+ driver.setControl(thebean);
+ report = driver.doTest();
}
- catch(Exception e){
-
- report.setStatus(Report.FAIL);
- report.setExceptionStack(e);
+ catch (Exception e) {
+
+ report.setStatus(Report.FAIL);
+ report.setExceptionStack(e);
}
return new Forward(Report.RESULTS, Report.KEY, report);
}
Modified: beehive/trunk/controls/test/webapps/src/property/client_impl/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/src/property/client_impl/Controller.java?rev=397233&r1=397232&r2=397233&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/src/property/client_impl/Controller.java (original)
+++ beehive/trunk/controls/test/webapps/src/property/client_impl/Controller.java Wed Apr 26 09:44:55 2006
@@ -17,28 +17,24 @@
*/
package property.client_impl;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.FormData;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-
import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.api.bean.ControlBean;
import org.apache.beehive.controls.test.controls.property.PropertyControlBean;
import org.apache.beehive.controls.test.driver.property.DriveSetters;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
import org.apache.beehive.test.tools.milton.common.Report;
-/* Tests getting and setting control property via control context on control implementation
+/**
+ * Tests getting and setting control property via control context on control implementation
* and getter/setter on control bean class.
* The custom control is instantiated declaratively
*/
-
@Jpf.Controller(
forwards = {
- @Jpf.Forward(name=Report.RESULTS,path = Report.RESULTSJSP)
- })
-public class Controller extends PageFlowController
-{
+ @Jpf.Forward(name = Report.RESULTS, path = Report.RESULTSJSP)
+ })
+public class Controller extends PageFlowController {
/**
* A control that declares some propertySets in its control interface.
@@ -47,24 +43,19 @@
@Control
public PropertyControlBean myControl;
-
- /**
- * @jpf:action
- */
- @Jpf.Action(
- )
- protected Forward begin(){
-
- Report report=new Report();
- try{
- DriveSetters driver=new DriveSetters();
- driver.setControl(myControl);
- report=driver.doTest();
+ @Jpf.Action
+ protected Forward begin() {
+
+ Report report = new Report();
+ try {
+ DriveSetters driver = new DriveSetters();
+ driver.setControl(myControl);
+ report = driver.doTest();
}
- catch(Exception e){
-
- report.setStatus(Report.FAIL);
- report.setExceptionStack(e);
+ catch (Exception e) {
+
+ report.setStatus(Report.FAIL);
+ report.setExceptionStack(e);
}
return new Forward(Report.RESULTS, Report.KEY, report);
}
Modified: beehive/trunk/controls/test/webapps/src/property/client_impl2/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/src/property/client_impl2/Controller.java?rev=397233&r1=397232&r2=397233&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/src/property/client_impl2/Controller.java (original)
+++ beehive/trunk/controls/test/webapps/src/property/client_impl2/Controller.java Wed Apr 26 09:44:55 2006
@@ -17,50 +17,42 @@
*/
package property.client_impl2;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.FormData;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-
import java.beans.Beans;
-import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.api.bean.ControlBean;
+
import org.apache.beehive.controls.test.controls.property.PropertyControlBean;
import org.apache.beehive.controls.test.driver.property.DriveSetters;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
import org.apache.beehive.test.tools.milton.common.Report;
-/* Tests getting and setting control property via control context on control implementation
+/**
+ * Tests getting and setting control property via control context on control implementation
* and getter/setter on control bean class.
* The custom control is instantiated programmatically
*/
-
@Jpf.Controller(
forwards = {
- @Jpf.Forward(name=Report.RESULTS,path = Report.RESULTSJSP)
- })
-public class Controller extends PageFlowController
-{
+ @Jpf.Forward(name = Report.RESULTS, path = Report.RESULTSJSP)
+ })
+public class Controller extends PageFlowController {
- /**
- * @jpf:action
- */
- @Jpf.Action(
- )
- protected Forward begin(){
-
- Report report=new Report();
- DriveSetters driver =new DriveSetters();
- try{
- PropertyControlBean thebean=(PropertyControlBean)Beans.instantiate(
- Thread.currentThread().getContextClassLoader(),
- "org.apache.beehive.controls.test.controls.property.PropertyControlBean");
- driver.setControl(thebean);
- report=driver.doTest();
+ @Jpf.Action
+ protected Forward begin() {
+
+ Report report = new Report();
+ DriveSetters driver = new DriveSetters();
+ try {
+ PropertyControlBean thebean = (PropertyControlBean) Beans.instantiate(
+ Thread.currentThread().getContextClassLoader(),
+ "org.apache.beehive.controls.test.controls.property.PropertyControlBean");
+ driver.setControl(thebean);
+ report = driver.doTest();
}
- catch(Exception e){
-
- report.setStatus(Report.FAIL);
- report.setExceptionStack(e);
+ catch (Exception e) {
+
+ report.setStatus(Report.FAIL);
+ report.setExceptionStack(e);
}
return new Forward(Report.RESULTS, Report.KEY, report);
}
Modified: beehive/trunk/controls/test/webapps/src/property/impl_access/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/src/property/impl_access/Controller.java?rev=397233&r1=397232&r2=397233&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/src/property/impl_access/Controller.java (original)
+++ beehive/trunk/controls/test/webapps/src/property/impl_access/Controller.java Wed Apr 26 09:44:55 2006
@@ -17,27 +17,23 @@
*/
package property.impl_access;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.FormData;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-
import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.api.bean.ControlBean;
import org.apache.beehive.controls.test.controls.property.PropertyControlBean;
import org.apache.beehive.controls.test.driver.property.DriveContextAccess;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
import org.apache.beehive.test.tools.milton.common.Report;
-/* Tests getting control property via control context on control implementation class
+/**
+ * Tests getting control property via control context on control implementation class
* The custom control is instantiated declaratively
*/
-
@Jpf.Controller(
forwards = {
- @Jpf.Forward(name=Report.RESULTS,path = Report.RESULTSJSP)
- })
-public class Controller extends PageFlowController
-{
+ @Jpf.Forward(name = Report.RESULTS, path = Report.RESULTSJSP)
+ })
+public class Controller extends PageFlowController {
/**
* A control that declares some propertySets in its control interface.
@@ -46,24 +42,20 @@
@Control
public PropertyControlBean myControl;
-
- /**
- * @jpf:action
- */
@Jpf.Action(
- )
- protected Forward begin(){
-
- Report report=new Report();
- try{
- DriveContextAccess driver=new DriveContextAccess();
- driver.setControl(myControl);
- report=driver.doTest();
+ )
+ protected Forward begin() {
+
+ Report report = new Report();
+ try {
+ DriveContextAccess driver = new DriveContextAccess();
+ driver.setControl(myControl);
+ report = driver.doTest();
}
- catch(Exception e){
-
- report.setStatus(Report.FAIL);
- report.setExceptionStack(e);
+ catch (Exception e) {
+
+ report.setStatus(Report.FAIL);
+ report.setExceptionStack(e);
}
return new Forward(Report.RESULTS, Report.KEY, report);
}
Modified: beehive/trunk/controls/test/webapps/src/property/impl_access2/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/src/property/impl_access2/Controller.java?rev=397233&r1=397232&r2=397233&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/src/property/impl_access2/Controller.java (original)
+++ beehive/trunk/controls/test/webapps/src/property/impl_access2/Controller.java Wed Apr 26 09:44:55 2006
@@ -17,16 +17,13 @@
*/
package property.impl_access2;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.FormData;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-
import java.beans.Beans;
-import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.api.bean.ControlBean;
+
import org.apache.beehive.controls.test.controls.property.PropertyControlBean;
import org.apache.beehive.controls.test.driver.property.DriveContextAccess;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
import org.apache.beehive.test.tools.milton.common.Report;
/* Tests getting control property via control context on control implmentation
@@ -35,31 +32,26 @@
@Jpf.Controller(
forwards = {
- @Jpf.Forward(name=Report.RESULTS,path = Report.RESULTSJSP)
- })
-public class Controller extends PageFlowController
-{
-
- /**
- * @jpf:action
- */
- @Jpf.Action(
- )
- protected Forward begin(){
-
- Report report=new Report();
- DriveContextAccess driver=new DriveContextAccess();
- try{
- PropertyControlBean thebean=(PropertyControlBean)Beans.instantiate(
- Thread.currentThread().getContextClassLoader(),
- "org.apache.beehive.controls.test.controls.property.PropertyControlBean");
- driver.setControl(thebean);
- report=driver.doTest();
+ @Jpf.Forward(name = Report.RESULTS, path = Report.RESULTSJSP)
+ })
+public class Controller extends PageFlowController {
+
+ @Jpf.Action
+ protected Forward begin() {
+
+ Report report = new Report();
+ DriveContextAccess driver = new DriveContextAccess();
+ try {
+ PropertyControlBean thebean = (PropertyControlBean) Beans.instantiate(
+ Thread.currentThread().getContextClassLoader(),
+ "org.apache.beehive.controls.test.controls.property.PropertyControlBean");
+ driver.setControl(thebean);
+ report = driver.doTest();
}
- catch(Exception e){
-
- report.setStatus(Report.FAIL);
- report.setExceptionStack(e);
+ catch (Exception e) {
+
+ report.setStatus(Report.FAIL);
+ report.setExceptionStack(e);
}
return new Forward(Report.RESULTS, Report.KEY, report);
}
Modified: beehive/trunk/controls/test/webapps/src/property/membership/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/src/property/membership/Controller.java?rev=397233&r1=397232&r2=397233&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/src/property/membership/Controller.java (original)
+++ beehive/trunk/controls/test/webapps/src/property/membership/Controller.java Wed Apr 26 09:44:55 2006
@@ -17,51 +17,43 @@
*/
package property.membership;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.FormData;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-
import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.api.bean.ControlBean;
import org.apache.beehive.controls.test.controls.property.constraint.BookControl;
import org.apache.beehive.controls.test.controls.property.constraint.BookControlBean;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
import org.apache.beehive.test.tools.milton.common.Report;
/**
* Test compile errors for declaring controls with property constaints
*/
-
@Jpf.Controller(
forwards = {
- @Jpf.Forward(name=Report.RESULTS,path = Report.RESULTSJSP)
- })
-public class Controller extends PageFlowController
-{
+ @Jpf.Forward(name = Report.RESULTS, path = Report.RESULTSJSP)
+ })
+public class Controller extends PageFlowController {
+
@Control
- @BookControl.Intro(title="atitle",content="",subject="")
+ @BookControl.Intro(title = "atitle", content = "", subject = "")
public BookControlBean myBook;
@Control
- @BookControl.Language(coverlanguage="cover",contentlanguage="",authorlanguage="")
+ @BookControl.Language(coverlanguage = "cover", contentlanguage = "", authorlanguage = "")
public BookControlBean myBook2;
- //This causes a compile error
+ //This causes a compile error
//@BookControl.Price(us_price="10.0001",ca_price="",eu_price="")
//@BookControl.Price(us_price="10.1",ca_price="",eu_price="")
- //@BookControl.Price(us_price="10",ca_price="",eu_price="")
- @Control
+ //@BookControl.Price(us_price="10",ca_price="",eu_price="")
+ @Control
public BookControlBean myBook3;
-
- /**
- * @jpf:action
- */
- @Jpf.Action(
- )
- protected Forward begin(){
- Report report=new Report();
- report.setStatus(Report.PASS);
+ @Jpf.Action()
+ protected Forward begin() {
+
+ Report report = new Report();
+ report.setStatus(Report.PASS);
return new Forward(Report.RESULTS, Report.KEY, report);
}
}
Modified: beehive/trunk/controls/test/webapps/src/property/property_constraints/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/src/property/property_constraints/Controller.java?rev=397233&r1=397232&r2=397233&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/src/property/property_constraints/Controller.java (original)
+++ beehive/trunk/controls/test/webapps/src/property/property_constraints/Controller.java Wed Apr 26 09:44:55 2006
@@ -17,46 +17,40 @@
*/
package property.property_constraints;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.FormData;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-
import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.api.bean.ControlBean;
import org.apache.beehive.controls.test.controls.property.PropertyConstraintControlBean;
import org.apache.beehive.controls.test.driver.property.DrivePropertyConstraint;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
import org.apache.beehive.test.tools.milton.common.Report;
-/* Tests control property constraint validator
+/**
+ * Tests control property constraint validator
*/
-
@Jpf.Controller(
forwards = {
- @Jpf.Forward(name=Report.RESULTS,path = Report.RESULTSJSP)
- })
-public class Controller extends PageFlowController
-{
+ @Jpf.Forward(name = Report.RESULTS, path = Report.RESULTSJSP)
+ })
+public class Controller extends PageFlowController {
+
@Control
public PropertyConstraintControlBean myControl;
- /**
- * @jpf:action
- */
@Jpf.Action(
- )
- protected Forward begin(){
+ )
+ protected Forward begin() {
- Report report=new Report();
- DrivePropertyConstraint driver=new DrivePropertyConstraint();
- try{
- driver.setControl(myControl);
- report=driver.doTest();
+ Report report = new Report();
+ DrivePropertyConstraint driver = new DrivePropertyConstraint();
+ try {
+ driver.setControl(myControl);
+ report = driver.doTest();
}
- catch(Exception e){
+ catch (Exception e) {
- report.setStatus(Report.FAIL);
- report.setExceptionStack(e);
+ report.setStatus(Report.FAIL);
+ report.setExceptionStack(e);
}
return new Forward(Report.RESULTS, Report.KEY, report);
}
Modified: beehive/trunk/controls/test/webapps/src/property/veto/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/src/property/veto/Controller.java?rev=397233&r1=397232&r2=397233&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/src/property/veto/Controller.java (original)
+++ beehive/trunk/controls/test/webapps/src/property/veto/Controller.java Wed Apr 26 09:44:55 2006
@@ -17,15 +17,12 @@
*/
package property.veto;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.FormData;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-
import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.api.bean.ControlBean;
import org.apache.beehive.controls.test.controls.property.BoundPropertyControlBean;
import org.apache.beehive.controls.test.driver.property.DrivePropertyInfo;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
import org.apache.beehive.test.tools.milton.common.Report;
/* Tests client veto-ing the changing of a constrained property
@@ -33,106 +30,83 @@
@Jpf.Controller(
forwards = {
- @Jpf.Forward(name=Report.RESULTS,path = Report.RESULTSJSP)
- })
-public class Controller extends PageFlowController
-{
+ @Jpf.Forward(name = Report.RESULTS, path = Report.RESULTSJSP)
+ })
+public class Controller extends PageFlowController {
@Control
public BoundPropertyControlBean myControl;
- /**
- * @jpf:action
- */
- @Jpf.Action(
- )
- protected Forward begin(){
-
- Report report=new Report();
- report.setStatus(Report.FAIL);
- report.setMessage("This method does not do any test. Just a dummy method to Begin.");
+ @Jpf.Action
+ protected Forward begin() {
+ Report report = new Report();
+ report.setStatus(Report.FAIL);
+ report.setMessage("This method does not do any test. Just a dummy method to Begin.");
return new Forward(Report.RESULTS, Report.KEY, report);
}
-
- /**
- * @jpf:action
- */
- @Jpf.Action(
- )
- protected Forward testVetoChangeOnConstrainedProperty(){
-
- Report report=new Report();
- DrivePropertyInfo driver=new DrivePropertyInfo();
- try{
- driver.setControl(myControl);
- report=driver.doVetoChangeOnConstrainedProperty();
- }
- catch(Exception e){
-
- report.setStatus(Report.FAIL);
- report.setExceptionStack(e);
+
+ @Jpf.Action
+ protected Forward testVetoChangeOnConstrainedProperty() {
+ Report report = new Report();
+ DrivePropertyInfo driver = new DrivePropertyInfo();
+ try {
+ driver.setControl(myControl);
+ report = driver.doVetoChangeOnConstrainedProperty();
+ }
+ catch (Exception e) {
+
+ report.setStatus(Report.FAIL);
+ report.setExceptionStack(e);
}
return new Forward(Report.RESULTS, Report.KEY, report);
}
- /**
- * @jpf:action
- */
- @Jpf.Action(
- )
- protected Forward testVetoChangeOnUnConstrainedProperty(){
-
- Report report=new Report();
- DrivePropertyInfo driver=new DrivePropertyInfo();
- try{
- driver.setControl(myControl);
- report=driver.doVetoChangeOnUnConstrainedProperty();
- }
- catch(Exception e){
-
- report.setStatus(Report.FAIL);
- report.setExceptionStack(e);
+ @Jpf.Action
+ protected Forward testVetoChangeOnUnConstrainedProperty() {
+
+ Report report = new Report();
+ DrivePropertyInfo driver = new DrivePropertyInfo();
+ try {
+ driver.setControl(myControl);
+ report = driver.doVetoChangeOnUnConstrainedProperty();
+ }
+ catch (Exception e) {
+
+ report.setStatus(Report.FAIL);
+ report.setExceptionStack(e);
}
return new Forward(Report.RESULTS, Report.KEY, report);
}
- /**
- * @jpf:action
- */
- @Jpf.Action(
- )
- protected Forward testVetoChangeOnConstrainedExtProperty(){
-
- Report report=new Report();
- DrivePropertyInfo driver=new DrivePropertyInfo();
- try{
- driver.setControl(myControl);
- report=driver.doVetoChangeOnConstrainedExtProperty();
- }
- catch(Exception e){
-
- report.setStatus(Report.FAIL);
- report.setExceptionStack(e);
+ @Jpf.Action
+ protected Forward testVetoChangeOnConstrainedExtProperty() {
+
+ Report report = new Report();
+ DrivePropertyInfo driver = new DrivePropertyInfo();
+ try {
+ driver.setControl(myControl);
+ report = driver.doVetoChangeOnConstrainedExtProperty();
+ }
+ catch (Exception e) {
+
+ report.setStatus(Report.FAIL);
+ report.setExceptionStack(e);
}
return new Forward(Report.RESULTS, Report.KEY, report);
}
- /**
- * @jpf:action
- */
- @Jpf.Action(
- )
- protected Forward testVetoChangeOnUnConstrainedExtProperty(){
-
- Report report=new Report();
- DrivePropertyInfo driver=new DrivePropertyInfo();
- try{
- driver.setControl(myControl);
- report=driver.doVetoChangeOnUnConstrainedExtProperty();
- }
- catch(Exception e){
-
- report.setStatus(Report.FAIL);
- report.setExceptionStack(e);
+ @Jpf.Action
+ protected Forward testVetoChangeOnUnConstrainedExtProperty() {
+
+ Report report = new Report();
+ DrivePropertyInfo driver = new DrivePropertyInfo();
+ try {
+ driver.setControl(myControl);
+ report = driver.doVetoChangeOnUnConstrainedExtProperty();
+ }
+ catch (Exception e) {
+
+ report.setStatus(Report.FAIL);
+ report.setExceptionStack(e);
}
return new Forward(Report.RESULTS, Report.KEY, report);
}
Modified: beehive/trunk/controls/test/webapps/src/results/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/src/results/Controller.java?rev=397233&r1=397232&r2=397233&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/src/results/Controller.java (original)
+++ beehive/trunk/controls/test/webapps/src/results/Controller.java Wed Apr 26 09:44:55 2006
@@ -17,28 +17,20 @@
*/
package results;
-import org.apache.beehive.netui.pageflow.PageFlowController;
import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.FormData;
+import org.apache.beehive.netui.pageflow.PageFlowController;
import org.apache.beehive.netui.pageflow.annotations.Jpf;
-/**
- * @jpf:forward name="begin" path="Begin.jsp"
- */
@Jpf.Controller(
forwards = {
- @Jpf.Forward(
- name = "begin",
- path = "Begin.jsp")
- })
-public class Controller extends PageFlowController
-{
- /**
- * @jpf:action
- */
- @Jpf.Action(
- )
- protected Forward begin(){
+ @Jpf.Forward(
+ name = "begin",
+ path = "Begin.jsp")
+ })
+public class Controller extends PageFlowController {
+
+ @Jpf.Action
+ protected Forward begin() {
return new Forward("begin");
}
}
Modified: beehive/trunk/controls/test/webapps/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/web/WEB-INF/web.xml?rev=397233&r1=397232&r2=397233&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/web/WEB-INF/web.xml (original)
+++ beehive/trunk/controls/test/webapps/web/WEB-INF/web.xml Wed Apr 26 09:44:55 2006
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- 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-app_2_4.xsd"
- version="2.4">
+ 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-app_2_4.xsd"
+ version="2.4">
<display-name>Beehive Controls Test Web Application</display-name>
@@ -18,15 +18,15 @@
<dispatcher>FORWARD</dispatcher>
</filter-mapping>
- <filter>
- <filter-name>ControlFilter</filter-name>
- <filter-class>org.apache.beehive.controls.runtime.servlet.ControlFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>ControlFilter</filter-name>
- <url-pattern>*.jws</url-pattern>
- </filter-mapping>
+ <filter>
+ <filter-name>ControlFilter</filter-name>
+ <filter-class>org.apache.beehive.controls.runtime.servlet.ControlFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>ControlFilter</filter-name>
+ <url-pattern>*.jws</url-pattern>
+ </filter-mapping>
<!-- Action Servlet Configuration (with debugging) -->
<servlet>
@@ -60,15 +60,15 @@
<url-pattern>*.do</url-pattern>
</servlet-mapping>
- <mime-mapping>
- <extension>wsdl</extension>
- <mime-type>text/xml</mime-type>
- </mime-mapping>
-
- <mime-mapping>
- <extension>xsd</extension>
- <mime-type>text/xml</mime-type>
- </mime-mapping>
+ <mime-mapping>
+ <extension>wsdl</extension>
+ <mime-type>text/xml</mime-type>
+ </mime-mapping>
+
+ <mime-mapping>
+ <extension>xsd</extension>
+ <mime-type>text/xml</mime-type>
+ </mime-mapping>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
Modified: beehive/trunk/controls/test/webapps/web/binding/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/web/binding/index.jsp?rev=397233&r1=397232&r2=397233&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/web/binding/index.jsp (original)
+++ beehive/trunk/controls/test/webapps/web/binding/index.jsp Wed Apr 26 09:44:55 2006
@@ -1,11 +1,12 @@
-<%@page contentType="text/html;charset=UTF-8" language="java"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui" %>
<html>
- <head>
- </head>
- <body>
- <netui:anchor action="testDefaultBinding">testDefaultBinding</netui:anchor><br>
- <netui:anchor action="testBindingOverride">testBindingOverride</netui:anchor><br>
- <netui:anchor action="testExternalBinding">testExternalBinding</netui:anchor>
- </body>
+<head>
+</head>
+
+<body>
+<netui:anchor action="testDefaultBinding">testDefaultBinding</netui:anchor><br>
+<netui:anchor action="testBindingOverride">testBindingOverride</netui:anchor><br>
+<netui:anchor action="testExternalBinding">testExternalBinding</netui:anchor>
+</body>
</html>
Modified: beehive/trunk/controls/test/webapps/web/error.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/web/error.jsp?rev=397233&r1=397232&r2=397233&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/web/error.jsp (original)
+++ beehive/trunk/controls/test/webapps/web/error.jsp Wed Apr 26 09:44:55 2006
@@ -1,6 +1,7 @@
<html>
<head>
</head>
+
<body>
Error page of controlWeb,
</body>
Modified: beehive/trunk/controls/test/webapps/web/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/web/index.jsp?rev=397233&r1=397232&r2=397233&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/web/index.jsp (original)
+++ beehive/trunk/controls/test/webapps/web/index.jsp Wed Apr 26 09:44:55 2006
@@ -1,6 +1,7 @@
<html>
<head>
</head>
+
<body>
Welcome to controlWeb, a web app to test beehive controls
</body>