svn commit: r232310 [92/92] - in /beehive/trunk/controls/test: common/ infra/gtlf/ infra/gtlf/xsl/ infra/mantis/ infra/tch/ infra/tch/messages/ infra/tch/runtime/ infra/tch/schema/ perf/ perf/bin/ perf/cases/ perf/ctlsrc/org/apache/beehive/controls/per...

[ek...@apache.org]

Modified: beehive/trunk/controls/test/webapps/controlsWeb/extension/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/extension/Controller.jpf?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/extension/Controller.jpf (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/extension/Controller.jpf Fri Aug 12 08:12:28 2005
@@ -1,518 +1,518 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-package 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.test.controls.extension.SubControlBean;
-import org.apache.beehive.controls.test.driver.extension.DriveSubControl;
-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*/
-
-@Jpf.Controller(
-    forwards = {
-        @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.");
-	
-        return new Forward(Report.RESULTS, Report.KEY, report);
-    }
-    /*
-     * Invokes an inherited method on a subcontrol instantiated declaratively
-     */
-    @Jpf.Action(
-        )
-    protected Forward testInheritedMethod(){
-
-	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
-     */
-    @Jpf.Action(
-        )
-    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);
-        }
-	
-        return new Forward(Report.RESULTS, Report.KEY, report);
-    }
-
-    /*
-     * 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();
-	
-        return new Forward(Report.RESULTS, Report.KEY, report);
-    } 
-
-    /*
-     * Invokes an extended method on a subcontrol instantiated programmatically
-     */
-    @Jpf.Action(
-        )
-    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();
-        }
-        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();
-	
-        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();
-        }
-        catch(Exception e){
-		
-		report.setStatus(Report.FAIL);
-		report.setExceptionStack(e);
-        }
-
-	return new Forward(Report.RESULTS, Report.KEY, report);
-    }
-
-    @Jpf.Action(
-        )
-    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();
-        }
-        catch(Exception e){
-		
-		report.setStatus(Report.FAIL);
-		report.setExceptionStack(e);
-        }
-
-	return new Forward(Report.RESULTS, Report.KEY, report);
-    }
-
-
-    @Jpf.Action(
-        )
-    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();
-        }
-        catch(Exception e){
-		
-		report.setStatus(Report.FAIL);
-		report.setExceptionStack(e);
-        }
-
-	return new Forward(Report.RESULTS, Report.KEY, report);
-    }
-
-
-
-    @Jpf.Action(
-        )
-    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);
-        }
-
-	return new Forward(Report.RESULTS, Report.KEY, report);
-    }
-    
-    @Jpf.Action(
-        )
-    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);
-        }
-
-	return new Forward(Report.RESULTS, Report.KEY, report);
-    }
-    
-    @Jpf.Action(
-        )
-    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();
-        }
-        catch(Exception e){
-		
-		report.setStatus(Report.FAIL);
-		report.setExceptionStack(e);
-        }
-
-	return new Forward(Report.RESULTS, Report.KEY, report);
-    }
-
-    @Jpf.Action(
-        )
-    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();
-        }
-        catch(Exception e){
-		
-		report.setStatus(Report.FAIL);
-		report.setExceptionStack(e);
-        }
-
-	return new Forward(Report.RESULTS, Report.KEY, report);
-    }
-
-    @Jpf.Action(
-        )
-    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();
-        }
-        catch(Exception e){
-		
-		report.setStatus(Report.FAIL);
-		report.setExceptionStack(e);
-        }
-
-	return new Forward(Report.RESULTS, Report.KEY, report);
-    }
-
-    @Jpf.Action(
-        )
-    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);
-        }
-
-	return new Forward(Report.RESULTS, Report.KEY, report);
-    }
-
-    /*
-    protected Forward testInvokeOverwrittenMethod(){
-    	
-    }
-    */
-    @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");
-	}
-        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");
-	}
-        return new Forward(Report.RESULTS, Report.KEY, report);
-    }
-    
-}
-
-
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package 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.test.controls.extension.SubControlBean;
+import org.apache.beehive.controls.test.driver.extension.DriveSubControl;
+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*/
+
+@Jpf.Controller(
+    forwards = {
+        @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.");
+	
+        return new Forward(Report.RESULTS, Report.KEY, report);
+    }
+    /*
+     * Invokes an inherited method on a subcontrol instantiated declaratively
+     */
+    @Jpf.Action(
+        )
+    protected Forward testInheritedMethod(){
+
+	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
+     */
+    @Jpf.Action(
+        )
+    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);
+        }
+	
+        return new Forward(Report.RESULTS, Report.KEY, report);
+    }
+
+    /*
+     * 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();
+	
+        return new Forward(Report.RESULTS, Report.KEY, report);
+    } 
+
+    /*
+     * Invokes an extended method on a subcontrol instantiated programmatically
+     */
+    @Jpf.Action(
+        )
+    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();
+        }
+        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();
+	
+        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();
+        }
+        catch(Exception e){
+		
+		report.setStatus(Report.FAIL);
+		report.setExceptionStack(e);
+        }
+
+	return new Forward(Report.RESULTS, Report.KEY, report);
+    }
+
+    @Jpf.Action(
+        )
+    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();
+        }
+        catch(Exception e){
+		
+		report.setStatus(Report.FAIL);
+		report.setExceptionStack(e);
+        }
+
+	return new Forward(Report.RESULTS, Report.KEY, report);
+    }
+
+
+    @Jpf.Action(
+        )
+    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();
+        }
+        catch(Exception e){
+		
+		report.setStatus(Report.FAIL);
+		report.setExceptionStack(e);
+        }
+
+	return new Forward(Report.RESULTS, Report.KEY, report);
+    }
+
+
+
+    @Jpf.Action(
+        )
+    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);
+        }
+
+	return new Forward(Report.RESULTS, Report.KEY, report);
+    }
+    
+    @Jpf.Action(
+        )
+    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);
+        }
+
+	return new Forward(Report.RESULTS, Report.KEY, report);
+    }
+    
+    @Jpf.Action(
+        )
+    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();
+        }
+        catch(Exception e){
+		
+		report.setStatus(Report.FAIL);
+		report.setExceptionStack(e);
+        }
+
+	return new Forward(Report.RESULTS, Report.KEY, report);
+    }
+
+    @Jpf.Action(
+        )
+    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();
+        }
+        catch(Exception e){
+		
+		report.setStatus(Report.FAIL);
+		report.setExceptionStack(e);
+        }
+
+	return new Forward(Report.RESULTS, Report.KEY, report);
+    }
+
+    @Jpf.Action(
+        )
+    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();
+        }
+        catch(Exception e){
+		
+		report.setStatus(Report.FAIL);
+		report.setExceptionStack(e);
+        }
+
+	return new Forward(Report.RESULTS, Report.KEY, report);
+    }
+
+    @Jpf.Action(
+        )
+    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);
+        }
+
+	return new Forward(Report.RESULTS, Report.KEY, report);
+    }
+
+    /*
+    protected Forward testInvokeOverwrittenMethod(){
+    	
+    }
+    */
+    @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");
+	}
+        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");
+	}
+        return new Forward(Report.RESULTS, Report.KEY, report);
+    }
+    
+}
+
+

