svn commit: r232310 [91/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/WEB-INF/src/jws/Event.jws
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Event.jws?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Event.jws (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Event.jws Fri Aug 12 08:12:28 2005
@@ -1,110 +1,110 @@
-package jws;
-
-/*
- * 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:$
- */
-
-/*
- * A jws that tests controls event.
- */
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-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.event.HelloBean;
-import org.apache.beehive.controls.test.driver.event.DriveListener;
-import org.apache.beehive.test.tools.milton.common.Report;
-
-
-@WebService
-public class Event
-{
-
-    private boolean eventSet1Received=false;
-    private boolean eventSet2Received=false;
-
-    @Control
-    public HelloBean helloBean;
-
-    /** EventHandler that receives EventSet1 from helloBean*/
-    @EventHandler (field="helloBean", eventSet= HelloBean.EventSet1.class,
-                                   eventName="method1")
-     public void helloBeanMessageHandler()
-     {
-	/*
-        System.out.println("***************************************");
-        System.out.println("event receive! nothing received");
-        System.out.println("***************************************");
-	*/
-
-	eventSet1Received=true;
-     }
-
-
-    /** EventHandler that receives EventSet2 from helloBean*/
-    @EventHandler (field="helloBean", eventSet= HelloBean.EventSet2.class, eventName="set2Method2")
-     public int helloBeanMessageHandler2()
-     {
-        /*
-        System.out.println("***************************************************");
-        System.out.println("event2 receive!");
-        System.out.println("***************************************************");
-	*/
-	
-	eventSet2Received=true;
-	return 0;
-     }
-
-    @WebMethod
-    public Report testListener()
-    {        
-	DriveListener driver=new DriveListener();
-	driver.setControl(helloBean);
-	Report report=driver.doTest();
-	
-	if (report.getStatus().equals(Report.PASS)){
-
-	    try{
-		Thread.currentThread().sleep(1000);
-		report=driver.verifyResult();
-		}
-	    catch(Exception e){
-	    	report.setStatus(Report.FAIL);
-	    	report.setExceptionStack(e);
-	    }
-	}
-        return report;
-    }
-
-    /*
-     * JWS listens to the events from the controls by EventHandler
-     */
-    @WebMethod
-    public Report testEventHandler()
-    {        
-
-	/*FIX ME: we need wsm jws to support conversational jws, otherwise
-	we won't be able to test this on jws*/
-	
-	Report report=new Report();
-	report.setStatus(Report.FAIL);
-	return report;
-    }
-
-}
+package jws;
+
+/*
+ * 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:$
+ */
+
+/*
+ * A jws that tests controls event.
+ */
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+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.event.HelloBean;
+import org.apache.beehive.controls.test.driver.event.DriveListener;
+import org.apache.beehive.test.tools.milton.common.Report;
+
+
+@WebService
+public class Event
+{
+
+    private boolean eventSet1Received=false;
+    private boolean eventSet2Received=false;
+
+    @Control
+    public HelloBean helloBean;
+
+    /** EventHandler that receives EventSet1 from helloBean*/
+    @EventHandler (field="helloBean", eventSet= HelloBean.EventSet1.class,
+                                   eventName="method1")
+     public void helloBeanMessageHandler()
+     {
+	/*
+        System.out.println("***************************************");
+        System.out.println("event receive! nothing received");
+        System.out.println("***************************************");
+	*/
+
+	eventSet1Received=true;
+     }
+
+
+    /** EventHandler that receives EventSet2 from helloBean*/
+    @EventHandler (field="helloBean", eventSet= HelloBean.EventSet2.class, eventName="set2Method2")
+     public int helloBeanMessageHandler2()
+     {
+        /*
+        System.out.println("***************************************************");
+        System.out.println("event2 receive!");
+        System.out.println("***************************************************");
+	*/
+	
+	eventSet2Received=true;
+	return 0;
+     }
+
+    @WebMethod
+    public Report testListener()
+    {        
+	DriveListener driver=new DriveListener();
+	driver.setControl(helloBean);
+	Report report=driver.doTest();
+	
+	if (report.getStatus().equals(Report.PASS)){
+
+	    try{
+		Thread.currentThread().sleep(1000);
+		report=driver.verifyResult();
+		}
+	    catch(Exception e){
+	    	report.setStatus(Report.FAIL);
+	    	report.setExceptionStack(e);
+	    }
+	}
+        return report;
+    }
+
+    /*
+     * JWS listens to the events from the controls by EventHandler
+     */
+    @WebMethod
+    public Report testEventHandler()
+    {        
+
+	/*FIX ME: we need wsm jws to support conversational jws, otherwise
+	we won't be able to test this on jws*/
+	
+	Report report=new Report();
+	report.setStatus(Report.FAIL);
+	return report;
+    }
+
+}

Propchange: beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Event.jws
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Extension.jws
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Extension.jws?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Extension.jws (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Extension.jws Fri Aug 12 08:12:28 2005
@@ -1,149 +1,149 @@
-package jws;
-
-/*
- * 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:$
- */
-
-/*
- * A jws that tests controls extension.
- */
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-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;
-
-
-@WebService
-public class Extension
-{
-    @Control
-    public SubControlBean subcontrol;
-
-    @WebMethod
-    public Report testInheritedMethod()
-    {        
-	DriveSubControl driver=new DriveSubControl();
-	driver.setControl(subcontrol);
-	Report report=driver.doInvokeInheritedMethod();
-	
-        return report;
-    }
-
-    @WebMethod
-    public Report testExtendedMethod()
-    {        
-	DriveSubControl driver=new DriveSubControl();
-	driver.setControl(subcontrol);
-	Report report=driver.doInvokeExtendedMethod();
-	
-        return report;
-    }
-
-    @WebMethod
-    public Report testGetInheritedPropertyByContext()
-    {        
-	DriveSubControl driver=new DriveSubControl();
-	driver.setControl(subcontrol);
-	Report report=driver.doGetInheritedPropertyByContext();
-	
-        return report;
-    }  
-
-    @WebMethod
-    public Report testGetInheritedPropertyByGetter()
-    {        
-	DriveSubControl driver=new DriveSubControl();
-	driver.setControl(subcontrol);
-	Report report=driver.doGetInheritedPropertyByGetter();
-	
-        return report;
-    }
-
-    @WebMethod
-    public Report testSetInheritedPropertyBySetter()
-    {        
-	DriveSubControl driver=new DriveSubControl();
-	driver.setControl(subcontrol);
-	Report report=driver.doSetInheritedPropertyBySetter();
-	
-        return report;
-    }      
-
-    @WebMethod
-    public Report testGetExtendedPropertyByContext()
-    {        
-	DriveSubControl driver=new DriveSubControl();
-	driver.setControl(subcontrol);
-	Report report=driver.doGetExtendedPropertyByContext();
-	
-        return report;
-    }  
-
-    @WebMethod
-    public Report testGetExtendedPropertyByGetter()
-    {        
-	DriveSubControl driver=new DriveSubControl();
-	driver.setControl(subcontrol);
-	Report report=driver.doGetExtendedPropertyByGetter();
-	
-        return report;
-    }  
-
-    @WebMethod
-    public Report testSetExtendedPropertyBySetter()
-    {        
-	DriveSubControl driver=new DriveSubControl();
-	driver.setControl(subcontrol);
-	Report report=driver.doSetExtendedPropertyBySetter();
-	
-        return report;
-    }
-
-    @WebMethod
-    public Report testGetReconfiguredPropertyByContext()
-    {        
-	DriveSubControl driver=new DriveSubControl();
-	driver.setControl(subcontrol);
-	Report report=driver.doGetReconfiguredPropertyByContext();
-	
-        return report;
-    }
-
-    @WebMethod
-    public Report testGetReconfiguredPropertyByGetter()
-    {        
-	DriveSubControl driver=new DriveSubControl();
-	driver.setControl(subcontrol);
-	Report report=driver.doGetReconfiguredPropertyByGetter();
-	
-        return report;
-    }
-
-    @WebMethod
-    public Report testSetReconfiguredPropertyBySetter()
-    {        
-	DriveSubControl driver=new DriveSubControl();
-	driver.setControl(subcontrol);
-	Report report=driver.doSetReconfiguredPropertyBySetter();
-	
-        return report;
-    }    
-}
+package jws;
+
+/*
+ * 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:$
+ */
+
+/*
+ * A jws that tests controls extension.
+ */
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+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;
+
+
+@WebService
+public class Extension
+{
+    @Control
+    public SubControlBean subcontrol;
+
+    @WebMethod
+    public Report testInheritedMethod()
+    {        
+	DriveSubControl driver=new DriveSubControl();
+	driver.setControl(subcontrol);
+	Report report=driver.doInvokeInheritedMethod();
+	
+        return report;
+    }
+
+    @WebMethod
+    public Report testExtendedMethod()
+    {        
+	DriveSubControl driver=new DriveSubControl();
+	driver.setControl(subcontrol);
+	Report report=driver.doInvokeExtendedMethod();
+	
+        return report;
+    }
+
+    @WebMethod
+    public Report testGetInheritedPropertyByContext()
+    {        
+	DriveSubControl driver=new DriveSubControl();
+	driver.setControl(subcontrol);
+	Report report=driver.doGetInheritedPropertyByContext();
+	
+        return report;
+    }  
+
+    @WebMethod
+    public Report testGetInheritedPropertyByGetter()
+    {        
+	DriveSubControl driver=new DriveSubControl();
+	driver.setControl(subcontrol);
+	Report report=driver.doGetInheritedPropertyByGetter();
+	
+        return report;
+    }
+
+    @WebMethod
+    public Report testSetInheritedPropertyBySetter()
+    {        
+	DriveSubControl driver=new DriveSubControl();
+	driver.setControl(subcontrol);
+	Report report=driver.doSetInheritedPropertyBySetter();
+	
+        return report;
+    }      
+
+    @WebMethod
+    public Report testGetExtendedPropertyByContext()
+    {        
+	DriveSubControl driver=new DriveSubControl();
+	driver.setControl(subcontrol);
+	Report report=driver.doGetExtendedPropertyByContext();
+	
+        return report;
+    }  
+
+    @WebMethod
+    public Report testGetExtendedPropertyByGetter()
+    {        
+	DriveSubControl driver=new DriveSubControl();
+	driver.setControl(subcontrol);
+	Report report=driver.doGetExtendedPropertyByGetter();
+	
+        return report;
+    }  
+
+    @WebMethod
+    public Report testSetExtendedPropertyBySetter()
+    {        
+	DriveSubControl driver=new DriveSubControl();
+	driver.setControl(subcontrol);
+	Report report=driver.doSetExtendedPropertyBySetter();
+	
+        return report;
+    }
+
+    @WebMethod
+    public Report testGetReconfiguredPropertyByContext()
+    {        
+	DriveSubControl driver=new DriveSubControl();
+	driver.setControl(subcontrol);
+	Report report=driver.doGetReconfiguredPropertyByContext();
+	
+        return report;
+    }
+
+    @WebMethod
+    public Report testGetReconfiguredPropertyByGetter()
+    {        
+	DriveSubControl driver=new DriveSubControl();
+	driver.setControl(subcontrol);
+	Report report=driver.doGetReconfiguredPropertyByGetter();
+	
+        return report;
+    }
+
+    @WebMethod
+    public Report testSetReconfiguredPropertyBySetter()
+    {        
+	DriveSubControl driver=new DriveSubControl();
+	driver.setControl(subcontrol);
+	Report report=driver.doSetReconfiguredPropertyBySetter();
+	
+        return report;
+    }    
+}

Propchange: beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Extension.jws
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Hello.jws
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Hello.jws?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Hello.jws (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Hello.jws Fri Aug 12 08:12:28 2005
@@ -1,32 +1,32 @@
-package jws;
-
-/*
- * 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:$
- */
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-
-@WebService
-public class Hello
-{
-    @WebMethod
-    public String sayHelloWorld()
-    {        
-        return "Hello world!";
-    }
-}
+package jws;
+
+/*
+ * 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:$
+ */
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+@WebService
+public class Hello
+{
+    @WebMethod
+    public String sayHelloWorld()
+    {        
+        return "Hello world!";
+    }
+}

Propchange: beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Hello.jws
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Instantiate.jws
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Instantiate.jws?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Instantiate.jws (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Instantiate.jws Fri Aug 12 08:12:28 2005
@@ -1,83 +1,83 @@
-package jws;
-
-/*
- * 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:$
- */
-
-/*
- * A jws that tests controls instantiation.
- */
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-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.instantiate.HelloControlBean;
-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;
-
-
-@WebService
-public class Instantiate
-{
-
-    @Control
-    public HelloControlBean hellobean;
-
-    @Control
-    @SingleProperty.Greeting(GreetWord="Good evening!")
-    public SinglePropertyBean myPropertyBean;
-
-    @WebMethod
-    public Report testDeclarativeInstantiateWithProperty()
-    {        
-	DriveSingleProperty driver=new DriveSingleProperty();
-	driver.setControl(myPropertyBean);
-	Report report=driver.doTest();
-	return report;
-    }
-
-    @WebMethod
-    public Report testProgrammaticInstantiateWithProperty()
-    {        
-    	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 report;
-    }
-    
-}
+package jws;
+
+/*
+ * 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:$
+ */
+
+/*
+ * A jws that tests controls instantiation.
+ */
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+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.instantiate.HelloControlBean;
+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;
+
+
+@WebService
+public class Instantiate
+{
+
+    @Control
+    public HelloControlBean hellobean;
+
+    @Control
+    @SingleProperty.Greeting(GreetWord="Good evening!")
+    public SinglePropertyBean myPropertyBean;
+
+    @WebMethod
+    public Report testDeclarativeInstantiateWithProperty()
+    {        
+	DriveSingleProperty driver=new DriveSingleProperty();
+	driver.setControl(myPropertyBean);
+	Report report=driver.doTest();
+	return report;
+    }
+
+    @WebMethod
+    public Report testProgrammaticInstantiateWithProperty()
+    {        
+    	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 report;
+    }
+    
+}

Propchange: beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Instantiate.jws
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Property.jws
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Property.jws?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Property.jws (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Property.jws Fri Aug 12 08:12:28 2005
@@ -1,236 +1,236 @@
-package jws;
-
-/*
- * 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:$
- */
-
-/*
- * A jws that tests controls property.
- */
-
-import java.beans.Beans;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-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.controls.test.driver.property.DriveSetters;
-import org.apache.beehive.controls.test.driver.property.DriveContextAccess;
-
-import org.apache.beehive.controls.test.driver.property.DrivePropertyInfo;
-import org.apache.beehive.controls.test.controls.property.BoundPropertyControlBean;
-import org.apache.beehive.test.tools.milton.common.Report;
-
-
-@WebService
-public class Property
-{
-
-    @Control
-    public PropertyControlBean myControl;
-
-    @Control
-    public BoundPropertyControlBean myBoundPropertyControl;
-
-    /*
-     * Get a control property by getters on the control bean class.
-     * The control is instantiated declaratively.
-     */
-    @WebMethod
-    public Report testGetters()
-    {        
-    	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 report;
-    }
-
-    /*
-     * Get a control property by getters on the control bean class.
-     * The control is instantiated programmatically.
-     */
-    @WebMethod
-    public Report testGetters2()
-    {        
-    	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 report;
-    }
-
-    /*
-     * Set a control property by setters on the control bean class.
-     * The control is instantiated declaratively.
-     */
-    @WebMethod
-    public Report testSetters()
-    {        
-    	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 report;
-    }
-
-    /*
-     * Set a control property by setters on the control bean class.
-     * The control is instantiated programmatically.
-     */
-    @WebMethod
-    public Report testSetters2()
-    {        
-    	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 report;
-    }
-
-    /*
-     * Get a control property by control context.
-     * The control is instantiated declaratively.
-     */
-    @WebMethod
-    public Report testContext()
-    {        
-    	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 report;
-    }
-
-    /*
-     * Get a control property by control context.
-     * The control is instantiated programmatically.
-     */
-    @WebMethod
-    public Report testContext2()
-    {        
-    	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 report;
-    }
-
-    /*
-     * Test veto-ing a the change on a constrained property
-     */
-    @WebMethod
-    public Report testVetoChangeOnConstrainedProperty()
-    {        
-    	Report report=new Report();
-	DrivePropertyInfo driver=new DrivePropertyInfo();
-	driver.setControl(myBoundPropertyControl);
-	report=driver.doVetoChangeOnConstrainedProperty();
-        return report;
-    }
-
-    /*
-     * Test veto-ing a the change on a constrained property
-     */
-    @WebMethod
-    public Report testVetoChangeOnConstrainedExternalProperty()
-    {        
-    	Report report=new Report();
-	DrivePropertyInfo driver=new DrivePropertyInfo();
-	driver.setControl(myBoundPropertyControl);
-	report=driver.doVetoChangeOnConstrainedExtProperty();
-        return report;
-    }
-    /*
-     * Test veto-ing a the change on a constrained property
-     */
-    @WebMethod
-    public Report testVetoChangeOnUnConstrainedProperty()
-    {        
-    	Report report=new Report();
-	DrivePropertyInfo driver=new DrivePropertyInfo();
-	driver.setControl(myBoundPropertyControl);
-	report=driver.doVetoChangeOnUnConstrainedProperty();
-        return report;
-    }
-
-    /*
-     * Test veto-ing a the change on a unconstrained property
-     */
-    @WebMethod
-    public Report testVetoChangeOnUnConstrainedExternalProperty()
-    {        
-    	Report report=new Report();
-	DrivePropertyInfo driver=new DrivePropertyInfo();
-	driver.setControl(myBoundPropertyControl);
-	report=driver.doVetoChangeOnUnConstrainedExtProperty();
-        return report;
-    }
-    
-}
+package jws;
+
+/*
+ * 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:$
+ */
+
+/*
+ * A jws that tests controls property.
+ */
+
+import java.beans.Beans;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+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.controls.test.driver.property.DriveSetters;
+import org.apache.beehive.controls.test.driver.property.DriveContextAccess;
+
+import org.apache.beehive.controls.test.driver.property.DrivePropertyInfo;
+import org.apache.beehive.controls.test.controls.property.BoundPropertyControlBean;
+import org.apache.beehive.test.tools.milton.common.Report;
+
+
+@WebService
+public class Property
+{
+
+    @Control
+    public PropertyControlBean myControl;
+
+    @Control
+    public BoundPropertyControlBean myBoundPropertyControl;
+
+    /*
+     * Get a control property by getters on the control bean class.
+     * The control is instantiated declaratively.
+     */
+    @WebMethod
+    public Report testGetters()
+    {        
+    	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 report;
+    }
+
+    /*
+     * Get a control property by getters on the control bean class.
+     * The control is instantiated programmatically.
+     */
+    @WebMethod
+    public Report testGetters2()
+    {        
+    	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 report;
+    }
+
+    /*
+     * Set a control property by setters on the control bean class.
+     * The control is instantiated declaratively.
+     */
+    @WebMethod
+    public Report testSetters()
+    {        
+    	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 report;
+    }
+
+    /*
+     * Set a control property by setters on the control bean class.
+     * The control is instantiated programmatically.
+     */
+    @WebMethod
+    public Report testSetters2()
+    {        
+    	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 report;
+    }
+
+    /*
+     * Get a control property by control context.
+     * The control is instantiated declaratively.
+     */
+    @WebMethod
+    public Report testContext()
+    {        
+    	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 report;
+    }
+
+    /*
+     * Get a control property by control context.
+     * The control is instantiated programmatically.
+     */
+    @WebMethod
+    public Report testContext2()
+    {        
+    	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 report;
+    }
+
+    /*
+     * Test veto-ing a the change on a constrained property
+     */
+    @WebMethod
+    public Report testVetoChangeOnConstrainedProperty()
+    {        
+    	Report report=new Report();
+	DrivePropertyInfo driver=new DrivePropertyInfo();
+	driver.setControl(myBoundPropertyControl);
+	report=driver.doVetoChangeOnConstrainedProperty();
+        return report;
+    }
+
+    /*
+     * Test veto-ing a the change on a constrained property
+     */
+    @WebMethod
+    public Report testVetoChangeOnConstrainedExternalProperty()
+    {        
+    	Report report=new Report();
+	DrivePropertyInfo driver=new DrivePropertyInfo();
+	driver.setControl(myBoundPropertyControl);
+	report=driver.doVetoChangeOnConstrainedExtProperty();
+        return report;
+    }
+    /*
+     * Test veto-ing a the change on a constrained property
+     */
+    @WebMethod
+    public Report testVetoChangeOnUnConstrainedProperty()
+    {        
+    	Report report=new Report();
+	DrivePropertyInfo driver=new DrivePropertyInfo();
+	driver.setControl(myBoundPropertyControl);
+	report=driver.doVetoChangeOnUnConstrainedProperty();
+        return report;
+    }
+
+    /*
+     * Test veto-ing a the change on a unconstrained property
+     */
+    @WebMethod
+    public Report testVetoChangeOnUnConstrainedExternalProperty()
+    {        
+    	Report report=new Report();
+	DrivePropertyInfo driver=new DrivePropertyInfo();
+	driver.setControl(myBoundPropertyControl);
+	report=driver.doVetoChangeOnUnConstrainedExtProperty();
+        return report;
+    }
+    
+}

Propchange: beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Property.jws
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/webapps/controlsWeb/app.properties
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/app.properties?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/app.properties (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/app.properties Fri Aug 12 08:12:28 2005
@@ -1,6 +1,6 @@
-app.inject.netui: true
-app.inject.wsm: true
-app.inject.milton: true
-### these two can be set to 'jar' or 'src' ###
-app.inject.test.drivers: jar
-app.inject.test.controls: jar
+app.inject.netui: true
+app.inject.wsm: true
+app.inject.milton: true
+### these two can be set to 'jar' or 'src' ###
+app.inject.test.drivers: jar
+app.inject.test.controls: jar

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

Modified: beehive/trunk/controls/test/webapps/controlsWeb/binding/BindingTests.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/binding/BindingTests.jpf?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/binding/BindingTests.jpf (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/binding/BindingTests.jpf Fri Aug 12 08:12:28 2005
@@ -1,80 +1,80 @@
-/*
- * 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 binding;
-
-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.properties.BaseProperties;
-
-import org.apache.beehive.controls.test.controls.binding.BindingTestControl;
-import org.apache.beehive.controls.test.controls.binding.DefaultBindingTestControl;
-import org.apache.beehive.controls.test.controls.binding.ExternalBindingTestControl;
-
-import org.apache.beehive.test.tools.milton.common.Report;
-
-@Jpf.Controller(
-    forwards = {
-        @Jpf.Forward(name=Report.RESULTS,path = Report.RESULTSJSP) 
-    }
-)
-public class BindingTests extends PageFlowController
-{
-
-    @Control
-    @BaseProperties( controlImplementation="org.apache.beehive.controls.test.controls.binding.BindingTestControlOverrideImpl" )
-    public BindingTestControl btc;
-
-    @Control
-    public DefaultBindingTestControl dbtc;
-
-    @Control
-    public ExternalBindingTestControl ebtc;
-
-    @Jpf.Action
-    protected Forward begin()
-    {
-	return new Forward(Report.RESULTS, Report.KEY, new 
-			   Report(Report.ABORT,"begin() is not a test method!"));
-    }
-
-    @Jpf.Action
-    protected Forward testBindingOverride()
-    {
-	return new Forward(Report.RESULTS, Report.KEY, new 
-			   Report(btc.getStatus()));
-    }
-
-    @Jpf.Action
-    protected Forward testDefaultBinding()
-    {
-	return new Forward(Report.RESULTS, Report.KEY, new 
-			   Report(dbtc.getStatus()));
-    }
-
-    @Jpf.Action
-    protected Forward testExternalBinding()
-    {
-	return new Forward(Report.RESULTS, Report.KEY, new 
-			   Report(ebtc.getStatus()));
-    }
-}
+/*
+ * 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 binding;
+
+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.properties.BaseProperties;
+
+import org.apache.beehive.controls.test.controls.binding.BindingTestControl;
+import org.apache.beehive.controls.test.controls.binding.DefaultBindingTestControl;
+import org.apache.beehive.controls.test.controls.binding.ExternalBindingTestControl;
+
+import org.apache.beehive.test.tools.milton.common.Report;
+
+@Jpf.Controller(
+    forwards = {
+        @Jpf.Forward(name=Report.RESULTS,path = Report.RESULTSJSP) 
+    }
+)
+public class BindingTests extends PageFlowController
+{
+
+    @Control
+    @BaseProperties( controlImplementation="org.apache.beehive.controls.test.controls.binding.BindingTestControlOverrideImpl" )
+    public BindingTestControl btc;
+
+    @Control
+    public DefaultBindingTestControl dbtc;
+
+    @Control
+    public ExternalBindingTestControl ebtc;
+
+    @Jpf.Action
+    protected Forward begin()
+    {
+	return new Forward(Report.RESULTS, Report.KEY, new 
+			   Report(Report.ABORT,"begin() is not a test method!"));
+    }
+
+    @Jpf.Action
+    protected Forward testBindingOverride()
+    {
+	return new Forward(Report.RESULTS, Report.KEY, new 
+			   Report(btc.getStatus()));
+    }
+
+    @Jpf.Action
+    protected Forward testDefaultBinding()
+    {
+	return new Forward(Report.RESULTS, Report.KEY, new 
+			   Report(dbtc.getStatus()));
+    }
+
+    @Jpf.Action
+    protected Forward testExternalBinding()
+    {
+	return new Forward(Report.RESULTS, Report.KEY, new 
+			   Report(ebtc.getStatus()));
+    }
+}

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

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

Modified: beehive/trunk/controls/test/webapps/controlsWeb/context/getotherservice/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/context/getotherservice/Controller.jpf?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/context/getotherservice/Controller.jpf (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/context/getotherservice/Controller.jpf Fri Aug 12 08:12:28 2005
@@ -1,62 +1,62 @@
-/*
- * 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 context.getotherservice;
-
-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.context.ServiceGetterBean;
-import org.apache.beehive.controls.test.driver.context.DriveServiceGetter;
-import org.apache.beehive.test.tools.milton.common.Report;
-
-/* Test getting other services avaliable to control context
- * The control is instantiated declaratively
- */
-
-@Jpf.Controller(
-    forwards = {
-        @Jpf.Forward(name=Report.RESULTS,path = Report.RESULTSJSP) 
-    })
-public class Controller extends PageFlowController
-{
-
-    @Control
-    public ServiceGetterBean serviceGetter;
-    
-    /**
-     * @jpf:action
-     */
-    @Jpf.Action(
-        )
-    protected Forward begin(){
-    	
-	DriveServiceGetter driver=new DriveServiceGetter();
-	driver.setControl(serviceGetter);
-	driver.setTestEnv(true,true,false);
-	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 context.getotherservice;
+
+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.context.ServiceGetterBean;
+import org.apache.beehive.controls.test.driver.context.DriveServiceGetter;
+import org.apache.beehive.test.tools.milton.common.Report;
+
+/* Test getting other services avaliable to control context
+ * The control is instantiated declaratively
+ */
+
+@Jpf.Controller(
+    forwards = {
+        @Jpf.Forward(name=Report.RESULTS,path = Report.RESULTSJSP) 
+    })
+public class Controller extends PageFlowController
+{
+
+    @Control
+    public ServiceGetterBean serviceGetter;
+    
+    /**
+     * @jpf:action
+     */
+    @Jpf.Action(
+        )
+    protected Forward begin(){
+    	
+	DriveServiceGetter driver=new DriveServiceGetter();
+	driver.setControl(serviceGetter);
+	driver.setTestEnv(true,true,false);
+	Report report=driver.doTest();
+	
+        return new Forward(Report.RESULTS, Report.KEY, report);
+    }
+
+}
+
+

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

Modified: beehive/trunk/controls/test/webapps/controlsWeb/context/getotherservice2/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/context/getotherservice2/Controller.jpf?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/context/getotherservice2/Controller.jpf (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/context/getotherservice2/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 context.getotherservice2;
-
-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.context.ServiceGetterBean;
-import org.apache.beehive.controls.test.driver.context.DriveServiceGetter;
-import org.apache.beehive.test.tools.milton.common.Report;
-
-/* Test getting other services avaliable to control context
- * The 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();
-	DriveServiceGetter driver=new DriveServiceGetter();
-	try{
-		ServiceGetterBean serviceGetter=(ServiceGetterBean)java.beans.Beans.instantiate(
-			Thread.currentThread().getContextClassLoader() ,
-			"org.apache.beehive.controls.test.controls.context.ServiceGetterBean");
-		driver.setControl(serviceGetter);
-		driver.setTestEnv(true,true,false);
-		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 context.getotherservice2;
+
+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.context.ServiceGetterBean;
+import org.apache.beehive.controls.test.driver.context.DriveServiceGetter;
+import org.apache.beehive.test.tools.milton.common.Report;
+
+/* Test getting other services avaliable to control context
+ * The 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();
+	DriveServiceGetter driver=new DriveServiceGetter();
+	try{
+		ServiceGetterBean serviceGetter=(ServiceGetterBean)java.beans.Beans.instantiate(
+			Thread.currentThread().getContextClassLoader() ,
+			"org.apache.beehive.controls.test.controls.context.ServiceGetterBean");
+		driver.setControl(serviceGetter);
+		driver.setTestEnv(true,true,false);
+		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/context/getotherservice2/Controller.jpf
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/webapps/controlsWeb/contextevent/beanrecord/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/contextevent/beanrecord/Controller.jpf?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/contextevent/beanrecord/Controller.jpf (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/contextevent/beanrecord/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 contextevent.beanrecord;
-
-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.lang.Thread;
-import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.api.bean.ControlBean;
-import org.apache.beehive.controls.test.controls.contextevent.RecorderBean;
-import org.apache.beehive.controls.test.driver.contextevent.DriveBeanRecorder;
-import org.apache.beehive.test.tools.milton.common.Report;
-
-/* Test linstening to control life cycle events by adding listeners to
- * control bean class.
- * The control is instantiated declaratively
- */
-
-@Jpf.Controller(
-    forwards = {
-        @Jpf.Forward(name=Report.RESULTS,path = Report.RESULTSJSP) 
-    })
-public class Controller extends PageFlowController
-{
-
-    @Control
-    public RecorderBean recorder;
-    
-    /**
-     * @jpf:action
-     */
-    @Jpf.Action(
-        )
-    protected Forward begin(){
-    	
-	DriveBeanRecorder driver=new DriveBeanRecorder();
-	driver.setControl(recorder);
-	Report report=driver.testBeanContextEvent();
-	report=driver.testResourceContextEvent();
-	
-	try{
-		Thread.currentThread().sleep(500);
-		report=driver.getResult();
-	}
-	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 contextevent.beanrecord;
+
+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.lang.Thread;
+import org.apache.beehive.controls.api.bean.Control;
+import org.apache.beehive.controls.api.bean.ControlBean;
+import org.apache.beehive.controls.test.controls.contextevent.RecorderBean;
+import org.apache.beehive.controls.test.driver.contextevent.DriveBeanRecorder;
+import org.apache.beehive.test.tools.milton.common.Report;
+
+/* Test linstening to control life cycle events by adding listeners to
+ * control bean class.
+ * The control is instantiated declaratively
+ */
+
+@Jpf.Controller(
+    forwards = {
+        @Jpf.Forward(name=Report.RESULTS,path = Report.RESULTSJSP) 
+    })
+public class Controller extends PageFlowController
+{
+
+    @Control
+    public RecorderBean recorder;
+    
+    /**
+     * @jpf:action
+     */
+    @Jpf.Action(
+        )
+    protected Forward begin(){
+    	
+	DriveBeanRecorder driver=new DriveBeanRecorder();
+	driver.setControl(recorder);
+	Report report=driver.testBeanContextEvent();
+	report=driver.testResourceContextEvent();
+	
+	try{
+		Thread.currentThread().sleep(500);
+		report=driver.getResult();
+	}
+	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/contextevent/beanrecord/Controller.jpf
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/webapps/controlsWeb/contextevent/implrecord/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/contextevent/implrecord/Controller.jpf?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/contextevent/implrecord/Controller.jpf (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/contextevent/implrecord/Controller.jpf Fri Aug 12 08:12:28 2005
@@ -1,62 +1,62 @@
-/*
- * 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 contextevent.implrecord;
-
-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.contextevent.RecorderBean;
-import org.apache.beehive.controls.test.driver.contextevent.DriveRecorder;
-import org.apache.beehive.test.tools.milton.common.Report;
-
-/* Test linstening to control life cycle events by EventHandler on control
- * implementation class.
- * The control is instantiated declaratively
- */
-
-@Jpf.Controller(
-    forwards = {
-        @Jpf.Forward(name=Report.RESULTS,path = Report.RESULTSJSP) 
-    })
-public class Controller extends PageFlowController
-{
-
-    @Control
-    public RecorderBean recorder;
-    
-    /**
-     * @jpf:action
-     */
-    @Jpf.Action(
-        )
-    protected Forward begin(){
-    	
-	DriveRecorder driver=new DriveRecorder();
-	driver.setControl(recorder);
-	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 contextevent.implrecord;
+
+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.contextevent.RecorderBean;
+import org.apache.beehive.controls.test.driver.contextevent.DriveRecorder;
+import org.apache.beehive.test.tools.milton.common.Report;
+
+/* Test linstening to control life cycle events by EventHandler on control
+ * implementation class.
+ * The control is instantiated declaratively
+ */
+
+@Jpf.Controller(
+    forwards = {
+        @Jpf.Forward(name=Report.RESULTS,path = Report.RESULTSJSP) 
+    })
+public class Controller extends PageFlowController
+{
+
+    @Control
+    public RecorderBean recorder;
+    
+    /**
+     * @jpf:action
+     */
+    @Jpf.Action(
+        )
+    protected Forward begin(){
+    	
+	DriveRecorder driver=new DriveRecorder();
+	driver.setControl(recorder);
+	Report report=driver.doTest();
+	
+        return new Forward(Report.RESULTS, Report.KEY, report);
+    }
+
+}
+
+

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

Modified: beehive/trunk/controls/test/webapps/controlsWeb/contextevent/implrecord2/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/contextevent/implrecord2/Controller.jpf?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/contextevent/implrecord2/Controller.jpf (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/contextevent/implrecord2/Controller.jpf Fri Aug 12 08:12:28 2005
@@ -1,71 +1,71 @@
-/*
- * 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 contextevent.implrecord2;
-
-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.contextevent.RecorderBean;
-import org.apache.beehive.controls.test.driver.contextevent.DriveRecorder;
-import org.apache.beehive.test.tools.milton.common.Report;
-
-/* Test linstening to control life cycle events by EventHandler on control
- * implementation class.
- * The 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();
-	DriveRecorder driver=new DriveRecorder();
-
-	try{
-		RecorderBean recorder=(RecorderBean)java.beans.Beans.instantiate(
-			Thread.currentThread().getContextClassLoader() ,
-			"org.apache.beehive.controls.test.controls.contextevent.RecorderBean");
-		driver.setControl(recorder);
-		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 contextevent.implrecord2;
+
+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.contextevent.RecorderBean;
+import org.apache.beehive.controls.test.driver.contextevent.DriveRecorder;
+import org.apache.beehive.test.tools.milton.common.Report;
+
+/* Test linstening to control life cycle events by EventHandler on control
+ * implementation class.
+ * The 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();
+	DriveRecorder driver=new DriveRecorder();
+
+	try{
+		RecorderBean recorder=(RecorderBean)java.beans.Beans.instantiate(
+			Thread.currentThread().getContextClassLoader() ,
+			"org.apache.beehive.controls.test.controls.contextevent.RecorderBean");
+		driver.setControl(recorder);
+		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/contextevent/implrecord2/Controller.jpf
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/webapps/controlsWeb/controlsWeb.controls.properties
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/controlsWeb.controls.properties?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/controlsWeb.controls.properties (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/controlsWeb.controls.properties Fri Aug 12 08:12:28 2005
@@ -1,2 +1,2 @@
-## This file is part of the Controls Binding tests ###
+## This file is part of the Controls Binding tests ###
 org.apache.beehive.controls.test.controls.binding.BindingTestControlBean=org.apache.beehive.controls.test.controls.binding.BindingTestControlOverrideBean

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

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

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

Modified: beehive/trunk/controls/test/webapps/controlsWeb/event/eventhandler/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/event/eventhandler/Controller.jpf?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/event/eventhandler/Controller.jpf (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/event/eventhandler/Controller.jpf Fri Aug 12 08:12:28 2005
@@ -1,126 +1,126 @@
-/*
- * 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 event.eventhandler;
-
-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.event.HelloBean;
-import org.apache.beehive.test.tools.milton.common.Report;
-
-/* Test receiving events raised by a control using EventHandler annotations
- * The control is instantiated declaratively
- */
-
-@Jpf.Controller(
-    forwards = {
-        @Jpf.Forward(name=Report.RESULTS,path = Report.RESULTSJSP) 
-    })
-public class Controller extends PageFlowController
-{
-	
-    @Control
-    public HelloBean myHelloBean;
-    
-    private boolean eventSet1Received=false;
-    private boolean eventSet2Received=false;
-
-    /** EventHandler that receives EventSet1 from myHelloBean*/
-    @EventHandler (field="myHelloBean", eventSet= HelloBean.EventSet1.class,
-                                   eventName="method1")
-     public void myHelloBeanMessageHandler()
-     {
-		eventSet1Received=true;
-     }
-
-
-    /** EventHandler that receives EventSet2 from myHelloBean*/
-    @EventHandler (field="myHelloBean", eventSet= HelloBean.EventSet2.class, eventName="set2Method2")
-     public int myHelloBeanMessageHandler2()
-     {
-		eventSet2Received=true;
-		return 0;
-     }
-
-
-
-
-    @Jpf.Action(
-        )
-    protected Forward begin(){
-	
-	//Invoke method on myHelloBean to trigger the events
-
-		Report report=new Report();
-	
-		try{
-			myHelloBean.triggerEvents();
-			report.setStatus(Report.PASS);
-
-			if (eventSet1Received && eventSet2Received)
-				report.setStatus(Report.PASS);
-			else{
-				report.setStatus(Report.FAIL);
-			
-				String detail="";
-				if (!eventSet1Received)
-					detail="EventSet1 is not received.";
-				if (!eventSet2Received)
-					detail=detail+"EventSet2 is not received.";
-				report.setMessage(detail);
-			}
-		}
-		catch(Exception e){
-			report.setStatus(Report.FAIL);
-			report.setExceptionStack(e);
-	
-		}
-
-        return new Forward(Report.RESULTS, Report.KEY, report);
-    }
-
-    @Jpf.Action(
-        )
-    protected Forward verifyResult(){
-    	
-	Report report=new Report();
-	
-	if (eventSet1Received && eventSet2Received)
-		report.setStatus(Report.PASS);
-	else{
-		report.setStatus(Report.FAIL);
-		
-		String detail="";
-		if (!eventSet1Received)
-			detail="EventSet1 is not received.";
-		if (!eventSet2Received)
-			detail=detail+"EventSet2 is not received.";
-		report.setMessage(detail);
-	}
-	
-        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 event.eventhandler;
+
+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.event.HelloBean;
+import org.apache.beehive.test.tools.milton.common.Report;
+
+/* Test receiving events raised by a control using EventHandler annotations
+ * The control is instantiated declaratively
+ */
+
+@Jpf.Controller(
+    forwards = {
+        @Jpf.Forward(name=Report.RESULTS,path = Report.RESULTSJSP) 
+    })
+public class Controller extends PageFlowController
+{
+	
+    @Control
+    public HelloBean myHelloBean;
+    
+    private boolean eventSet1Received=false;
+    private boolean eventSet2Received=false;
+
+    /** EventHandler that receives EventSet1 from myHelloBean*/
+    @EventHandler (field="myHelloBean", eventSet= HelloBean.EventSet1.class,
+                                   eventName="method1")
+     public void myHelloBeanMessageHandler()
+     {
+		eventSet1Received=true;
+     }
+
+
+    /** EventHandler that receives EventSet2 from myHelloBean*/
+    @EventHandler (field="myHelloBean", eventSet= HelloBean.EventSet2.class, eventName="set2Method2")
+     public int myHelloBeanMessageHandler2()
+     {
+		eventSet2Received=true;
+		return 0;
+     }
+
+
+
+
+    @Jpf.Action(
+        )
+    protected Forward begin(){
+	
+	//Invoke method on myHelloBean to trigger the events
+
+		Report report=new Report();
+	
+		try{
+			myHelloBean.triggerEvents();
+			report.setStatus(Report.PASS);
+
+			if (eventSet1Received && eventSet2Received)
+				report.setStatus(Report.PASS);
+			else{
+				report.setStatus(Report.FAIL);
+			
+				String detail="";
+				if (!eventSet1Received)
+					detail="EventSet1 is not received.";
+				if (!eventSet2Received)
+					detail=detail+"EventSet2 is not received.";
+				report.setMessage(detail);
+			}
+		}
+		catch(Exception e){
+			report.setStatus(Report.FAIL);
+			report.setExceptionStack(e);
+	
+		}
+
+        return new Forward(Report.RESULTS, Report.KEY, report);
+    }
+
+    @Jpf.Action(
+        )
+    protected Forward verifyResult(){
+    	
+	Report report=new Report();
+	
+	if (eventSet1Received && eventSet2Received)
+		report.setStatus(Report.PASS);
+	else{
+		report.setStatus(Report.FAIL);
+		
+		String detail="";
+		if (!eventSet1Received)
+			detail="EventSet1 is not received.";
+		if (!eventSet2Received)
+			detail=detail+"EventSet2 is not received.";
+		report.setMessage(detail);
+	}
+	
+        return new Forward(Report.RESULTS, Report.KEY, report);
+    }
+
+}
+
+

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

Modified: beehive/trunk/controls/test/webapps/controlsWeb/event/listener/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/event/listener/Controller.jpf?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/event/listener/Controller.jpf (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/event/listener/Controller.jpf Fri Aug 12 08:12:28 2005
@@ -1,71 +1,71 @@
-/*
- * 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 event.listener;
-
-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.event.HelloBean;
-import org.apache.beehive.controls.test.driver.event.DriveListener;
-import org.apache.beehive.test.tools.milton.common.Report;
-
-/* Test receiving events raised by a control using a registered listener
- * The control is instantiated declaratively
- */
-
-@Jpf.Controller(
-    forwards = {
-        @Jpf.Forward(name=Report.RESULTS,path = Report.RESULTSJSP) 
-    })
-public class Controller extends PageFlowController
-{
-
-    @Control
-    public HelloBean hello;
-    
-    /**
-     * @jpf:action
-     */
-    @Jpf.Action(
-        )
-    protected Forward begin(){
-    	
-	DriveListener driver=new DriveListener();
-	driver.setControl(hello);
-	Report report=driver.doTest();
-	
-	if (report.getStatus().equals(Report.PASS)){
-
-	    try{
-		Thread.currentThread().sleep(1000);
-		report=driver.verifyResult();
-		}
-	    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 event.listener;
+
+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.event.HelloBean;
+import org.apache.beehive.controls.test.driver.event.DriveListener;
+import org.apache.beehive.test.tools.milton.common.Report;
+
+/* Test receiving events raised by a control using a registered listener
+ * The control is instantiated declaratively
+ */
+
+@Jpf.Controller(
+    forwards = {
+        @Jpf.Forward(name=Report.RESULTS,path = Report.RESULTSJSP) 
+    })
+public class Controller extends PageFlowController
+{
+
+    @Control
+    public HelloBean hello;
+    
+    /**
+     * @jpf:action
+     */
+    @Jpf.Action(
+        )
+    protected Forward begin(){
+    	
+	DriveListener driver=new DriveListener();
+	driver.setControl(hello);
+	Report report=driver.doTest();
+	
+	if (report.getStatus().equals(Report.PASS)){
+
+	    try{
+		Thread.currentThread().sleep(1000);
+		report=driver.verifyResult();
+		}
+	    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/event/listener/Controller.jpf
------------------------------------------------------------------------------
    svn:eol-style = native