Propchange: beehive/trunk/controls/test/webapps/controlsWeb/extension/Controller.jpf
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/webapps/controlsWeb/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/index.jsp?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/index.jsp (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/index.jsp Fri Aug 12 08:12:28 2005
@@ -1,7 +1,7 @@
-<html>
-<head>
-</head>
-<body>
-Welcome to controlWeb, a web app to test beehive controls
-</body>
-</html>
+<html>
+<head>
+</head>
+<body>
+Welcome to controlWeb, a web app to test beehive controls
+</body>
+</html>

Propchange: beehive/trunk/controls/test/webapps/controlsWeb/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/webapps/controlsWeb/instantiate/declarewithproperty/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/instantiate/declarewithproperty/Controller.jpf?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/instantiate/declarewithproperty/Controller.jpf (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/instantiate/declarewithproperty/Controller.jpf Fri Aug 12 08:12:28 2005
@@ -1,61 +1,61 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-package 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.test.tools.milton.common.Report;
-
-/* Instantiate a custom control declaratively with property*/
-
-@Jpf.Controller(
-    forwards = {
-        @Jpf.Forward(name=Report.RESULTS,path = Report.RESULTSJSP) 
-    })
-public class Controller extends PageFlowController
-{
-
-    @Control
-    @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();
-	
-        return new Forward(Report.RESULTS, Report.KEY, report);
-    }
-
-}
-
-
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package 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.test.tools.milton.common.Report;
+
+/* Instantiate a custom control declaratively with property*/
+
+@Jpf.Controller(
+    forwards = {
+        @Jpf.Forward(name=Report.RESULTS,path = Report.RESULTSJSP) 
+    })
+public class Controller extends PageFlowController
+{
+
+    @Control
+    @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();
+	
+        return new Forward(Report.RESULTS, Report.KEY, report);
+    }
+
+}
+
+

Propchange: beehive/trunk/controls/test/webapps/controlsWeb/instantiate/declarewithproperty/Controller.jpf
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/webapps/controlsWeb/instantiate/programwithproperty/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/instantiate/programwithproperty/Controller.jpf?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/instantiate/programwithproperty/Controller.jpf (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/instantiate/programwithproperty/Controller.jpf Fri Aug 12 08:12:28 2005
@@ -1,72 +1,72 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-package 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.Control;
-import org.apache.beehive.controls.api.bean.Controls;
-import org.apache.beehive.controls.api.bean.ControlBean;
-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.test.tools.milton.common.Report;
-
-/* Instantiate a custom control programmatically with property*/
-
-@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();
-	try{
-		BeanPropertyMap greetAttr = new BeanPropertyMap(SingleProperty.Greeting.class);
-		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();
-		driver.setControl(spbean);
-		report=driver.doTestReconfiguredProperty("Good afternoon!");
-	}
-	catch(Exception e){
-		report.setStatus(Report.FAIL);
-		report.setExceptionStack(e);
-	}
-        return new Forward(Report.RESULTS, Report.KEY, report);
-    }
-
-}
-
-
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package 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.Control;
+import org.apache.beehive.controls.api.bean.Controls;
+import org.apache.beehive.controls.api.bean.ControlBean;
+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.test.tools.milton.common.Report;
+
+/* Instantiate a custom control programmatically with property*/
+
+@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();
+	try{
+		BeanPropertyMap greetAttr = new BeanPropertyMap(SingleProperty.Greeting.class);
+		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();
+		driver.setControl(spbean);
+		report=driver.doTestReconfiguredProperty("Good afternoon!");
+	}
+	catch(Exception e){
+		report.setStatus(Report.FAIL);
+		report.setExceptionStack(e);
+	}
+        return new Forward(Report.RESULTS, Report.KEY, report);
+    }
+
+}
+
+

Propchange: beehive/trunk/controls/test/webapps/controlsWeb/instantiate/programwithproperty/Controller.jpf
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/webapps/controlsWeb/property/client_access/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/property/client_access/Controller.jpf?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/property/client_access/Controller.jpf (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/property/client_access/Controller.jpf Fri Aug 12 08:12:28 2005
@@ -1,67 +1,67 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-package 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.test.tools.milton.common.Report;
-
-/* 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
-{
-    @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();
-        }
-        catch(Exception e){
-		
-		report.setStatus(Report.FAIL);
-		report.setExceptionStack(e);
-        }
-        return new Forward(Report.RESULTS, Report.KEY, report);
-    }
-
-}
-
-
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package 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.test.tools.milton.common.Report;
+
+/* 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
+{
+    @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();
+        }
+        catch(Exception e){
+		
+		report.setStatus(Report.FAIL);
+		report.setExceptionStack(e);
+        }
+        return new Forward(Report.RESULTS, Report.KEY, report);
+    }
+
+}
+
+

Propchange: beehive/trunk/controls/test/webapps/controlsWeb/property/client_access/Controller.jpf
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/webapps/controlsWeb/property/client_access2/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/property/client_access2/Controller.jpf?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/property/client_access2/Controller.jpf (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/property/client_access2/Controller.jpf Fri Aug 12 08:12:28 2005
@@ -1,69 +1,69 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-package 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.test.tools.milton.common.Report;
-
-/* 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();
-        }
-        catch(Exception e){
-		
-		report.setStatus(Report.FAIL);
-		report.setExceptionStack(e);
-        }
-        return new Forward(Report.RESULTS, Report.KEY, report);
-    }
-
-}
-
-
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package 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.test.tools.milton.common.Report;
+
+/* 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();
+        }
+        catch(Exception e){
+		
+		report.setStatus(Report.FAIL);
+		report.setExceptionStack(e);
+        }
+        return new Forward(Report.RESULTS, Report.KEY, report);
+    }
+
+}
+
+

Propchange: beehive/trunk/controls/test/webapps/controlsWeb/property/client_access2/Controller.jpf
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/webapps/controlsWeb/property/client_impl/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/property/client_impl/Controller.jpf?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/property/client_impl/Controller.jpf (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/property/client_impl/Controller.jpf Fri Aug 12 08:12:28 2005
@@ -1,74 +1,74 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-package 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.test.tools.milton.common.Report;
-
-/* 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
-{
-
-    /**
-     * A control that declares some propertySets in its control interface.
-     * It has a method that allow accessing these property values via control context.
-     */
-    @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();
-        }
-        catch(Exception e){
-		
-		report.setStatus(Report.FAIL);
-		report.setExceptionStack(e);
-        }
-        return new Forward(Report.RESULTS, Report.KEY, report);
-    }
-
-}
-
-
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package 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.test.tools.milton.common.Report;
+
+/* 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
+{
+
+    /**
+     * A control that declares some propertySets in its control interface.
+     * It has a method that allow accessing these property values via control context.
+     */
+    @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();
+        }
+        catch(Exception e){
+		
+		report.setStatus(Report.FAIL);
+		report.setExceptionStack(e);
+        }
+        return new Forward(Report.RESULTS, Report.KEY, report);
+    }
+
+}
+
+

Propchange: beehive/trunk/controls/test/webapps/controlsWeb/property/client_impl/Controller.jpf
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/webapps/controlsWeb/property/client_impl2/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/property/client_impl2/Controller.jpf?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/property/client_impl2/Controller.jpf (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/property/client_impl2/Controller.jpf Fri Aug 12 08:12:28 2005
@@ -1,70 +1,70 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-package 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.test.tools.milton.common.Report;
-
-/* 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: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();
-        }
-        catch(Exception e){
-		
-		report.setStatus(Report.FAIL);
-		report.setExceptionStack(e);
-        }
-        return new Forward(Report.RESULTS, Report.KEY, report);
-    }
-
-}
-
-
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package 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.test.tools.milton.common.Report;
+
+/* 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: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();
+        }
+        catch(Exception e){
+		
+		report.setStatus(Report.FAIL);
+		report.setExceptionStack(e);
+        }
+        return new Forward(Report.RESULTS, Report.KEY, report);
+    }
+
+}
+
+

Propchange: beehive/trunk/controls/test/webapps/controlsWeb/property/client_impl2/Controller.jpf
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/webapps/controlsWeb/property/impl_access/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/property/impl_access/Controller.jpf?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/property/impl_access/Controller.jpf (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/property/impl_access/Controller.jpf Fri Aug 12 08:12:28 2005
@@ -1,73 +1,73 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-package 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.test.tools.milton.common.Report;
-
-/* 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
-{
-
-    /**
-     * A control that declares some propertySets in its control interface.
-     * It has a method that allow accessing these property values via control context.
-     */
-    @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();
-        }
-        catch(Exception e){
-		
-		report.setStatus(Report.FAIL);
-		report.setExceptionStack(e);
-        }
-        return new Forward(Report.RESULTS, Report.KEY, report);
-    }
-
-}
-
-
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package 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.test.tools.milton.common.Report;
+
+/* 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
+{
+
+    /**
+     * A control that declares some propertySets in its control interface.
+     * It has a method that allow accessing these property values via control context.
+     */
+    @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();
+        }
+        catch(Exception e){
+		
+		report.setStatus(Report.FAIL);
+		report.setExceptionStack(e);
+        }
+        return new Forward(Report.RESULTS, Report.KEY, report);
+    }
+
+}
+
+

Propchange: beehive/trunk/controls/test/webapps/controlsWeb/property/impl_access/Controller.jpf
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/webapps/controlsWeb/property/impl_access2/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/property/impl_access2/Controller.jpf?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/property/impl_access2/Controller.jpf (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/property/impl_access2/Controller.jpf Fri Aug 12 08:12:28 2005
@@ -1,69 +1,69 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-package 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.test.tools.milton.common.Report;
-
-/* Tests getting control property via control context on control implmentation
- * The custom control 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();
-	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);
-        }
-        return new Forward(Report.RESULTS, Report.KEY, report);
-    }
-
-}
-
-
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package 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.test.tools.milton.common.Report;
+
+/* Tests getting control property via control context on control implmentation
+ * The custom control 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();
+	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);
+        }
+        return new Forward(Report.RESULTS, Report.KEY, report);
+    }
+
+}
+
+

Propchange: beehive/trunk/controls/test/webapps/controlsWeb/property/impl_access2/Controller.jpf
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/webapps/controlsWeb/property/membership/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/property/membership/Controller.jpf?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/property/membership/Controller.jpf (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/property/membership/Controller.jpf Fri Aug 12 08:12:28 2005
@@ -1,69 +1,69 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-package 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.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
-{
-    @Control
-    @BookControl.Intro(title="atitle",content="",subject="")
-    public BookControlBean myBook;
-
-    @Control
-    @BookControl.Language(coverlanguage="cover",contentlanguage="",authorlanguage="")
-    public BookControlBean myBook2;
-
-	//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  
-    public BookControlBean myBook3;
-    
-    /**
-     * @jpf:action
-     */
-    @Jpf.Action(
-        )
-    protected Forward begin(){
-
-    	Report report=new Report();
-		report.setStatus(Report.PASS);
-        return new Forward(Report.RESULTS, Report.KEY, report);
-    }
-}
-
-
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package 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.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
+{
+    @Control
+    @BookControl.Intro(title="atitle",content="",subject="")
+    public BookControlBean myBook;
+
+    @Control
+    @BookControl.Language(coverlanguage="cover",contentlanguage="",authorlanguage="")
+    public BookControlBean myBook2;
+
+	//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  
+    public BookControlBean myBook3;
+    
+    /**
+     * @jpf:action
+     */
+    @Jpf.Action(
+        )
+    protected Forward begin(){
+
+    	Report report=new Report();
+		report.setStatus(Report.PASS);
+        return new Forward(Report.RESULTS, Report.KEY, report);
+    }
+}
+
+

Propchange: beehive/trunk/controls/test/webapps/controlsWeb/property/membership/Controller.jpf
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/webapps/controlsWeb/results/Begin.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/results/Begin.jsp?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/results/Begin.jsp (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/results/Begin.jsp Fri Aug 12 08:12:28 2005
@@ -1,10 +1,10 @@
-<html>
-<body>
-Begin page of controlsWeb/result
-</body>
-</html>
-
-	
-
-
-			   
+<html>
+<body>
+Begin page of controlsWeb/result
+</body>
+</html>
+
+	
+
+
+			   

Propchange: beehive/trunk/controls/test/webapps/controlsWeb/results/Begin.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/webapps/controlsWeb/results/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/results/Controller.jpf?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/results/Controller.jpf (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/results/Controller.jpf Fri Aug 12 08:12:28 2005
@@ -1,46 +1,46 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-package 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.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(){
-        return new Forward("begin");
-    }
-}
-
-
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package 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.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(){
+        return new Forward("begin");
+    }
+}
+
+

Propchange: beehive/trunk/controls/test/webapps/controlsWeb/results/Controller.jpf
------------------------------------------------------------------------------
    svn:eol-style = native