commits@beehive.apache.org Archives

[Beehive Wiki] Update of "chinese mobile phones" by efnsamoki

2009-07-23T19:47:41Z

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Beehive Wiki" for change notification.

The following page has been changed by efnsamoki:
http://wiki.apache.org/beehive/chinese_mobile_phones

The comment on the change is:
spam

------------------------------------------------------------------------------
- MTK has brought the [http://www.buyyourall.com mobile phone] revolution, the United Nations
Development Co., Ltd. is the title, full name in English is called MTK..
+ deleted

- United Nations Development Co., Ltd., founded in the year 1997, is one of the world's top
professional IC design company, the world's largest consumer of IC chip group of pilot status.
Covering the area of digital consumer products, digital TV, optical storage, [http://www.buyyourall.com
mobile phone], and so most of the series, is Asia's only six years in a row re-design the
world's top 10 IC companies only Chinese enterprises, the United States, "Forbes" magazine
" Top 50 Asian companies. "
- United Nations Development as a global technology leader in IC design, focusing on wireless
communications and digital media technology. The chip company to provide integrated system
solutions, including wireless communications, high-resolution digital TV, optical storage,
high-resolution DVD-related products, ranking first in the market leadership position.
- United Nations Development Science and Technology was founded in 1997, has been publicly
traded on the Taiwan Stock Exchange, code-named equity 2454. The company is headquartered
in Taiwan and has sales and R & D team in China, the United States, Britain, Ireland,
Denmark, India, Japan, South Korea and Singapore.mtk make [http://www.buyyourall.com mobile
phone]more cheap and multifunctiom. it is more and more popular in the world.
-

[Beehive Wiki] Update of "FortuneCookies" by efnsamoki

2009-07-23T19:41:37Z

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Beehive Wiki" for change notification.

The following page has been changed by efnsamoki:
http://wiki.apache.org/beehive/FortuneCookies

------------------------------------------------------------------------------
  * We live in an age when unnecessary things are our only necessities. Oscar Wilde (1854
- 1900).
  * When it is not necessary to make a decision, it is necessary not to make a decision. Lord
Falkland (1610 - 1643).
  * The best way to become acquainted with a subject is to write a book about it. Benjamin
Disraeli (1804 - 1881).
+ * "Yields falsehood when preceded by its quotation" yields falsehood when preceded by its
quotation. W.V.O. Quine.

[Beehive Wiki] Update of "FortuneCookies" by efnsamoki

2009-07-23T19:34:35Z

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Beehive Wiki" for change notification.

The following page has been changed by efnsamoki:
http://wiki.apache.org/beehive/FortuneCookies

------------------------------------------------------------------------------
-  * Edit the FortuneCookies page to display randomly selected wisdom here.
+ * We live in an age when unnecessary things are our only necessities. Oscar Wilde (1854
- 1900).
+ * When it is not necessary to make a decision, it is necessary not to make a decision. Lord
Falkland (1610 - 1643).
+ * The best way to become acquainted with a subject is to write a book about it. Benjamin
Disraeli (1804 - 1881).

[Beehive Wiki] Update of "chinese mobile phones" by buyyourall

2008-12-22T15:51:11Z

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Beehive Wiki" for change notification.

The following page has been changed by buyyourall:
http://wiki.apache.org/beehive/chinese_mobile_phones

New page:
MTK has brought the [http://www.buyyourall.com mobile phone] revolution, the United Nations
Development Co., Ltd. is the title, full name in English is called MTK..

United Nations Development Co., Ltd., founded in the year 1997, is one of the world's top
professional IC design company, the world's largest consumer of IC chip group of pilot status.
Covering the area of digital consumer products, digital TV, optical storage, [http://www.buyyourall.com
mobile phone], and so most of the series, is Asia's only six years in a row re-design the
world's top 10 IC companies only Chinese enterprises, the United States, "Forbes" magazine
" Top 50 Asian companies. "
United Nations Development as a global technology leader in IC design, focusing on wireless
communications and digital media technology. The chip company to provide integrated system
solutions, including wireless communications, high-resolution digital TV, optical storage,
high-resolution DVD-related products, ranking first in the market leadership position.
United Nations Development Science and Technology was founded in 1997, has been publicly traded
on the Taiwan Stock Exchange, code-named equity 2454. The company is headquartered in Taiwan
and has sales and R & D team in China, the United States, Britain, Ireland, Denmark, India,
Japan, South Korea and Singapore.mtk make [http://www.buyyourall.com mobile phone]more cheap
and multifunctiom. it is more and more popular in the world.

svn commit: r692920 - in /beehive/trunk/netui/src: scoping/org/apache/beehive/netui/pageflow/scoping/ScopedServletUtils.java tags-html/org/apache/beehive/netui/tags/html/CheckBox.java tags-html/org/apache/beehive/netui/tags/html/Select.java

2008-09-07T19:09:05Z

Author: crogers
Date: Sun Sep  7 12:09:05 2008
New Revision: 692920

URL: http://svn.apache.org/viewvc?rev=692920&view=rev
Log:
Fix for BEEHIVE-1226, a contribution from Poorna Ramasamy. Thanks Poorna.


Modified:
    beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/ScopedServletUtils.java
    beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java
    beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java

Modified: beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/ScopedServletUtils.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/ScopedServletUtils.java?rev=692920&r1=692919&r2=692920&view=diff
==============================================================================
--- beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/ScopedServletUtils.java
(original)
+++ beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/ScopedServletUtils.java
Sun Sep  7 12:09:05 2008
@@ -491,7 +491,7 @@
      * Just escapes some of the characters in the value with their
      * associated entities;
      */
-    private static String filterParamValue(String value)
+    public static String filterParamValue(String value)
     {
         if (value == null) {
             return null;

Modified: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java?rev=692920&r1=692919&r2=692920&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java (original)
+++ beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java Sun
Sep  7 12:09:05 2008
@@ -20,6 +20,7 @@
 
 import org.apache.beehive.netui.pageflow.ProcessPopulate;
 import org.apache.beehive.netui.pageflow.RequestParameterHandler;
+import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
 import org.apache.beehive.netui.tags.ByRef;
 import org.apache.beehive.netui.tags.IHtmlAccessable;
 import org.apache.beehive.netui.tags.naming.FormDataNameInterceptor;
@@ -283,7 +284,7 @@
         _state.disabled = isDisabled();
 
         //Create a hidden field to store the CheckBox oldValue
-        String oldValue = req.getParameter(_state.name);
+        String oldValue = ScopedServletUtils.filterParamValue(req.getParameter(_state.name));
         WriteRenderAppender writer = new WriteRenderAppender(pageContext);
 
         // if the checkbox is disabled we need to not write out the hidden

Modified: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java?rev=692920&r1=692919&r2=692920&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java (original)
+++ beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java Sun Sep
 7 12:09:05 2008
@@ -22,6 +22,7 @@
 
 import org.apache.beehive.netui.pageflow.ProcessPopulate;
 import org.apache.beehive.netui.pageflow.RequestParameterHandler;
+import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
 import org.apache.beehive.netui.script.common.DataAccessProviderStack;
 import org.apache.beehive.netui.script.common.IDataAccessProvider;
 import org.apache.beehive.netui.tags.ByRef;
@@ -37,6 +38,7 @@
 import javax.servlet.ServletRequest;
 import javax.servlet.jsp.JspException;
 import java.util.*;
+import java.util.regex.Pattern;
 
 
 /**
@@ -220,6 +222,11 @@
 
     private static final Logger logger = Logger.getInstance(Select.class);
 
+    private static final Pattern PATTERN_SCRIPT = Pattern.compile(".*

svn commit: r666879 - /beehive/trunk/docs/forrest/forrest.properties

2008-06-11T22:43:40Z

Author: crogers
Date: Wed Jun 11 15:43:40 2008
New Revision: 666879

URL: http://svn.apache.org/viewvc?rev=666879&view=rev
Log:
Fix for BEEHIVE-1221, a contribution from Scott L'Hommedieu to solve an issue with Forrest
when building the distribution. Thanks Scott!

Tests: built the dist


Modified:
    beehive/trunk/docs/forrest/forrest.properties

Modified: beehive/trunk/docs/forrest/forrest.properties
URL: http://svn.apache.org/viewvc/beehive/trunk/docs/forrest/forrest.properties?rev=666879&r1=666878&r2=666879&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/forrest.properties (original)
+++ beehive/trunk/docs/forrest/forrest.properties Wed Jun 11 15:43:40 2008
@@ -122,7 +122,7 @@
 # a production environment it is recomended that you specify a known working 
 # version.
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=org.apache.forrest.plugin.output.pdf
+project.required.plugins=org.apache.forrest.plugin.output.pdf-0.1
 
 # Proxy configuration
 # proxy.host=

svn commit: r666255 - in /beehive/trunk/netui/test/webapps/drt: src/bugs/j517/ src/javascript/jsFind/ src/miniTests/binding/ src/validation/declarativeValidation/ testRecorder/tests/

2008-06-10T18:22:04Z

Author: crogers
Date: Tue Jun 10 11:22:04 2008
New Revision: 666255

URL: http://svn.apache.org/viewvc?rev=666255&view=rev
Log:
Minor test changes... changed some tests to use LinkedHashMap rather than HashMap so that
the content of the test recordings are in a predictable iteration order.

Tests: netui BVT (WinXP passed)

Modified:
    beehive/trunk/netui/test/webapps/drt/src/bugs/j517/Controller.java
    beehive/trunk/netui/test/webapps/drt/src/javascript/jsFind/JsFind.java
    beehive/trunk/netui/test/webapps/drt/src/miniTests/binding/Controller.java
    beehive/trunk/netui/test/webapps/drt/src/validation/declarativeValidation/Controller.java
    beehive/trunk/netui/test/webapps/drt/testRecorder/tests/ValidateThroughAction.xml
    beehive/trunk/netui/test/webapps/drt/testRecorder/tests/ValidateThroughClass.xml
    beehive/trunk/netui/test/webapps/drt/testRecorder/tests/ValidateThroughForm.xml

Modified: beehive/trunk/netui/test/webapps/drt/src/bugs/j517/Controller.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/src/bugs/j517/Controller.java?rev=666255&r1=666254&r2=666255&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/src/bugs/j517/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/src/bugs/j517/Controller.java Tue Jun 10 11:22:04
2008
@@ -23,12 +23,11 @@
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 
-@Jpf.Controller(
-    )
+@Jpf.Controller()
 public class Controller extends PageFlowController
 {
-    private HashMap radopts;
     private String resultsTwo;
 
     private HashMap opts;
@@ -49,12 +48,9 @@
         this.resultsOne = resultsOne;
     }
 
-  
-
     protected void onCreate()
     {        
-      
-        opts = new HashMap();
+        opts = new LinkedHashMap();
         opts.put("val1","Value One");
         opts.put("val2","Value Two");
         opts.put("val3","Value Three");
@@ -62,10 +58,6 @@
         opts.put("val4","Value Four");
     }
     
-    /**
-     * @jpf:action
-     * @jpf:forward name="index" path="index.jsp"
-     */
     @Jpf.Action(
         forwards = {
             @Jpf.Forward(
@@ -77,10 +69,6 @@
         return new Forward("index");
     }
     
-    /**
-     * @jpf:action
-     * @jpf:forward name="index" path="Results.jsp"
-     */
     @Jpf.Action(
         forwards = {
             @Jpf.Forward(

Modified: beehive/trunk/netui/test/webapps/drt/src/javascript/jsFind/JsFind.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/src/javascript/jsFind/JsFind.java?rev=666255&r1=666254&r2=666255&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/src/javascript/jsFind/JsFind.java (original)
+++ beehive/trunk/netui/test/webapps/drt/src/javascript/jsFind/JsFind.java Tue Jun 10 11:22:04
2008
@@ -22,95 +22,10 @@
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 import java.io.Serializable;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
-/**
- * @jpf:controller
- * @jpf:view-properties view-properties::
- * 
- * 
- * 
- * 
- *   
- *   
- * 
- * 
- *   
- *   
- * 
- * 
- *   
- *   
- *   
- *   
- *   
- * 
- * 
- * 
- * 
- *   
- *   
- * 
- * 
- *   
- *   
- *   
- *   
- * 
- * 
- *   
- *   
- *   
- *   
- *   
- * 
- * 
- * ::
- */
-@Jpf.Controller(
-    )
-@Jpf.ViewProperties(
-    value = {
-        "",
-        "",
-        "",
-        "",
-        "  ",
-        "  ",
-        "",
-        "",
-        "  ",
-        "  ",
-        "",
-        "",
-        "  ",
-        "  ",
-        "  ",
-        "  ",
-        "  ",
-        "",
-        "",
-        "",
-        "",
-        "  ",
-        "  ",
-        "",
-        "",
-        "  ",
-        "  ",
-        "  ",
-        "  ",
-        "",
-        "",
-        "  ",
-        "  ",
-        "  ",
-        "  ",
-        "  ",
-        "",
-        ""
-    })
+@Jpf.Controller()
 public class JsFind extends PageFlowController
 {
     private Map options;
@@ -140,8 +55,6 @@
 
     /**
      * This method represents the point of entry into the pageflow
-     * @jpf:action
-     * @jpf:forward name="success" path="index.jsp"
      */
     @Jpf.Action(
         forwards = {
@@ -151,7 +64,7 @@
         })
     protected Forward begin()
     {
-        options = new HashMap();
+        options = new LinkedHashMap();
         options.put("value1","Foo Value");
         options.put("value2","Bar Value");
         options.put("value3","Baz Value");
@@ -159,11 +72,6 @@
         return new Forward("success");
     }
 
-    /**
-     * @jpf:action
-
-     * @jpf:forward name="success" path="index.jsp"
-     */
     @Jpf.Action(
         forwards = {
             @Jpf.Forward(

Modified: beehive/trunk/netui/test/webapps/drt/src/miniTests/binding/Controller.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/src/miniTests/binding/Controller.java?rev=666255&r1=666254&r2=666255&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/src/miniTests/binding/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/src/miniTests/binding/Controller.java Tue Jun 10
11:22:04 2008
@@ -26,6 +26,7 @@
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 
 @Jpf.Controller
 public class Controller extends PageFlowController
@@ -83,7 +84,7 @@
                 path = "Begin.jsp") 
         })
     protected Forward begin(){
-    _hashValues = new HashMap();
+    _hashValues = new LinkedHashMap();
     _hashValues.put("foo","bar");
     _hashValues.put("baz","blee");
     _hashValues.put("array",_values);

Modified: beehive/trunk/netui/test/webapps/drt/src/validation/declarativeValidation/Controller.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/src/validation/declarativeValidation/Controller.java?rev=666255&r1=666254&r2=666255&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/src/validation/declarativeValidation/Controller.java
(original)
+++ beehive/trunk/netui/test/webapps/drt/src/validation/declarativeValidation/Controller.java
Tue Jun 10 11:22:04 2008
@@ -5,7 +5,7 @@
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 import java.io.Serializable;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 @Jpf.Controller(
@@ -118,7 +118,7 @@
 
     public Map getActionChoices()
     {
-        HashMap ret = new HashMap();
+        Map ret = new LinkedHashMap();
         ret.put( "formLevelValidate", "form-level validation" );
         ret.put( "actionLevelValidate", "action-level validation" );
         ret.put( "classLevelValidate", "class-level validation" );

Modified: beehive/trunk/netui/test/webapps/drt/testRecorder/tests/ValidateThroughAction.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/ValidateThroughAction.xml?rev=666255&r1=666254&r2=666255&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/testRecorder/tests/ValidateThroughAction.xml (original)
+++ beehive/trunk/netui/test/webapps/drt/testRecorder/tests/ValidateThroughAction.xml Tue
Jun 10 11:22:04 2008
@@ -85,9 +85,9 @@
         
         Which type of validation?
         
-            action-level validation

+            form-level validation

+action-level
validation

 class-level
validation

-form-level validation

 
             
         
@@ -297,9 +297,9 @@
         
         Which type of validation?
         
-            action-level validation

+            form-level validation

+action-level
validation

 class-level
validation

-form-level validation

 
             
         
@@ -509,9 +509,9 @@
         
         Which type of validation?
         
-            action-level validation

+            form-level validation

+action-level validation

 class-level
validation

-form-level
validation

 
             
         
@@ -773,9 +773,9 @@
         
         Which type of validation?
         
-            action-level validation

+            form-level validation

+action-level validation

 class-level
validation

-form-level
validation

 
             
         

Modified: beehive/trunk/netui/test/webapps/drt/testRecorder/tests/ValidateThroughClass.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/ValidateThroughClass.xml?rev=666255&r1=666254&r2=666255&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/testRecorder/tests/ValidateThroughClass.xml (original)
+++ beehive/trunk/netui/test/webapps/drt/testRecorder/tests/ValidateThroughClass.xml Tue Jun
10 11:22:04 2008
@@ -85,9 +85,9 @@
         
         Which type of validation?
         
-            action-level validation

+            form-level validation

+action-level
validation

 class-level
validation

-form-level validation

 
             
         
@@ -297,9 +297,9 @@
         
         Which type of validation?
         
-            action-level validation

+            form-level validation

+action-level
validation

 class-level
validation

-form-level validation

 
             
         
@@ -509,9 +509,9 @@
         
         Which type of validation?
         
-            action-level validation

+            form-level validation

+action-level
validation

 class-level validation

-form-level
validation

 
             
         
@@ -773,9 +773,9 @@
         
         Which type of validation?
         
-            action-level validation

+            form-level validation

+action-level
validation

 class-level validation

-form-level
validation

 
             
         
@@ -1051,9 +1051,9 @@
         
         Which type of validation?
         
-            action-level validation

+            form-level validation

+action-level
validation

 class-level validation

-form-level
validation

 
             
         

Modified: beehive/trunk/netui/test/webapps/drt/testRecorder/tests/ValidateThroughForm.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/ValidateThroughForm.xml?rev=666255&r1=666254&r2=666255&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/testRecorder/tests/ValidateThroughForm.xml (original)
+++ beehive/trunk/netui/test/webapps/drt/testRecorder/tests/ValidateThroughForm.xml Tue Jun
10 11:22:04 2008
@@ -85,9 +85,9 @@
         
         Which type of validation?
         
-            action-level validation

+            form-level validation

+action-level
validation

 class-level
validation

-form-level validation

 
             
         
@@ -297,9 +297,9 @@
         
         Which type of validation?
         
-            action-level validation

+            form-level validation

+action-level
validation

 class-level
validation

-form-level validation

 
             
         
@@ -561,9 +561,9 @@
         
         Which type of validation?
         
-            action-level validation

+            form-level validation

+action-level
validation

 class-level
validation

-form-level validation

 
             
         
@@ -839,9 +839,9 @@
         
         Which type of validation?
         
-            action-level validation

+            form-level validation

+action-level
validation

 class-level
validation

-form-level validation

svn commit: r665719 - /beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/BaseHandler.java

2008-06-09T15:17:05Z

Author: crogers
Date: Mon Jun  9 08:17:05 2008
New Revision: 665719

URL: http://svn.apache.org/viewvc?rev=665719&view=rev
Log:
Fix for BEEHIVE-1220. Modified the BaseHandler.reinit() method to call the reinit() method
on the _previousHandler member if it is not null.

Tests: netui BVT (WinXP passed)


Modified:
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/BaseHandler.java

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/BaseHandler.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/BaseHandler.java?rev=665719&r1=665718&r2=665719&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/BaseHandler.java
(original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/BaseHandler.java
Mon Jun  9 08:17:05 2008
@@ -71,5 +71,8 @@
     public void reinit( ServletContext servletContext )
     {
         _servletContext = servletContext;
+        if (_previousHandler != null) {
+            _previousHandler.reinit(servletContext);
+        }
     }
 }

svn commit: r661404 - /beehive/trunk/netui/src/core/org/apache/beehive/netui/core/urls/URLRewriterService.java

2008-05-29T17:02:41Z

Author: crogers
Date: Thu May 29 10:02:41 2008
New Revision: 661404

URL: http://svn.apache.org/viewvc?rev=661404&view=rev
Log:
Fix for BEEHIVE-1219. Modified the getURLRewriters() method to check for null before calling
the Collections.unmodifiableList() method.
Patch contributed by Poorna. Thanks!

Tests: netui BVT (WinXP passed)


Modified:
    beehive/trunk/netui/src/core/org/apache/beehive/netui/core/urls/URLRewriterService.java

Modified: beehive/trunk/netui/src/core/org/apache/beehive/netui/core/urls/URLRewriterService.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/core/org/apache/beehive/netui/core/urls/URLRewriterService.java?rev=661404&r1=661403&r2=661404&view=diff
==============================================================================
--- beehive/trunk/netui/src/core/org/apache/beehive/netui/core/urls/URLRewriterService.java
(original)
+++ beehive/trunk/netui/src/core/org/apache/beehive/netui/core/urls/URLRewriterService.java
Thu May 29 10:02:41 2008
@@ -166,7 +166,11 @@
      */
     public static List/*< URLRewriter >*/ getURLRewriters( ServletRequest request )
     {
-        return Collections.unmodifiableList( getRewriters( request ) );
+        List rewriters = getRewriters( request );
+        if ( rewriters != null ) {
+            rewriters = Collections.unmodifiableList( rewriters );
+        }
+        return rewriters;
     }
 
     /**

svn commit: r619708 - in /beehive/trunk/netui: src/tags-html/org/apache/beehive/netui/tags/html/ test/webapps/drt/testRecorder/tests/ test/webapps/drt/web/tags/formatTags/

2008-02-08T00:34:10Z

Author: crogers
Date: Thu Feb  7 16:34:08 2008
New Revision: 619708

URL: http://svn.apache.org/viewvc?rev=619708&view=rev
Log:
Modified the formatNumber tag to use BigDecimal rather than double (fixes BEEHIVE-1216).
Also updated a test to cover the rounding error scenario noted in the bug. Patch contributed
by Poorna. Thanks!

Tests: netui BVT (WinXP passed)


Modified:
    beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatNumber.java
    beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtFormatNumberErrors.xml
    beehive/trunk/netui/test/webapps/drt/testRecorder/tests/FormatTags.xml
    beehive/trunk/netui/test/webapps/drt/web/tags/formatTags/Begin.jsp

Modified: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatNumber.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatNumber.java?rev=619708&r1=619707&r2=619708&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatNumber.java
(original)
+++ beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatNumber.java
Thu Feb  7 16:34:08 2008
@@ -18,15 +18,15 @@
  */
 package org.apache.beehive.netui.tags.html;
 
-import org.apache.beehive.netui.util.internal.InternalStringBuilder;
-
-import org.apache.beehive.netui.util.Bundle;
-
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.util.Locale;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.JspTag;
 import javax.servlet.jsp.tagext.SimpleTagSupport;
-import java.text.DecimalFormat;
-import java.util.Locale;
+
+import org.apache.beehive.netui.util.Bundle;
+import org.apache.beehive.netui.util.internal.InternalStringBuilder;
 
 /**
  * A formatter used to format numbers.  This formatter uses patterns that conform to
@@ -245,11 +245,18 @@
                 return "";
             }
             try {
-                double number = Double.parseDouble(dataToFormat.toString());
+                BigDecimal number = new BigDecimal(dataToFormat.toString());
                 formattedString.append(numberFormat.format(number));
             }
             catch (Exception e) {
-                JspException jspException = new JspException(Bundle.getString("Tags_NumberFormatParseException",
e.getMessage()), e);
+                String msg = e.getMessage();
+                // If BigDecimal throws a NumberFormatException without
+                // a message, just provide the data being formatted.
+                if (msg == null) {
+                    msg = dataToFormat.toString();
+                }
+
+                JspException jspException = new JspException(Bundle.getString("Tags_NumberFormatParseException",
msg), e);
 
                 // The 2.5 Servlet api will set the initCause in the Throwable superclass
during construction,
                 // initCause() throws an IllegalStateException if the cause is already set.

Modified: beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtFormatNumberErrors.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtFormatNumberErrors.xml?rev=619708&r1=619707&r2=619708&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtFormatNumberErrors.xml (original)
+++ beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtFormatNumberErrors.xml Thu Feb
 7 16:34:08 2008
@@ -86,7 +86,7 @@
  Page Errors
  Error NumberTag TypeError
 1FormatNumberMessageFormat
tags require a parent that is Formattable.
-2LabelMessageFormatNumber
error parsing input: For input string: "bad.number"
+2LabelMessageFormatNumber
error parsing input: bad.number
 3LabelMessageFormatNumber
error applying pattern: Unquoted special character ';' in pattern ";##0.0#"

@@ -103,4 +103,4 @@ 1 0 1 - \ No newline at end of file + Modified: beehive/trunk/netui/test/webapps/drt/testRecorder/tests/FormatTags.xml URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/FormatTags.xml?rev=619708&r1=619707&r2=619708&view=diff ============================================================================== --- beehive/trunk/netui/test/webapps/drt/testRecorder/tests/FormatTags.xml (original) +++ beehive/trunk/netui/test/webapps/drt/testRecorder/tests/FormatTags.xml Thu Feb 7 16:34:08 2008 @@ -143,6 +143,16 @@ Removed because this is not handled by the test recorder correctly + +BEEHIVE-1216: rounding... use BigDecimal instead of double + + + +

large number: "999999999999999999.97"	+999,999,999,999,999,999.97 +
large currency: "999999999999999999.97"	+$999,999,999,999,999,999.97 +

]]> Modified: beehive/trunk/netui/test/webapps/drt/web/tags/formatTags/Begin.jsp URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/web/tags/formatTags/Begin.jsp?rev=619708&r1=619707&r2=619708&view=diff ============================================================================== --- beehive/trunk/netui/test/webapps/drt/web/tags/formatTags/Begin.jsp (original) +++ beehive/trunk/netui/test/webapps/drt/web/tags/formatTags/Begin.jsp Thu Feb 7 16:34:08 2008 @@ -110,5 +110,19 @@ Removed because this is not handled by the test recorder correctly + +BEEHIVE-1216: rounding... use BigDecimal instead of double + + + +

large number: "999999999999999999.97"	+ + + +
large currency: "999999999999999999.97"	+ + + +

svn commit: r611705 - in /beehive/site: src/documentation/content/xdocs/site.xml www/contributors.html www/documentation.html www/downloads.html www/faq.html www/index.html www/license.html www/linkmap.html www/mailinglists.html www/skin/screen.css

2008-01-14T04:06:27Z

Author: ekoneil
Date: Sun Jan 13 20:06:26 2008
New Revision: 611705

URL: http://svn.apache.org/viewvc?rev=611705&view=rev
Log:
Add Sponsorship link to the Beehive website.



Modified:
    beehive/site/src/documentation/content/xdocs/site.xml
    beehive/site/www/contributors.html
    beehive/site/www/documentation.html
    beehive/site/www/downloads.html
    beehive/site/www/faq.html
    beehive/site/www/index.html
    beehive/site/www/license.html
    beehive/site/www/linkmap.html
    beehive/site/www/mailinglists.html
    beehive/site/www/skin/screen.css

Modified: beehive/site/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/beehive/site/src/documentation/content/xdocs/site.xml?rev=611705&r1=611704&r2=611705&view=diff
==============================================================================
--- beehive/site/src/documentation/content/xdocs/site.xml (original)
+++ beehive/site/src/documentation/content/xdocs/site.xml Sun Jan 13 20:06:26 2008
@@ -8,6 +8,7 @@
         
         
         
+        
     
     
         

Modified: beehive/site/www/contributors.html
URL: http://svn.apache.org/viewvc/beehive/site/www/contributors.html?rev=611705&r1=611704&r2=611705&view=diff
==============================================================================
--- beehive/site/www/contributors.html (original)
+++ beehive/site/www/contributors.html Sun Jan 13 20:06:26 2008
@@ -77,6 +77,9 @@
 
 FAQ
 
+
+Sponsorship
+

Documentation

Modified: beehive/site/www/documentation.html URL: http://svn.apache.org/viewvc/beehive/site/www/documentation.html?rev=611705&r1=611704&r2=611705&view=diff ============================================================================== --- beehive/site/www/documentation.html (original) +++ beehive/site/www/documentation.html Sun Jan 13 20:06:26 2008 @@ -77,6 +77,9 @@

FAQ

+Sponsorship +

Documentation

Modified: beehive/site/www/downloads.html URL: http://svn.apache.org/viewvc/beehive/site/www/downloads.html?rev=611705&r1=611704&r2=611705&view=diff ============================================================================== --- beehive/site/www/downloads.html (original) +++ beehive/site/www/downloads.html Sun Jan 13 20:06:26 2008 @@ -77,6 +77,9 @@

FAQ

+Sponsorship +

Documentation

Modified: beehive/site/www/faq.html URL: http://svn.apache.org/viewvc/beehive/site/www/faq.html?rev=611705&r1=611704&r2=611705&view=diff ============================================================================== --- beehive/site/www/faq.html (original) +++ beehive/site/www/faq.html Sun Jan 13 20:06:26 2008 @@ -77,6 +77,9 @@

FAQ

+Sponsorship +

Documentation

Modified: beehive/site/www/index.html URL: http://svn.apache.org/viewvc/beehive/site/www/index.html?rev=611705&r1=611704&r2=611705&view=diff ============================================================================== --- beehive/site/www/index.html (original) +++ beehive/site/www/index.html Sun Jan 13 20:06:26 2008 @@ -77,6 +77,9 @@

FAQ

+Sponsorship +

Documentation

Modified: beehive/site/www/license.html URL: http://svn.apache.org/viewvc/beehive/site/www/license.html?rev=611705&r1=611704&r2=611705&view=diff ============================================================================== --- beehive/site/www/license.html (original) +++ beehive/site/www/license.html Sun Jan 13 20:06:26 2008 @@ -77,6 +77,9 @@

FAQ

+Sponsorship +

Documentation

Modified: beehive/site/www/linkmap.html URL: http://svn.apache.org/viewvc/beehive/site/www/linkmap.html?rev=611705&r1=611704&r2=611705&view=diff ============================================================================== --- beehive/site/www/linkmap.html (original) +++ beehive/site/www/linkmap.html Sun Jan 13 20:06:26 2008 @@ -77,6 +77,9 @@

FAQ

+Sponsorship +

Documentation

@@ -170,6 +173,12 @@

FAQ _________________________ faq +

+ +

+Sponsorship _________________________ sponsorship

Modified: beehive/site/www/mailinglists.html URL: http://svn.apache.org/viewvc/beehive/site/www/mailinglists.html?rev=611705&r1=611704&r2=611705&view=diff ============================================================================== --- beehive/site/www/mailinglists.html (original) +++ beehive/site/www/mailinglists.html Sun Jan 13 20:06:26 2008 @@ -77,6 +77,9 @@

FAQ

+Sponsorship +

Documentation

Modified: beehive/site/www/skin/screen.css URL: http://svn.apache.org/viewvc/beehive/site/www/skin/screen.css?rev=611705&r1=611704&r2=611705&view=diff ============================================================================== --- beehive/site/www/skin/screen.css (original) +++ beehive/site/www/skin/screen.css Sun Jan 13 20:06:26 2008 @@ -547,4 +547,4 @@ list-style-image: url('../images/instruction_arrow.png'); list-style-position: outside; margin-left: 2em; -} +} \ No newline at end of file

svn commit: r611336 - in /beehive/trunk/netui: src/pageflow/org/apache/beehive/netui/pageflow/ src/pageflow/org/apache/beehive/netui/pageflow/internal/ test/webapps/drt/src/controls/pfbeancontext/

2008-01-12T00:18:20Z

Author: crogers
Date: Fri Jan 11 16:18:14 2008
New Revision: 611336

URL: http://svn.apache.org/viewvc?rev=611336&view=rev
Log:
Fixes Page Flow + Controls integration issue so that the Control container is initialized
correctly for the page flow's onDestroy() method when navigating away from one page flow to
another page flow. BEEHIVE-1094.

Tests: BVT and controlsWeb in NetUI (passed on WinXP)

Added:
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/SessionBindingEvent.java
  (with props)
Modified:
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowManagedObject.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowStack.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestContext.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultActionForwardHandler.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DeferredSessionStorageHandler.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
    beehive/trunk/netui/test/webapps/drt/src/controls/pfbeancontext/PageFlowBeanContextController.java

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java?rev=611336&r1=611335&r2=611336&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java
(original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java
Fri Jan 11 16:18:14 2008
@@ -601,13 +601,21 @@
     }
 
     /**
+     * @deprecated {@link FlowController#destroy(RequestContext, HttpSession)} should be
used instead.
+     */
+    void destroy(HttpSession session)
+    {
+        destroy(null, session);
+    }
+
+    /**
      * Internal destroy method that is invoked when this object is being removed from the
session.  This is a
      * framework-invoked method; it should not normally be called directly.
      */
-    void destroy( HttpSession session )
+    void destroy(RequestContext requestContext, HttpSession session)
     {
         onDestroy();    // for backwards compatiblity
-        super.destroy( session );
+        super.destroy(requestContext, session);
 
         //
         // We may have lost our transient ServletContext reference.  Try to get the ServletContext
reference from the

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java?rev=611336&r1=611335&r2=611336&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java
(original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java
Fri Jan 11 16:18:14 2008
@@ -269,7 +269,7 @@
 
             if ( options == null || ! options.isEnableSelfNesting() )
             {
-                PageFlowController existing = pfStack.popUntil(request, pageFlowClass, true);
+                PageFlowController existing = pfStack.popUntil(request, response, pageFlowClass,
true);
 
                 if (existing != null) {
                     existing.persistInSession(request, response);
@@ -362,7 +362,7 @@
                 // If (2), we'll use that one (this means that executing an action on a nesting
page flow
                 // while in a nested one will not destroy the nesting page flow only to create
a new instance of it).
                 //
-                PageFlowController onStackAlready = pfStack.popUntil( request, retVal.getClass(),
false );
+                PageFlowController onStackAlready = pfStack.popUntil(request, response, retVal.getClass(),
false);
 
                 if ( onStackAlready != null )
                 {

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java?rev=611336&r1=611335&r2=611336&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java
(original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java
Fri Jan 11 16:18:14 2008
@@ -231,7 +231,7 @@
         {
             synchronized ( currentPageFlow )
             {
-                InternalUtils.setCurrentPageFlow( this, request, getServletContext() );
+                InternalUtils.setCurrentPageFlow( this, request, response, getServletContext()
);
             }
         }
         //
@@ -239,7 +239,7 @@
         //
         else
         {
-            InternalUtils.setCurrentPageFlow( this, request, getServletContext() );
+            InternalUtils.setCurrentPageFlow( this, request, response, getServletContext()
);
         }
     }
 
@@ -1103,4 +1103,4 @@
     void setReturnActionViewRenderer(ViewRenderer returnActionViewRenderer) {
         _returnActionViewRenderer = returnActionViewRenderer;
     }
-}
\ No newline at end of file
+}

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowManagedObject.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowManagedObject.java?rev=611336&r1=611335&r2=611336&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowManagedObject.java
(original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowManagedObject.java
Fri Jan 11 16:18:14 2008
@@ -18,18 +18,19 @@
  */
 package org.apache.beehive.netui.pageflow;
 
-import org.apache.beehive.netui.pageflow.internal.JavaControlUtils;
-import org.apache.beehive.netui.pageflow.handler.Handlers;
-import org.apache.beehive.netui.util.logging.Logger;
-
-import javax.servlet.http.HttpSessionBindingListener;
+import java.io.Serializable;
+import java.lang.reflect.Field;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSessionBindingEvent;
+import javax.servlet.http.HttpSessionBindingListener;
 import javax.servlet.ServletContext;
-import java.io.Serializable;
-import java.lang.reflect.Field;
+
+import org.apache.beehive.netui.pageflow.handler.Handlers;
+import org.apache.beehive.netui.pageflow.internal.JavaControlUtils;
+import org.apache.beehive.netui.pageflow.internal.SessionBindingEvent;
+import org.apache.beehive.netui.util.logging.Logger;
 
 /**
  * Base class for Page Flow managed objects (like page flows and JavaServer Faces backing
beans).
@@ -96,12 +97,35 @@
     }
 
     /**
+     * @deprecated {@link PageFlowManagedObject#destroy(RequestContext, HttpSession)} should
be used instead.
+     */
+    void destroy( HttpSession session )
+    {
+        destroy(null, session);
+    }
+
+    /**
      * Internal destroy method that is invoked when this object is being removed from the
session.  This is a
      * framework-invoked method; it should not normally be called directly.
      */ 
-    void destroy( HttpSession session )
+    void destroy(RequestContext requestContext, HttpSession session)
     {
-        onDestroy( session );
+        if (requestContext != null) {
+            HttpServletRequest request = requestContext.getHttpRequest();
+            HttpServletResponse response = requestContext.getHttpResponse();
+            PageFlowControlContainer pfcc = PageFlowControlContainerFactory.getControlContainer(request,
session.getServletContext());
+            pfcc.beginContextOnPageFlow(this, request, response, session.getServletContext());
+            try {
+                onDestroy(session);
+            }
+            finally {
+                pfcc.endContextOnPageFlow(this);
+            }
+        }
+        else {
+            onDestroy(session);
+        }
+
         JavaControlUtils.uninitJavaControls( session.getServletContext(), this );
     }
     
@@ -151,7 +175,12 @@
         {
             if ( !_isDestroyed && Handlers.get( servletContext ).getStorageHandler().allowBindingEvent(
event ) )
             {
-                destroy( session );
+                RequestContext requestContext = null;
+                if (event instanceof SessionBindingEvent)
+                {
+                    requestContext = ((SessionBindingEvent) event).getRequestContext();
+                }
+                destroy(requestContext, session);
                 _isDestroyed = true;
             }
         }

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowStack.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowStack.java?rev=611336&r1=611335&r2=611336&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowStack.java
(original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowStack.java
Fri Jan 11 16:18:14 2008
@@ -18,26 +18,24 @@
  */
 package org.apache.beehive.netui.pageflow;
 
-import org.apache.beehive.netui.util.logging.Logger;
-import org.apache.beehive.netui.util.internal.InternalStringBuilder;
-import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
-import org.apache.beehive.netui.pageflow.internal.InternalConstants;
-import org.apache.beehive.netui.pageflow.internal.InternalUtils;
-import org.apache.beehive.netui.pageflow.interceptor.action.InterceptorForward;
-import org.apache.beehive.netui.pageflow.interceptor.action.ActionInterceptor;
-import org.apache.beehive.netui.pageflow.interceptor.action.ActionInterceptorContext;
+import java.io.Serializable;
+import java.util.Stack;
+import javax.servlet.ServletContext;
+import javax.servlet.http.*;
+
 import org.apache.beehive.netui.pageflow.handler.Handlers;
 import org.apache.beehive.netui.pageflow.handler.StorageHandler;
+import org.apache.beehive.netui.pageflow.interceptor.action.ActionInterceptor;
+import org.apache.beehive.netui.pageflow.interceptor.action.ActionInterceptorContext;
+import org.apache.beehive.netui.pageflow.interceptor.action.InterceptorForward;
+import org.apache.beehive.netui.pageflow.internal.InternalConstants;
+import org.apache.beehive.netui.pageflow.internal.InternalUtils;
+import org.apache.beehive.netui.pageflow.internal.SessionBindingEvent;
+import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
+import org.apache.beehive.netui.util.internal.InternalStringBuilder;
+import org.apache.beehive.netui.util.logging.Logger;
 import org.apache.struts.config.ModuleConfig;
 
-import javax.servlet.http.HttpSessionBindingListener;
-import javax.servlet.http.HttpSessionBindingEvent;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.servlet.ServletContext;
-import java.util.Stack;
-import java.io.Serializable;
-
 /**
  * 
  * Stack for keeping track of a series of nested page flows.  When a nested page flow is
entered,
@@ -46,7 +44,8 @@
  * 

  * This Stack implements the {@link HttpSessionBindingListener} which will receive a callback
when
  * this is removed from the {@link HttpSession}.  At this time, any PageFlowController instances
stored
- * on the stack will be destroyed using the {@link PageFlowManagedObject#destroy(javax.servlet.http.HttpSession)}
+ * on the stack will be destroyed using the
+ * {@link PageFlowManagedObject#destroy(RequestContext, HttpSession)}
  * lifecycle method.
  * 
  */ 
@@ -197,7 +196,7 @@
      * @return the last popped page flow if one of the given type was found, or null
      *         if none was found.
      */ 
-    PageFlowController popUntil( HttpServletRequest request, Class stopAt, boolean onlyIfPresent
)
+    PageFlowController popUntil(HttpServletRequest request, HttpServletResponse response,
Class stopAt, boolean onlyIfPresent )
     {
         if (onlyIfPresent && lastIndexOf(stopAt) == -1) {
             return null;
@@ -220,7 +219,9 @@
                 //
                 // We're discarding the popped page flow.  Invoke its destroy() callback,
unless it's longLived.
                 //
-                if ( ! popped.isLongLived() ) popped.destroy( request.getSession( false )
);
+                HttpServletRequest unwrappedRequest = PageFlowUtils.unwrapMultipart(request);
+                RequestContext rc = new RequestContext(unwrappedRequest, response);
+                if (!popped.isLongLived()) popped.destroy(rc, request.getSession(false));
             }
         }
 
@@ -373,8 +374,14 @@
             // to be lost.  Rehydrate it.
             HttpSession session = event.getSession();
             if ( session != null ) jpf.reinitialize( null, null, session.getServletContext()
);
-            
-            if ( ! jpf.isLongLived() ) jpf.destroy( event.getSession() );
+
+            if (! jpf.isLongLived()) {
+                RequestContext rc = null;
+                if (event instanceof SessionBindingEvent) {
+                    rc = ((SessionBindingEvent) event).getRequestContext();
+                }
+                jpf.destroy(rc, event.getSession());
+            }
         }
     }
     

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestContext.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestContext.java?rev=611336&r1=611335&r2=611336&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestContext.java
(original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestContext.java
Fri Jan 11 16:18:14 2008
@@ -55,7 +55,9 @@
     
     HttpServletResponse getHttpResponse()
     {
-        assert _response instanceof HttpServletResponse : "HttpServletResponse is currently
required";
+        if (_response != null) {
+            assert _response instanceof HttpServletResponse : "HttpServletResponse is currently
required";
+        }
         return ( HttpServletResponse ) _response;
     }
 }

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultActionForwardHandler.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultActionForwardHandler.java?rev=611336&r1=611335&r2=611336&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultActionForwardHandler.java
(original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultActionForwardHandler.java
Fri Jan 11 16:18:14 2008
@@ -533,8 +533,7 @@
             _log.debug( "Popped PageFlowController " + poppedPageFlow + " from the nesting
stack" );
         }
 
-        InternalUtils.setCurrentPageFlow( poppedPageFlow, request, getServletContext() );
-
+        InternalUtils.setCurrentPageFlow(poppedPageFlow, request, response, getServletContext());
                 
         //
         // If an ActionInterceptor forwarded to the nested page flow, give it a chance to
change the URI as the nested

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DeferredSessionStorageHandler.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DeferredSessionStorageHandler.java?rev=611336&r1=611335&r2=611336&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DeferredSessionStorageHandler.java
(original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DeferredSessionStorageHandler.java
Fri Jan 11 16:18:14 2008
@@ -70,20 +70,6 @@
         init( null, null, servletContext );
     }
 
-    private static final class SessionBindingEvent
-        extends HttpSessionBindingEvent
-    {
-        public SessionBindingEvent( HttpSession httpSession, String attrName )
-        {
-            super( httpSession, attrName );
-        }
-
-        public SessionBindingEvent( HttpSession httpSession, String attrName, Object attrVal
)
-        {
-            super( httpSession, attrName, attrVal );
-        }
-    }
-
     public void setAttribute( RequestContext context, String attrName, Object value )
     {
         if (_log.isTraceEnabled()) {
@@ -106,7 +92,7 @@
         //
         if ( currentValue != null && currentValue != value && currentValue
instanceof HttpSessionBindingListener )
         {
-            HttpSessionBindingEvent event = new SessionBindingEvent( session, attrName, currentValue
);
+            HttpSessionBindingEvent event = new SessionBindingEvent( context, session, attrName,
currentValue );
             ( ( HttpSessionBindingListener ) currentValue ).valueUnbound( event );
         }
 
@@ -137,7 +123,7 @@
         //
         if ( currentValue != null && currentValue instanceof HttpSessionBindingListener
)
         {
-            HttpSessionBindingEvent event = new SessionBindingEvent( request.getSession(),
attrName, currentValue );
+            HttpSessionBindingEvent event = new SessionBindingEvent( context, request.getSession(),
attrName, currentValue );
             ( ( HttpSessionBindingListener ) currentValue ).valueUnbound( event );
         }
 
@@ -229,7 +215,7 @@
                         // In order to maintain the single-threaded semantics of PFMO destruction,
it's necessary
                         // to synchronize on PFMO objects here.
                         //
-                        HttpSessionBindingEvent event = new SessionBindingEvent(session,
attrName, currSessValue);
+                        HttpSessionBindingEvent event = new SessionBindingEvent(context,
session, attrName, currSessValue);
                         synchronized(currSessValue) {
                             ((HttpSessionBindingListener)currSessValue).valueUnbound(event);
                         }
@@ -416,4 +402,4 @@
 
         return map;
     }
-}
\ No newline at end of file
+}

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java?rev=611336&r1=611335&r2=611336&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
(original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
Fri Jan 11 16:18:14 2008
@@ -339,10 +339,69 @@
         return LONGLIVED_PAGEFLOWS_ATTR_PREFIX + modulePath;
     }
 
+    /**
+     * Set the current {@link PageFlowController} in the user session.
+     *
+     * @param jpf the {@link PageFlowController} to set as the current one in the user session.
+     * @param request
+     * @deprecated Should use {@link #setCurrentPageFlow(PageFlowController, HttpServletRequest,
HttpServletResponse, ServletContext)}.
+     */
     public static void setCurrentPageFlow( PageFlowController jpf, HttpServletRequest request,
                                            ServletContext servletContext )
     {
-        setCurrentActionResolver( jpf, request, servletContext );
+        setCurrentPageFlow( jpf, request, null, servletContext );
+    }
+
+    /**
+     * Set the current {@link PageFlowController} in the user session.
+     *
+     * @param jpf     the {@link PageFlowController} to set as the current one in the user
session.
+     * @param request
+     * @param response
+     * @param servletContext
+     */
+    public static void setCurrentPageFlow(PageFlowController jpf, HttpServletRequest request,
+                                          HttpServletResponse response, ServletContext servletContext)
{
+        StorageHandler sh = Handlers.get(servletContext).getStorageHandler();
+        HttpServletRequest unwrappedRequest = PageFlowUtils.unwrapMultipart(request);
+        RequestContext rc = new RequestContext(unwrappedRequest, response);
+        String currentJpfAttrName =
+                ScopedServletUtils.getScopedSessionAttrName(CURRENT_JPF_ATTR, unwrappedRequest);
+        String currentLongLivedJpfAttrName =
+                ScopedServletUtils.getScopedSessionAttrName(CURRENT_LONGLIVED_ATTR, unwrappedRequest);
+
+        //
+        // This case occurs when the previous page flow is no longer active and there is
no new page flow
+        //
+        if (jpf == null) {
+            sh.removeAttribute(rc, currentJpfAttrName);
+            sh.removeAttribute(rc, currentLongLivedJpfAttrName);
+            return;
+        }
+
+        //
+        // If this is a long-lived page flow, also store the instance in an attribute that
never goes away.
+        //
+        if (jpf.isPageFlow() && isLongLived(jpf.theModuleConfig())) {
+            String longLivedAttrName = getLongLivedFlowAttr(jpf.getModulePath());
+            longLivedAttrName = ScopedServletUtils.getScopedSessionAttrName(longLivedAttrName,
unwrappedRequest);
+
+            // Only set this attribute if it's not already there.  We want to avoid our onDestroy()
callback that's
+            // invoked when the page flow's session attribute is unbound.
+            if (sh.getAttribute(rc, longLivedAttrName) != jpf) {
+                sh.setAttribute(rc, longLivedAttrName, jpf);
+            }
+
+            sh.setAttribute(rc, currentLongLivedJpfAttrName, jpf.getModulePath());
+            sh.removeAttribute(rc, currentJpfAttrName);
+        }
+        //
+        // Default case for removing a previous page flow in the presence of a new page flow.
+        //
+        else {
+            sh.setAttribute(rc, currentJpfAttrName, jpf);
+            sh.removeAttribute(rc, currentLongLivedJpfAttrName);
+        }
     }
 
     public static void removeCurrentPageFlow( HttpServletRequest request, ServletContext
servletContext )
@@ -689,7 +748,7 @@
      * Set the current {@link ActionResolver} (or {@link PageFlowController}) in the user
session.
      *
      * @param resolver the {@link ActionResolver} to set as the current one in the user session.
-     * @deprecated Will be removed in the next version.
+     * @deprecated Will be removed in the next version. See {@link #setCurrentPageFlow(PageFlowController,
HttpServletRequest, HttpServletResponse, ServletContext)}.
      */
     public static void setCurrentActionResolver( ActionResolver resolver, HttpServletRequest
request,
                                                  ServletContext servletContext )

Added: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/SessionBindingEvent.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/SessionBindingEvent.java?rev=611336&view=auto
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/SessionBindingEvent.java
(added)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/SessionBindingEvent.java
Fri Jan 11 16:18:14 2008
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.beehive.netui.pageflow.internal;
+
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpSessionBindingEvent;
+
+import org.apache.beehive.netui.pageflow.RequestContext;
+
+public final class SessionBindingEvent extends HttpSessionBindingEvent
+{
+    RequestContext _requestContext;
+
+    public SessionBindingEvent( HttpSession httpSession, String attrName )
+    {
+        super( httpSession, attrName );
+    }
+
+    public SessionBindingEvent( HttpSession httpSession, String attrName, Object attrVal
)
+    {
+        super( httpSession, attrName, attrVal );
+    }
+    
+    public SessionBindingEvent( RequestContext context, HttpSession httpSession, String attrName,
Object attrVal )
+    {
+        this( httpSession, attrName, attrVal );
+        _requestContext = context;
+    }
+        
+    public RequestContext getRequestContext()
+    {
+        return _requestContext;
+    }
+}
+

Propchange: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/SessionBindingEvent.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/netui/test/webapps/drt/src/controls/pfbeancontext/PageFlowBeanContextController.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/src/controls/pfbeancontext/PageFlowBeanContextController.java?rev=611336&r1=611335&r2=611336&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/src/controls/pfbeancontext/PageFlowBeanContextController.java
(original)
+++ beehive/trunk/netui/test/webapps/drt/src/controls/pfbeancontext/PageFlowBeanContextController.java
Fri Jan 11 16:18:14 2008
@@ -59,9 +59,28 @@
     }
 
     protected void onDestroy(HttpSession httpSession) {
-        // This check is disabled because of a bug in JPF + Controls integration where the
Page Flow
-        // runtime doesn't "beginContext" on a ControlContainerContext during JPF destruction.

-        // check();
+        // The check() routine can still fail in JPF + Controls
+        // integration because the Page Flow runtime can't do a
+        // "beginContext" on a ControlContainerContext during
+        // JPF destruction.
+        // This only occurs on a Session time out, when there is
+        // no request instance for valid contextual services for
+        // a control in a page flow.
+        if (!sessionExpired(httpSession)) {
+            check();
+        }
+    }
+
+    private boolean sessionExpired(HttpSession session) {
+        boolean result = false;
+        try {
+            // this call will throw IllegalStateException
+            // on an invalidated session
+            session.getLastAccessedTime();
+        } catch (IllegalStateException e) {
+            result = true;
+        }
+        return result;
     }
 
     private boolean check() {

svn commit: r611318 - in /beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow: FlowControllerFactory.java PageFlowController.java

2008-01-11T22:13:16Z

Author: crogers
Date: Fri Jan 11 14:13:15 2008
New Revision: 611318

URL: http://svn.apache.org/viewvc?rev=611318&view=rev
Log:
Fix for BEEHIVE-1214. Changed the nested page flow creation to persist the page flow in the
session and then intialize it (including the controls, so that the PageFlowController @Context
member fields in controls are initialized correctly).

tests: bvt in netui (WinXP)

Modified:
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java?rev=611318&r1=611317&r2=611318&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java
(original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java
Fri Jan 11 14:13:15 2008
@@ -34,9 +34,11 @@
 import org.apache.beehive.netui.util.config.bean.PageFlowFactoriesConfig;
 import org.apache.beehive.netui.util.config.bean.PageFlowConfig;
 import org.apache.beehive.netui.util.config.bean.SharedFlowRefConfig;
+import org.apache.beehive.netui.util.internal.DiscoveryUtils;
 import org.apache.beehive.netui.pageflow.internal.InternalUtils;
 import org.apache.beehive.netui.pageflow.internal.InternalConstants;
 import org.apache.beehive.netui.pageflow.internal.PageFlowRequestWrapper;
+import org.apache.beehive.netui.pageflow.internal.ViewRenderer;
 import org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig;
 import org.apache.beehive.netui.pageflow.handler.ReloadableClassHandler;
 import org.apache.beehive.netui.pageflow.handler.Handlers;
@@ -300,14 +302,23 @@
         //
         if ( isNestable )
         {
-            //
-            // Call create() on the newly-created page flow.  Note, the PageFlowController
is responsible for
-            // driving the appropriate Control lifecycle.
-            //
-            if ( createdNew )
-                retVal.create( request, response, servletContext );
-
-            PageFlowController current = PageFlowUtils.getCurrentPageFlow( request, getServletContext()
);
+            // Initialize a ViewRenderer for exiting the nested page flow.
+            // This is used (currently) as part of popup window support --
+            // when exiting a popup nested page flow, a special view renderer
+            // writes out javascript that maps output values to the original
+            // window and closes the popup window.
+            PageFlowController current = PageFlowUtils.getCurrentPageFlow(request, getServletContext());
+            String vrClassName = request.getParameter(InternalConstants.RETURN_ACTION_VIEW_RENDERER_PARAM);
+
+            if (vrClassName != null) {
+                ViewRenderer vr =
+                        (ViewRenderer) DiscoveryUtils.newImplementorInstance(vrClassName,
ViewRenderer.class);
+
+                if (vr != null && current != null) {
+                    vr.init(request);
+                    current.setReturnActionViewRenderer(vr);
+                }
+            }
 
             if ( current != null )
             {
@@ -321,6 +332,15 @@
 
             retVal.reinitialize( request, response, servletContext );
             retVal.persistInSession( request, response );
+
+            //
+            // Call create() on the newly-created page flow.  Note, the
+            // PageFlowController is responsible for
+            // driving the appropriate Control lifecycle.
+            //
+            if (createdNew) {
+                retVal.create(request, response, servletContext);
+            }
         }
         //
         // New page flow is not nestable; behave accordingly

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java?rev=611318&r1=611317&r2=611318&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java
(original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java
Fri Jan 11 14:13:15 2008
@@ -409,28 +409,6 @@
     {
         reinitialize( request, response, servletContext );
         initializeSharedFlowFields( request );
-
-        if ( isNestable() )
-        {
-            // Initialize a ViewRenderer for exiting the nested page flow.  This is used
(currently) as part of popup
-            // window support -- when exiting a popup nested page flow, a special view renderer
writes out javascript
-            // that maps output values to the original window and closes the popup window.
-            String vrClassName = request.getParameter( InternalConstants.RETURN_ACTION_VIEW_RENDERER_PARAM
);
-
-            if ( vrClassName != null )
-            {
-                ViewRenderer vr =
-                        ( ViewRenderer ) DiscoveryUtils.newImplementorInstance( vrClassName,
ViewRenderer.class );
-
-                if ( vr != null )
-                {
-                    vr.init( request );
-                    PageFlowController nestingPageFlow = PageFlowUtils.getCurrentPageFlow(request,
servletContext);
-                    nestingPageFlow.setReturnActionViewRenderer(vr);
-                }
-            }
-        }
-
         super.create( request, response, servletContext );
     }
 
@@ -1122,7 +1100,7 @@
         return _returnActionViewRenderer;
     }
 
-    private void setReturnActionViewRenderer(ViewRenderer returnActionViewRenderer) {
+    void setReturnActionViewRenderer(ViewRenderer returnActionViewRenderer) {
         _returnActionViewRenderer = returnActionViewRenderer;
     }
 }

svn commit: r604080 - /beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java

2007-12-14T01:46:39Z

Author: crogers
Date: Thu Dec 13 17:46:37 2007
New Revision: 604080

URL: http://svn.apache.org/viewvc?rev=604080&view=rev
Log:
Overload PageFlowUtils.strutsLookup() to provide an option to set whether processPopulate()
routine has already been called (BEEHIVE-1212)

Tests: netui BVT (WinXP passed)


Modified:
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java?rev=604080&r1=604079&r2=604080&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
(original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
Thu Dec 13 17:46:37 2007
@@ -1105,12 +1105,35 @@
         ExpressionMessage msg = new ExpressionMessage( expression, messageArgs );
         InternalUtils.addActionError( propertyName, msg, request );
     }
-    
+
     /**
      * Resolve the given action to a URI by running an entire request-processing cycle on
the given ScopedRequest
      * and ScopedResponse.
      * @exclude
-     * 
+     *
+     * @param context the current ServletContext
+     * @param request the ServletRequest, which must be a {@link ScopedRequest}.
+     * @param response the ServletResponse, which must be a {@link ScopedResponse}.
+     * @param actionOverride if not null, this qualified action-path
is used to construct an action
+     *                       URI which is set as the request URI.  The action-path must
begin with '/',
+     *                       which makes it qualified from the webapp root.
+     * @param autoResolveExtensions a list of URI extensions (e.g., ".do", ".jpf") that will
be auto-resolved, i.e.,
+     *                              on which this method will be recursively called.  If
null, the
+     *                              default extensions ".do" and ".jpf" will be used.
+     */
+    public static ActionResult strutsLookup(ServletContext context, ServletRequest request,
+                                            HttpServletResponse response, String actionOverride,
+                                            String[] autoResolveExtensions)
+        throws Exception
+    {
+        return strutsLookup(context, request, response, actionOverride, autoResolveExtensions,
false);
+    }
+
+    /**
+     * Resolve the given action to a URI by running an entire request-processing cycle on
the given ScopedRequest
+     * and ScopedResponse.
+     * @exclude
+     *
      * @param context the current ServletContext
      * @param request the ServletRequest, which must be a {@link ScopedRequest}.
      * @param response the ServletResponse, which must be a {@link ScopedResponse}.
@@ -1120,10 +1143,13 @@
      * @param autoResolveExtensions a list of URI extensions (e.g., ".do", ".jpf") that will
be auto-resolved, i.e.,
      *                              on which this method will be recursively called.  If
null, the
      *                              default extensions ".do" and ".jpf" will be used.
+     * @param processPopulateAlreadyCalled if true, processPopulate()
will
+     *                                     not be called for the action form bean.
      */
-    public static ActionResult strutsLookup( ServletContext context, ServletRequest request,
-                                             HttpServletResponse response, String actionOverride,
-                                             String[] autoResolveExtensions )
+    public static ActionResult strutsLookup(ServletContext context, ServletRequest request,
+                                            HttpServletResponse response, String actionOverride,
+                                            String[] autoResolveExtensions,
+                                            boolean processPopulateAlreadyCalled)
         throws Exception
     {
         ScopedRequest scopedRequest = ScopedServletUtils.unwrapRequest( request );
@@ -1164,6 +1190,9 @@
         //
         PageFlowRequestWrapper wrappedRequest = PageFlowRequestWrapper.wrapRequest( ( HttpServletRequest
) request );
         wrappedRequest.setScopedLookup( true );
+        if (processPopulateAlreadyCalled) {
+            wrappedRequest.setProcessPopulateAlreadyCalled(true);
+        }
 
         if (as != null)
         {
@@ -1198,7 +1227,10 @@
                     if ( FileUtils.uriEndsWith( returnURI, autoResolveExtensions[i] ) )
                     {
                         scopedRequest.doForward();
-                        return strutsLookup( context, wrappedRequest, scopedResponse, null,
autoResolveExtensions );
+                        return strutsLookup(context, wrappedRequest,
+                                            scopedResponse, null,
+                                            autoResolveExtensions,
+                                            processPopulateAlreadyCalled);
                     }
                 }
             }
@@ -1483,7 +1515,7 @@
             actionURI.append( InternalUtils.getModulePathFromReqAttr( request ) );
             actionURI.append( '/' );
         }
-        
+
         actionURI.append( actionName );
         if ( ! actionName.endsWith( ACTION_EXTENSION ) ) actionURI.append( ACTION_EXTENSION
);

svn commit: r603418 - /beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java

2007-12-11T23:53:31Z

Author: crogers
Date: Tue Dec 11 15:53:31 2007
New Revision: 603418

URL: http://svn.apache.org/viewvc?rev=603418&view=rev
Log:
This is a contribution from Jacob Danner to fix BEEHIVE-1206 - NetUI databinding iterator
does not support RowSet. Thanks Jacob.

Tests: netui BVT (WinXP passed)


Modified:
    beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java

Modified: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java?rev=603418&r1=603417&r2=603418&view=diff
==============================================================================
--- beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java
(original)
+++ beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java
Tue Dec 11 15:53:31 2007
@@ -98,10 +98,11 @@
             return new MapIterator((Map)object);
         } else if(object.getClass().isArray()) {
             return new ArrayIterator(object);
-        } else if(object instanceof Enumeration)
+        } else if(object instanceof Enumeration) {
             return new EnumerationIterator((Enumeration)object);
-        else if(object instanceof ResultSet && !(object instanceof RowSet))
+        } else if(object instanceof ResultSet && !(object instanceof RowSet)) {
             return new ResultSetIterator((ResultSet)object);
+        }
 
         // check to see if there is a registered IteratorPlant that can handle this type
         Iterator ret = null;
@@ -111,6 +112,15 @@
             ret = plant.createIterator(object);
 
             if(ret != null) return ret;
+        }
+
+        // BEEHIVE-1206 -> netui databinding iterator does not support RowSet,
+        // but javadoc says it does. Use the default ResultSetIterator if an
+        // Iterator has not already been configured in the
+        // beehive-netui-config.xml/iterator-factories element
+        // since RowSet is common registered iterator
+        if(object instanceof RowSet) {
+            return new ResultSetIterator((ResultSet)object);
         }
 
         return new AtomicObjectIterator(object);

svn commit: r603377 - /beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptTask.java

2007-12-11T22:06:54Z

Author: crogers
Date: Tue Dec 11 14:06:48 2007
New Revision: 603377

URL: http://svn.apache.org/viewvc?rev=603377&view=rev
Log:
BEEHIVE-1210 - Add an option to the Beehive AptTask to allow a user to define an AP factory
or factory path to override the usual discovery process.


Modified:
    beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptTask.java

Modified: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptTask.java
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptTask.java?rev=603377&r1=603376&r2=603377&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptTask.java
(original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptTask.java
Tue Dec 11 14:06:48 2007
@@ -100,6 +100,14 @@
         _compileByExt = compileByExt;
     }
 
+    public void setFactory(String factory) {
+        _factory = factory;
+    }
+
+    public void setFactorypath(String factorypath) {
+        _factorypath = factorypath;
+    }
+
     /**
      * Override the implementation of scanDir, to look for additional files based upon any
      * specified source extensions
@@ -205,30 +213,24 @@
             }
         }
 
-        //
         // Select the executable (apt) and set fork = true
-        //
         setExecutable("apt");
         setFork(true);
 
-        //
         // Specify the code generation output directory to APT
-        // 
         Commandline.Argument arg = createCompilerArg();
         arg.setValue("-s");
         arg = createCompilerArg();
         arg.setFile(_genDir);
 
-        //add the -nocompile flag if set to true
+        // Add the -nocompile flag if set to true
         if(_nocompile)
         {
             Commandline.Argument ncarg = createCompilerArg();
             ncarg.setValue("-nocompile");
         }
         
-        //
         // Add processor options.
-        //
         for (Object i : _processorOptions)
         {
             Commandline.Argument optionArg = createCompilerArg();
@@ -238,8 +240,46 @@
         checkParameters();
         resetFileLists();
 
-        // Iterate through the list of input extensions, matching/dependency checking based
-        // upon the input list.
+        //
+        // Allow user to define apt specific options for the name of an
+        // annotation processor (AP) factory to use or the factory path
+        // for finding the AP factories. This allows apt to bypass the
+        // default discovery process or specify where to find AP factories.
+        //
+        // This can help resolve build issues users may experience when
+        // multiple annotation processors conflict. For example,...
+        // A project may contain JAX-RPC 1.1 Web Services annotations.
+        // Starting with JDK1.6, JDK bundles the JAX-WS 2.0 AP in its
+        // tool jar. JAX-RPC and JAX-WS use the same JSR 181 annotations
+        // but the JAX-WS 2.0 AP doesn't support the earlier JAX-RPC use
+        // of the RPC/ENCODED soapbinding annotation on an endpoint.
+        // A user running the build through the Beehive AptTask and using
+        // Java 6, would see APT fail on JAX-RPC services thinking they are
+        // invalid JAX-WS services.
+        //
+        // In this example, using the -factorypath option does not disable the
+        // built-in annotation processor because tools.jar is always in APT's
+        // class path. However, exposing the option to use a specific factory
+        // can solve this problem. There can only be one factory name when
+        // invoking APT, so a user of this task may want to pass a wrapper
+        // factory that is an aggregated annotation processor factory.
+        //
+        if (_factorypath != null && _factorypath.trim().length() > 0) {
+            Commandline.Argument factoryArg = createCompilerArg();
+            factoryArg.setValue("-factorypath");
+            factoryArg = createCompilerArg();
+            factoryArg.setValue(_factorypath);
+        }
+
+        if (_factory != null && _factory.trim().length() > 0) {
+            Commandline.Argument factoryArg = createCompilerArg();
+            factoryArg.setValue("-factory");
+            factoryArg = createCompilerArg();
+            factoryArg.setValue(_factory);
+        }
+
+        // Iterate through the list of input extensions, matching/dependency
+        // checking based upon the input list.
         for (int j = 0; j < _srcExts.size(); j++)
         {
             String ext = (String)_srcExts.get(j);
@@ -311,4 +351,6 @@
     protected File _genDir;
     protected Vector/**/ _srcExts = new Vector/**/();
     protected Vector/**/ _processorOptions = new Vector/**/();
+    protected String _factory = null;
+    protected String _factorypath = null;
 }

svn commit: r601914 - in /beehive/trunk: controls/src/runtime/org/apache/beehive/controls/runtime/assembly/ controls/src/runtime/org/apache/beehive/controls/runtime/bean/ controls/src/runtime/org/apache/beehive/controls/runtime/generator/ netui/src/cor...

2007-12-06T23:33:44Z

Author: crogers
Date: Thu Dec  6 15:33:40 2007
New Revision: 601914

URL: http://svn.apache.org/viewvc?rev=601914&view=rev
Log:
BEEHIVE-1209 - change ClassLoader.loadClass() to 3 arg version of Class.forName() for Java
6

Tests: controls BVT, netui BVT (WinXP passed)


Modified:
    beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/assembly/Assembler.java
    beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBean.java
    beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptControlInterface.java
    beehive/trunk/netui/src/core/org/apache/beehive/netui/core/factory/FactoryUtils.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handlers.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorContext.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowInitialization.java
    beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRendererFactory.java
    beehive/trunk/netui/src/tomcat-webapp/5.0.x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java
    beehive/trunk/netui/src/tomcat-webapp/5.5.x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java
    beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/DiscoveryUtils.java
    beehive/trunk/netui/src/util/org/apache/beehive/netui/util/logging/Logger.java

Modified: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/assembly/Assembler.java
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/assembly/Assembler.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/assembly/Assembler.java
(original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/assembly/Assembler.java
Thu Dec  6 15:33:40 2007
@@ -73,7 +73,7 @@
         try
         {
             // Create the requested ControlAssemblyContext.Factory
-            Class factoryClass = cl.loadClass( factoryName );
+            Class factoryClass = Class.forName(factoryName, false, cl);
             ControlAssemblyContext.Factory factory = (ControlAssemblyContext.Factory)factoryClass.newInstance();
 
             // Iterate over control types
@@ -82,7 +82,7 @@
             {
                 // Search for applicable ControlAssemblers as specified on the control impls
                 String cImpl = controlTypeToImpl.get( ct );
-                Class cImplClass = cl.loadClass( cImpl );
+                Class cImplClass = Class.forName(cImpl, false, cl);
 
                 ControlImplementation a = (ControlImplementation)cImplClass.getAnnotation(ControlImplementation.class);
                 if ( a == null )
@@ -95,7 +95,7 @@
                     ControlAssembler assembler = assemblerClass.newInstance();
                     Set clients = controlTypeToClients.get( ct );
                     ControlAssemblyContext cac = factory.newInstance(
-                        cl.loadClass(ct), null, clients, moduleRoot, moduleName, srcOutputRoot
);
+                        Class.forName(ct, false, cl), null, clients, moduleRoot, moduleName,
srcOutputRoot );
                     assembler.assemble( cac );
                 }
             }

Modified: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBean.java
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBean.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBean.java
(original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBean.java
Thu Dec  6 15:33:40 2007
@@ -238,8 +238,8 @@
         {
             try
             {
-                Class initClass = _implClass.getClassLoader().loadClass(
-                                        _implClass.getName() + "Initializer");
+                Class initClass = Class.forName(_implClass.getName() + "Initializer",
+                        false, _implClass.getClassLoader());
                 _implInitializer = (ImplInitializer)initClass.newInstance();
             }
             catch (Exception e)
@@ -275,7 +275,7 @@
 
             try
             {
-                _implClass = _controlIntf.getClassLoader().loadClass(implBinding);
+                _implClass = Class.forName(implBinding, false, _controlIntf.getClassLoader());
 
                 //
                 // Validate that the specified implementation class has an @ControlImplementation
@@ -976,7 +976,7 @@
         {
             try
             {
-                i  = (Interceptor) getControlService( getControlBeanContext().getClassLoader().loadClass(
n ), null );
+                i  = (Interceptor) getControlService(Class.forName(n, false, getControlBeanContext().getClassLoader()),
null );
             }
             catch ( Exception e )
             {

Modified: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptControlInterface.java
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptControlInterface.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptControlInterface.java
(original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptControlInterface.java
Thu Dec  6 15:33:40 2007
@@ -985,7 +985,7 @@
             {
                 ClassLoader loader = getExternalClassLoader();
 
-                Class checkerClass = loader.loadClass( checkerName );
+                Class checkerClass = Class.forName(checkerName, false, loader);
                 if ( !ControlChecker.class.isAssignableFrom(checkerClass) )
                 {
                     _ap.printError( intfDecl, "control.interface.illegal.checker", intfDecl.getSimpleName(),
checkerName );

Modified: beehive/trunk/netui/src/core/org/apache/beehive/netui/core/factory/FactoryUtils.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/core/org/apache/beehive/netui/core/factory/FactoryUtils.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/netui/src/core/org/apache/beehive/netui/core/factory/FactoryUtils.java (original)
+++ beehive/trunk/netui/src/core/org/apache/beehive/netui/core/factory/FactoryUtils.java Thu
Dec  6 15:33:40 2007
@@ -41,7 +41,7 @@
         
         try
         {
-            Class actualFactoryType = cl.loadClass( className );
+            Class actualFactoryType = Class.forName(className, false, cl);
             
             if ( ! factoryType.isAssignableFrom( actualFactoryType ) )
             {

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
(original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
Thu Dec  6 15:33:40 2007
@@ -1847,7 +1847,7 @@
 
                     if ( className != null )
                     {
-                        pageServletClass = cl.loadClass( className );
+                        pageServletClass = Class.forName(className, false, cl);
 
                         if ( Servlet.class.isAssignableFrom( pageServletClass ) )
                         {

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handlers.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handlers.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handlers.java
(original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handlers.java
Thu Dec  6 15:33:40 2007
@@ -225,7 +225,7 @@
         
         try
         {
-            Class handlerClass = cl.loadClass( className );
+            Class handlerClass = Class.forName(className, false, cl);
             
             if ( ! baseClassOrInterface.isAssignableFrom( handlerClass ) )
             {

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorContext.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorContext.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorContext.java
(original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorContext.java
Thu Dec  6 15:33:40 2007
@@ -128,7 +128,7 @@
         
         try
         {
-            Class interceptorClass = cl.loadClass( className );
+            Class interceptorClass = Class.forName(className, false, cl);
             
             if ( ! baseClassOrInterface.isAssignableFrom( interceptorClass ) )
             {

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java
(original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java
Thu Dec  6 15:33:40 2007
@@ -181,11 +181,11 @@
         {
             synchronized ( this )
             {
-                return _pageFlowClassLoader.loadClass( className );
+                return Class.forName(className, false, _pageFlowClassLoader);
             }
         }
         
-        return DiscoveryUtils.getClassLoader().loadClass( className );
+        return Class.forName(className, false, DiscoveryUtils.getClassLoader());
     }
 
     public URL getResource(String name)

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowInitialization.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowInitialization.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowInitialization.java
(original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowInitialization.java
Thu Dec  6 15:33:40 2007
@@ -210,7 +210,7 @@
 
                 try
                 {
-                    Class formatterClass = cl.loadClass( className );
+                    Class formatterClass = Class.forName(className, false, cl);
                     if ( ! TemplatedURLFormatter.class.isAssignableFrom( formatterClass )
)
                     {
                         _log.error( "The templated-url-formatter-class, " + className

Modified: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRendererFactory.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRendererFactory.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRendererFactory.java
(original)
+++ beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRendererFactory.java
Thu Dec  6 15:33:40 2007
@@ -67,7 +67,7 @@
             // create an instance of the def template formatter class
             ClassLoader cl = DiscoveryUtils.getClassLoader();
             try {
-                Class rendererClass = cl.loadClass(className);
+                Class rendererClass = Class.forName(className, false, cl);
                 if (!TreeRenderer.class.isAssignableFrom(rendererClass)) {
                     _log.error("The tree renderer class, " + className
                             + ", does not extend TreeRenderer.");

Modified: beehive/trunk/netui/src/tomcat-webapp/5.0.x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/tomcat-webapp/5.0.x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/netui/src/tomcat-webapp/5.0.x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java
(original)
+++ beehive/trunk/netui/src/tomcat-webapp/5.0.x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java
Thu Dec  6 15:33:40 2007
@@ -46,7 +46,7 @@
                 //
                 // See if our helper interface is in the common classloader.
                 //
-                DiscoveryUtils.getClassLoader().loadClass( HELPER_INTERFACE_CLASSNAME );
+                Class.forName(HELPER_INTERFACE_CLASSNAME, false, DiscoveryUtils.getClassLoader());
             }
             catch ( ClassNotFoundException e )
             {

Modified: beehive/trunk/netui/src/tomcat-webapp/5.5.x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/tomcat-webapp/5.5.x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/netui/src/tomcat-webapp/5.5.x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java
(original)
+++ beehive/trunk/netui/src/tomcat-webapp/5.5.x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java
Thu Dec  6 15:33:40 2007
@@ -46,7 +46,7 @@
                 //
                 // See if our helper interface is in the common classloader.
                 //
-                DiscoveryUtils.getClassLoader().loadClass( HELPER_INTERFACE_CLASSNAME );
+                Class.forName(HELPER_INTERFACE_CLASSNAME, false, DiscoveryUtils.getClassLoader());
             }
             catch ( ClassNotFoundException e )
             {

Modified: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/DiscoveryUtils.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/DiscoveryUtils.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/DiscoveryUtils.java
(original)
+++ beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/DiscoveryUtils.java
Thu Dec  6 15:33:40 2007
@@ -175,7 +175,7 @@
                             + ": " + className );
             }
             
-            Class implementorClass = classLoader.loadClass( className );
+            Class implementorClass = Class.forName(className, false, classLoader);
             
             if ( interfaceType.isAssignableFrom( implementorClass ) )
             {

Modified: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/logging/Logger.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/logging/Logger.java?rev=601914&r1=601913&r2=601914&view=diff
==============================================================================
--- beehive/trunk/netui/src/util/org/apache/beehive/netui/util/logging/Logger.java (original)
+++ beehive/trunk/netui/src/util/org/apache/beehive/netui/util/logging/Logger.java Thu Dec
 6 15:33:40 2007
@@ -200,7 +200,7 @@
 
         String className = "org.apache.beehive.netui.util.logging.internal.Log4JLogger";
         try {
-            Class logDelegateClass = Logger.class.getClassLoader().loadClass(className);
+            Class logDelegateClass = Class.forName(className, false, Logger.class.getClassLoader());
             Method method = logDelegateClass.getMethod("getInstance", new Class[] {Class.class});
             return (Log)method.invoke(null, new Object[] {loggerClient});
         }

svn commit: r596723 - /beehive/sandbox/maven2/beehive-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/index.jsp

2007-11-20T15:51:13Z

Author: ekoneil
Date: Tue Nov 20 07:51:12 2007
New Revision: 596723

URL: http://svn.apache.org/viewvc?rev=596723&view=rev
Log:
Update the page template for the NetUI web project archetype.



Modified:
    beehive/sandbox/maven2/beehive-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/index.jsp

Modified: beehive/sandbox/maven2/beehive-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/beehive/sandbox/maven2/beehive-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/index.jsp?rev=596723&r1=596722&r2=596723&view=diff
==============================================================================
--- beehive/sandbox/maven2/beehive-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/index.jsp
(original)
+++ beehive/sandbox/maven2/beehive-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/index.jsp
Tue Nov 20 07:51:12 2007
@@ -1,5 +1,10 @@
+<%@ page language="java"%>
+<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%>
+<%@ taglib prefix="netui-data" uri="http://beehive.apache.org/netui/tags-databinding-1.0"%>
+<%@ taglib prefix="netui-temp" uri="http://beehive.apache.org/netui/tags-template-1.0"%>
+
 
     
-        Hello World!
+        Hello World!

svn commit: r582706 - in /beehive/trunk/netui: src/compiler-core/org/apache/beehive/netui/compiler/grammar/ test/src/compilerTests/testsuite/Jira1207/ test/src/compilerTests/testsuite/Jira1207/Jira1207/ test/src/compilerTests/testsuite/Jira1207/expecte...

2007-10-08T04:05:30Z

Author: crogers
Date: Sun Oct  7 21:05:27 2007
New Revision: 582706

URL: http://svn.apache.org/viewvc?rev=582706&view=rev
Log:
Fix and test for BEEHIVE-12207... added code to see if the additional value to check is null.

Tests: NetUI compiler tests (WinXP passed)


Added:
    beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/
    beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/Jira1207/
    beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/Jira1207/Controller.java
  (with props)
    beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/Jira1207/index.jsp   (with
props)
    beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/expectedOutput/
    beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/expectedOutput/warningsorerrors.expected
  (with props)
Modified:
    beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/UniqueValueType.java

Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/UniqueValueType.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/UniqueValueType.java?rev=582706&r1=582705&r2=582706&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/UniqueValueType.java
(original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/UniqueValueType.java
Sun Oct  7 21:05:27 2007
@@ -90,7 +90,7 @@
                                 annotationArrayIndex );
             
             //
-            // Get a list of additional annotations (presumably not from the this one's parent)
to check.
+            // Get a list of additional annotations (presumably not from this one's parent)
to check.
             //
             List additionalAnnsToCheck = getAdditionalAnnotationsToCheck( classMember );
             
@@ -99,12 +99,17 @@
                 // Check this value against the list of additional annotations.
                 checkForDuplicates( value, valueName, parentAnnotation, classMember, additionalAnnsToCheck,
true, -1 );
                 
-                // Check for duplicates *within* within the list of additional annotations.
+                // Check for duplicates *within* the list of additional annotations.
                 for ( int i = 0; i < additionalAnnsToCheck.size(); ++i )
                 {
                     AnnotationInstance ann = ( AnnotationInstance ) additionalAnnsToCheck.get(
i );
                     AnnotationValue valueToCheck = CompilerUtils.getAnnotationValue( ann,
valueName, true );
-                    checkForDuplicates( valueToCheck, valueName, ann, classMember, additionalAnnsToCheck,
true, -1 );
+
+                    // The additional value to check could be null, but this
+                    // error would be caught in another check. 
+                    if (valueToCheck != null) {
+                        checkForDuplicates(valueToCheck, valueName, ann, classMember, additionalAnnsToCheck,
true, -1);
+                    }
                 }
             }
         }

Added: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/Jira1207/Controller.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/Jira1207/Controller.java?rev=582706&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/Jira1207/Controller.java
(added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/Jira1207/Controller.java
Sun Oct  7 21:05:27 2007
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 Jira1207;
+
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import org.apache.beehive.netui.pageflow.Forward;
+
+/*
+ * Test for JIRA issue, BEEHIVE-1207, to make sure we don't have
+ * an NPE caused by the empty forward in the exception handler.
+ */
+@Jpf.Controller(
+)
+public class Controller extends PageFlowController {
+
+    @Jpf.Action(
+        catches = {
+            @Jpf.Catch(
+                type = Exception.class,
+                method = "localHandler")
+        },
+        forwards = {
+            @Jpf.Forward(name = "success", path = "index.jsp")
+        }
+    )
+    public Forward begin() {
+        Forward forward = new Forward("success");
+        return forward;
+    }
+
+    @Jpf.ExceptionHandler(
+        forwards = {
+            @Jpf.Forward()
+        }
+    )
+    protected Forward localHandler(Exception ex, String actionName,
+                                   String message, Object form)
+    {
+        return new Forward("test");
+    }
+}

Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/Jira1207/Controller.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/Jira1207/index.jsp
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/Jira1207/index.jsp?rev=582706&view=auto
==============================================================================
    (empty)

Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/Jira1207/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/expectedOutput/warningsorerrors.expected?rev=582706&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/expectedOutput/warningsorerrors.expected
(added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/expectedOutput/warningsorerrors.expected
Sun Oct  7 21:05:27 2007
@@ -0,0 +1,7 @@
+[LOCAL_PATH]\WEB-INF\.tmpbeansrc\Jira1207\Controller.java:53: Attribute "name" must be present.
+    protected Forward localHandler(Exception ex, String actionName,
+                      ^
+[LOCAL_PATH]\WEB-INF\.tmpbeansrc\Jira1207\Controller.java:53: At least one of attributes
"path", "tilesDefinition", "returnAction", "navigateTo", or "action" must be present.
+    protected Forward localHandler(Exception ex, String actionName,
+                      ^
+2 errors

Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1207/expectedOutput/warningsorerrors.expected
------------------------------------------------------------------------------
    svn:eol-style = native

svn commit: r581622 - /beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java

2007-10-03T15:19:07Z

Author: crogers
Date: Wed Oct  3 08:19:06 2007
New Revision: 581622

URL: http://svn.apache.org/viewvc?rev=581622&view=rev
Log:
fixed a typo in a comment.


Modified:
    beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java

Modified: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java?rev=581622&r1=581621&r2=581622&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java (original)
+++ beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java Wed Oct
 3 08:19:06 2007
@@ -1210,7 +1210,7 @@
         return _state.multiple;
     }
 
-    // add dthe datasource values if needed.
+    // add the datasource values if needed.
     private void addDatasourceIfNeeded(ServletRequest req)
             throws JspException
     {

svn commit: r580513 - /beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java

2007-09-28T23:09:59Z

Author: crogers
Date: Fri Sep 28 16:09:58 2007
New Revision: 580513

URL: http://svn.apache.org/viewvc?rev=580513&view=rev
Log:
Modified the FlowControllerFactory so that if the application has a shared flow defined with
the GlobalApp class name then don't use it as a global app we won't log an error. The app
may have updated from an old netui implementation and changed the class to a shared flow that's
properly referenced from other Controllers. Just log a warning and return null, indicating
that there is no GlobalApp. Related to BEEHIVE-1205

Tests: NetUI BVT (WinXP passed)


Modified:
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java?rev=580513&r1=580512&r2=580513&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java
(original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java
Fri Sep 28 16:09:58 2007
@@ -701,8 +701,14 @@
                     factory.createSharedFlow(new RequestContext(request, response), sharedFlowClass);
                 if ( ! ( sf instanceof GlobalApp ) )
                 {
-                    LOG.error( "Class " + PageFlowConstants.GLOBALAPP_CLASSNAME + " is not
an instance of "
-                                + GlobalApp.class.getName() );
+                    // If the application has a shared flow defined with the
+                    // GlobalApp class name then don't use it as a global app.
+                    // The app may have updated from an old netui implementation
+                    // and change the class to a shared flow that's properly
+                    // referenced from other Controllers. Just log a warning
+                    // and return null, indicating that there is no GlobalApp.
+                    LOG.warn("Class " + PageFlowConstants.GLOBALAPP_CLASSNAME + " is not
an instance of "
+                            + GlobalApp.class.getName());
                     servletContext.setAttribute(NO_GLOBAL_APP_KEY, Boolean.TRUE);
                     return null;
                 }

svn commit: r576735 - /beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java

2007-09-18T07:03:20Z

Author: crogers
Date: Tue Sep 18 00:03:19 2007
New Revision: 576735

URL: http://svn.apache.org/viewvc?rev=576735&view=rev
Log:
Add a runtime check in FlowControllerFactory to ensure that a global.Global class inherits
from SharedFlowController before trying to create the shared flow.  BEEHIVE-1205

Tests: NetUI BVT (WinXP passed)


Modified:
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java?rev=576735&r1=576734&r2=576735&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java
(original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java
Tue Sep 18 00:03:19 2007
@@ -689,13 +689,21 @@
             try
             {
                 FlowControllerFactory factory = get( servletContext );
-                SharedFlowController sf =
-                    factory.createSharedFlow( new RequestContext( request, response ), PageFlowConstants.GLOBALAPP_CLASSNAME
);
+                Class sharedFlowClass = factory.getFlowControllerClass(PageFlowConstants.GLOBALAPP_CLASSNAME);
+                if (!SharedFlowController.class.isAssignableFrom(sharedFlowClass)) {
+                    LOG.info("Class " + PageFlowConstants.GLOBALAPP_CLASSNAME + " is not
an instance of "
+                            + SharedFlowController.class.getName());
+                    servletContext.setAttribute(NO_GLOBAL_APP_KEY, Boolean.TRUE);
+                    return null;
+                }
 
+                SharedFlowController sf =
+                    factory.createSharedFlow(new RequestContext(request, response), sharedFlowClass);
                 if ( ! ( sf instanceof GlobalApp ) )
                 {
                     LOG.error( "Class " + PageFlowConstants.GLOBALAPP_CLASSNAME + " is not
an instance of "
                                 + GlobalApp.class.getName() );
+                    servletContext.setAttribute(NO_GLOBAL_APP_KEY, Boolean.TRUE);
                     return null;
                 }

svn commit: r575538 - in /beehive/trunk/netui: src/compiler-core/org/apache/beehive/netui/compiler/ test/src/compilerTests/testsuite/Jira1205/ test/src/compilerTests/testsuite/Jira1205/Jira1205/ test/src/compilerTests/testsuite/Jira1205/expectedOutput/...

2007-09-14T05:28:15Z

Author: crogers
Date: Thu Sep 13 22:28:14 2007
New Revision: 575538

URL: http://svn.apache.org/viewvc?rev=575538&view=rev
Log:
Fix for BEEHIVE-1205. Modify FlowControllerInfo.setSharedFlowInfo() to check that the global.Global
class inherits from SharedFlowController. Includes a new compiler test.

Tests: NetUI BVT (WinXP passed)


Added:
    beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1205/
    beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1205/Jira1205/
    beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1205/Jira1205/Controller.java
  (with props)
    beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1205/Jira1205/index.jsp   (with
props)
    beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1205/expectedOutput/
    beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1205/expectedOutput/struts-config-Jira1205.expected
  (with props)
    beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1205/global/
    beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1205/global/Global.java   (with
props)
Modified:
    beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerInfo.java

Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerInfo.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerInfo.java?rev=575538&r1=575537&r2=575538&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerInfo.java
(original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerInfo.java
Thu Sep 13 22:28:14 2007
@@ -235,7 +235,9 @@
         if ( _sharedFlowTypes.isEmpty() )
         {
             TypeDeclaration type = env.getTypeDeclaration( GLOBALAPP_FULL_CLASSNAME );
-            if ( type != null ) _sharedFlowTypes.put( GLOBALAPP_SHARED_FLOW_NAME, type );
+            if (type != null && CompilerUtils.isAssignableFrom(SHARED_FLOW_BASE_CLASS,
type, env)) {
+                _sharedFlowTypes.put(GLOBALAPP_SHARED_FLOW_NAME, type);
+            }
         }
   
         _sharedFlowTypeNames = new LinkedHashMap();

Added: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1205/Jira1205/Controller.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1205/Jira1205/Controller.java?rev=575538&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1205/Jira1205/Controller.java
(added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1205/Jira1205/Controller.java
Thu Sep 13 22:28:14 2007
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 Jira1205;
+
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+/*
+ * Test that a global.Global POJO class does not get set as a
+ * shared flow (deprecated GlobalApp) property of the Controller.
+ */
+@Jpf.Controller(
+    simpleActions={
+        @Jpf.SimpleAction(name="begin", path="index.jsp")
+    }
+)
+public class Controller extends PageFlowController
+{
+}

Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1205/Jira1205/Controller.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1205/Jira1205/index.jsp
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1205/Jira1205/index.jsp?rev=575538&view=auto
==============================================================================
    (empty)

Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1205/Jira1205/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1205/expectedOutput/struts-config-Jira1205.expected
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1205/expectedOutput/struts-config-Jira1205.expected?rev=575538&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1205/expectedOutput/struts-config-Jira1205.expected
(added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1205/expectedOutput/struts-config-Jira1205.expected
Thu Sep 13 22:28:14 2007
@@ -0,0 +1,26 @@
+
+
+
+  
+  
+  
+  
+    
+  
+  
+    
+      
+      
+      
+      
+    
+  
+  
+    
+    
+    
+    
+    
+  
+  
+

Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1205/expectedOutput/struts-config-Jira1205.expected
------------------------------------------------------------------------------
    svn:eol-style = native

Added: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1205/global/Global.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1205/global/Global.java?rev=575538&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1205/global/Global.java (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1205/global/Global.java Thu Sep
13 22:28:14 2007
@@ -0,0 +1,22 @@
+package global;
+
+public class Global implements java.io.Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private String _name = "foo";
+    private String _id = "bar";
+
+
+    public Global() { }
+
+    public Global(String name, String id) {
+        _name = name;
+        _id = id;
+    }
+
+    public String getName() { return _name; }
+    public void setName(String name) { _name = name; }
+
+    public String getId() { return _id; }
+    public void setId(String id) { _id = id; }
+}

Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1205/global/Global.java
------------------------------------------------------------------------------
    svn:eol-style = native

[Beehive Wiki] Update of "wow+power+leveling" by antonioGallardo

2007-09-11T04:04:28Z

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Beehive Wiki" for change notification.

The following page has been changed by antonioGallardo:
http://wiki.apache.org/beehive/wow+power+leveling

The comment on the change is:
Spam

------------------------------------------------------------------------------
- Baseball gave him his earliest challenge. He was an outstanding pitcher in Little League,
and eventually, as a senior in high school, made the [http://www.toppowerlevel.net wow powerleveling]
varsity, winning half the team‘s games with a record of five wins and two losses. At graduation,
the coach named Daniel the [http://www.toppowerlevel.net wow power level] team‘s most valuable
player.
+ deleted

- His finest hour, though, came at a school science fair. He entered an exhibit showing
how the [http://www.toppowerlevel.net wow power leveling] circulatory system works. It was
primitive and crude, especially compared to the fancy, computerized, blinking-light models
entered by other [http://www.toppowerlevel.net wow power level] students. My wife, Sara, felt
embarrassed for him.
-
- It turned out that the other kids [http://www.toppowerlevel.net wow power leveling]
had not done their own work-their parents had made their exhibits. As the judges went on their
rounds, they found that these other kids couldn‘t answer their questions. Daniel answered
every one. When the judges awarded the [http://www.toppowerlevel.net/powerlist.php?fid=2871
lotro power leveling] Albert Einstein Plaque for the best exhibit, they gave it to him.
-
- By the time Daniel left for [http://www.toppowerlevel.net/powerlist.php?fid=2871 lotro
power leveling] he stood six feet tall and weighed 170 pounds. He was muscular and in superb
[http://www.toppowerlevel.net wow powerleveling] condition, but he never pitched another inning,
having given up baseball for English literature. I was sorry that he would not develop his
athletic talent, but proud that he had made such a mature decision.
-
- One day I told Daniel that the great failing in my [http://www.toppowerlevel.net wow
power leveling] life had been that I didn‘t take a year or two off to travel when I finished
college. This is the best way, to my way of thinking, to broaden oneself and develop a larger
perspective on life. Once I had married and begun working, I found that the dream of [http://www.toppowerlevel.net/powerlist.php?fid=2871
lotro power leveling] in another culture had vanished.
-
- Daniel thought about this. His friends said that he would be insane to put his career
on [http://www.toppowerlevel.net wow powerleveling]. But he decided it wasn‘t so crazy.
After graduation, he worked as a waiter at college, a bike messenger and a house painter.
With the money he earned, he had enough to go to [http://www.toppowerlevel.net wow power level]
Paris.
-
- The [http://www.toppowerlevel.net/powerlist.php?fid=2871 lotro power leveling] before
he was to leave, I tossed in bed. I was trying to figure out something to say. Nothing came
to mind. Maybe, I thought [http://www.toppowerlevel.net wow power leveling], it wasn‘t necessary
to say anything.
-
- What does it matter in the course of a [http://www.toppowerlevel.net wow power level]
if a father never tells a son what he really thinks of him? But as I stood before Daniel,
I knew that it does matter. My father and I loved each other. Yet, I always regretted never
hearing him put his feelings into words and never having the memory of that moment. Now, I
could feel my palms sweat and my throat tighten. Why is it so hard to tell a son something
from the heart? My mouth turned dry, and I knew I would be able to get out only a few [http://www.toppowerlevel.net/powerlist.php?fid=2871
lotro power leveling] words clearly.
-
- “Daniel," I said, "if I could have picked [http://www.toppowerlevel.net wow powerleveling],
I would have picked you."
-
- That‘s all I could say. I wasn‘t sure he understood what I meant. Then he came
toward me and threw his arms around me. For a moment, the [http://www.toppowerlevel.net wow
power leveling] world and all its people vanished, and there was just Daniel and me in our
home by the sea.
-
- He was saying [http://www.toppowerlevel.net wow powerleveling], but my eyes misted
over, and I couldn‘t understand what he was saying. All I was aware of was the stubble on
his chin as his face pressed against mine. And then, the [http://www.toppowerlevel.net/powerlist.php?fid=2871
lotro powerleveling]. I went to [http://www.toppowerlevel.net wow power level] work, and Daniel
left a few hours later with his girlfriend.
-
- That was seven weeks ago, and I think about [http://www.toppowerlevel.net/powerlist.php?fid=2871
lotro powerleveling] when I walk along the beach on weekends. Thousands of miles away, somewhere
out past the ocean waves breaking on the [http://www.toppowerlevel.net/powerlist.php?fid=2871
lotro power level]
- deserted shore, he might be scurrying across Boulevard Saint Germain, strolling through
a musty hallway of the Louvre, bending an elbow in a Left Bank café.
-
- What I had said to Daniel was clumsy and trite. It was [http://www.toppowerlevel.net
wow power level]. And yet, it was everything.
-

[Beehive Wiki] Update of "wow+power+leveling" by loki002

2007-09-10T23:21:55Z

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Beehive Wiki" for change notification.

The following page has been changed by loki002:
http://wiki.apache.org/beehive/wow+power+leveling

New page:
Baseball gave him his earliest challenge. He was an outstanding pitcher in Little League,
and eventually, as a senior in high school, made the [http://www.toppowerlevel.net wow powerleveling]
varsity, winning half the team‘s games with a record of five wins and two losses. At graduation,
the coach named Daniel the [http://www.toppowerlevel.net wow power level] team‘s most valuable
player.

His finest hour, though, came at a school science fair. He entered an exhibit showing
how the [http://www.toppowerlevel.net wow power leveling] circulatory system works. It was
primitive and crude, especially compared to the fancy, computerized, blinking-light models
entered by other [http://www.toppowerlevel.net wow power level] students. My wife, Sara, felt
embarrassed for him.

It turned out that the other kids [http://www.toppowerlevel.net wow power leveling]
had not done their own work-their parents had made their exhibits. As the judges went on their
rounds, they found that these other kids couldn‘t answer their questions. Daniel answered
every one. When the judges awarded the [http://www.toppowerlevel.net/powerlist.php?fid=2871
lotro power leveling] Albert Einstein Plaque for the best exhibit, they gave it to him.

By the time Daniel left for [http://www.toppowerlevel.net/powerlist.php?fid=2871 lotro
power leveling] he stood six feet tall and weighed 170 pounds. He was muscular and in superb
[http://www.toppowerlevel.net wow powerleveling] condition, but he never pitched another inning,
having given up baseball for English literature. I was sorry that he would not develop his
athletic talent, but proud that he had made such a mature decision.

One day I told Daniel that the great failing in my [http://www.toppowerlevel.net wow
power leveling] life had been that I didn‘t take a year or two off to travel when I finished
college. This is the best way, to my way of thinking, to broaden oneself and develop a larger
perspective on life. Once I had married and begun working, I found that the dream of [http://www.toppowerlevel.net/powerlist.php?fid=2871
lotro power leveling] in another culture had vanished.

Daniel thought about this. His friends said that he would be insane to put his career
on [http://www.toppowerlevel.net wow powerleveling]. But he decided it wasn‘t so crazy.
After graduation, he worked as a waiter at college, a bike messenger and a house painter.
With the money he earned, he had enough to go to [http://www.toppowerlevel.net wow power level]
Paris.

The [http://www.toppowerlevel.net/powerlist.php?fid=2871 lotro power leveling] before
he was to leave, I tossed in bed. I was trying to figure out something to say. Nothing came
to mind. Maybe, I thought [http://www.toppowerlevel.net wow power leveling], it wasn‘t necessary
to say anything.

What does it matter in the course of a [http://www.toppowerlevel.net wow power level]
if a father never tells a son what he really thinks of him? But as I stood before Daniel,
I knew that it does matter. My father and I loved each other. Yet, I always regretted never
hearing him put his feelings into words and never having the memory of that moment. Now, I
could feel my palms sweat and my throat tighten. Why is it so hard to tell a son something
from the heart? My mouth turned dry, and I knew I would be able to get out only a few [http://www.toppowerlevel.net/powerlist.php?fid=2871
lotro power leveling] words clearly.

“Daniel," I said, "if I could have picked [http://www.toppowerlevel.net wow powerleveling],
I would have picked you."

That‘s all I could say. I wasn‘t sure he understood what I meant. Then he came toward
me and threw his arms around me. For a moment, the [http://www.toppowerlevel.net wow power
leveling] world and all its people vanished, and there was just Daniel and me in our home
by the sea.

He was saying [http://www.toppowerlevel.net wow powerleveling], but my eyes misted over,
and I couldn‘t understand what he was saying. All I was aware of was the stubble on his
chin as his face pressed against mine. And then, the [http://www.toppowerlevel.net/powerlist.php?fid=2871
lotro powerleveling]. I went to [http://www.toppowerlevel.net wow power level] work, and Daniel
left a few hours later with his girlfriend.

That was seven weeks ago, and I think about [http://www.toppowerlevel.net/powerlist.php?fid=2871
lotro powerleveling] when I walk along the beach on weekends. Thousands of miles away, somewhere
out past the ocean waves breaking on the [http://www.toppowerlevel.net/powerlist.php?fid=2871
lotro power level]
deserted shore, he might be scurrying across Boulevard Saint Germain, strolling through a
musty hallway of the Louvre, bending an elbow in a Left Bank café.

What I had said to Daniel was clumsy and trite. It was [http://www.toppowerlevel.net
wow power level]. And yet, it was everything.

[Beehive Wiki] Update of "Globe+Correspondent" by CarlinRogers

2007-09-10T17:12:35Z

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Beehive Wiki" for change notification.

The following page has been changed by CarlinRogers:
http://wiki.apache.org/beehive/Globe+Correspondent

The comment on the change is:
Spam

------------------------------------------------------------------------------
+ deleted
- But community health centers draw patients for a number of reasons. They offer "one-stop
shopping," which can include dental care, substance abuse treatment,
- pediatric and prenatal care, and social services. Most have child care and translators on
site for non-English speakers.

- With the new Massachusetts health insurance law boosting the number of patients seeking
care, community health centers south of Boston are scrambling to meet
- the demand.
-
- Sign up for: Globe Headlines e-mail | Breaking News Alerts Manet Community Health Center,
which has four locations in Quincy and one in Hull, is hiring two
- new family care physicians and a nurse practitioner. Brockton Neighborhood Health Center
now stays open two hours later on weeknights. In February, it hired
- a nurse practitioner, two medical assistants, and two social workers, and is planning to
hire 20 more staff members in the next six months.
-
- "We've seen a really significant increase in visits by new patients," said Sue Joss, executive
director of the Brockton health center. "Our phones are
- ringing off the hook for new patients."
-
- The two centers are the only ones directly south of Boston. But community health centers
in Fall River and New Bedford, which also serve people from this
- region, are experiencing the same increase in demand, and expanding hours to meet it.
-
- The state's universal health insurance law, which is being rolled out this year, is bringing
formerly uninsured people into the healthcare system. Many of
- these individuals and families are turning to community health centers, the locally based
nonprofit organizations that arose from the antipoverty movement of
- the 1960s.
-
- "We are front and center in the new healthcare legislation," said Kerin O'Toole, spokeswoman
for the Massachusetts League of Community Health Centers. "We've
- seen quite a surge in demand. Although in many cases patients could go elsewhere, the health
centers offer a whole range of services you can't get from a
- private provider."
-
- The nation's first community health center opened at Columbia Point in Dorchester in 1965
as part of President Johnson's war on poverty.
-
- Similar centers, supported by federal aid and private grants, opened across the country
in poor and medically underserved areas. Today, the United States has
- more than a thousand centers, 52 of them in Massachusetts.
-
- Business is thriving. In April, the Brockton center on Main Street saw a 12 percent spike
in patient visits over last year, and in May, a 9 percent increase.
- A new $16 million center is under construction next to the cramped downtown facility and
is scheduled to open in November.
-
- Statewide, patient loads at community health centers have been on the rise. In 2006, centers
in Massachusetts saw 760,301 patients, an increase of nearly
- 94,000, or 14 percent, over the previous year.
-
- The surge in demand at community health centers with the new law was not fully expected.
The centers have long been a safety net in the healthcare system -
- places where people could go whether they had insurance or not. The insured usually have
many choices when seeking care
-
- Sign up for: Globe Headlines e-mail | Breaking News Alerts "People are more aware of the
community health centers and the services we provide," said Sheryl
- Turgeon, chief executive officer of Healthfirst, which draws patients from Fall River and
nearby towns.
-
- Community health centers also do outreach for Commonwealth Care, the new state health insurance
program, and visitors to most centers can sign up for health
- insurance on the spot.
-
- The heavy promotions the state has been doing to get the uninsured to sign up and take advantage
of healthcare also seems to be a factor in the increasing
- number of visits, according to Toni McGuire, chief executive officer of the Manet center.
-
- "I think one of the biggest reasons for the increase is the advertising around Commonwealth
Care," McGuire said. Said Joss of the Brockton center, "There was
- never this kind of publicity around the free-care pool."
-
- In the past, institutions that treated the uninsured were compensated by a pool of money
administered by the state and paid into by hospitals and other large
- providers.
-
- Another reason that community health centers are seeing more patients is that three of the
four insurers working with Commonwealth Care tend to direct
- subscribers to the centers, according to Alan Sager, director of the health reform program
at Boston University School of Public Health.
-
- Sager said he is concerned that some community health centers may not be able to hire physicians
quickly enough to meet the demand.
-
- "If health centers were deluged by dozens more patients every day, how quickly could they
respond?" he asked.
-
- A Massachusetts Medical Society report issued last month warned of a growing shortage of
primary care physicians and some specialists, based on surveys of
- doctors and Massachusetts residents.
-
- "The community health centers rely heavily on primary care physicians, and if there is a
shortage in the state, the centers would be exposed to that
- shortage," said B. Dale Magee, president of the Massachusetts Medical Society.
-
- So far, directors of centers south of Boston say they have been able to hire qualified staff
and otherwise meet the demands of new patients - in part by
- expansion.
-
- The Manet center recently purchased the building it had been renting in North Quincy and
is eyeing expansion on the site. The center also opened a clinic at
- Quincy Medical Center.
- [http://www.tnb120.com.cn/ 上海搬家公司],[http://www.168bc.com/ 上海搬场],[http://www.tunfar.com.cn/
物资回收]
- [http://www.globalceoforum.com.cn/ 调节阀],[http://www.xcyouth.org.cn/ 上海搬家公司],[http://www.fdcchina.com.cn/
上海搬场公司]
- [http://www.hbgm.cn/ 多动症],[http://www.sh-dzbc.com.cn/ 上海搬场],[http://www.isas.com.cn/
大众搬场],[http://www.easyday.cn/ 浦东搬场公司]
- [http://www.shyxbc.com.cn/ 上海搬家公司],[http://www.hfire.cn/ 私人侦探],[http://www.168bc.com/price.html
上海搬家公司]
- The Greater New Bedford center recently expanded its downtown facility, more than doubling
its square footage. Brockton's new facility will approximately
- double its patient capacity.
-
- "We're taking a pretty aggressive stance as we get ready to move into the new building,"
said Joss. "It seems right now the demand will be there."
-

[Beehive Wiki] Update of "Carolina+Coast+" by CarlinRogers

2007-09-10T17:11:28Z

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Beehive Wiki" for change notification.

The following page has been changed by CarlinRogers:
http://wiki.apache.org/beehive/Carolina+Coast+

The comment on the change is:
Spam

------------------------------------------------------------------------------
- NAGS HEAD, N.C. (AP) — Tropical Storm Gabrielle began to shower North Carolina's Outer
Banks with rain and batter them with high winds Sunday as the storm slogged slowly toward
the coast.
+ deleted

- Forecasters expected the storm to increase its wind speed slightly — though not to hurricane
levels — before swiping the state's barrier islands on Sunday. After a brief landfall, Gabrielle
was expected to take a sharp turn back into the Atlantic, the National Weather Service said.
-
- "All things considered, it's a pretty weak storm," said Casey Quell, a NWS forecaster in
Morehead City. "More than anything, it will bring some much-needed rain."
-
- The storm carried top sustained winds of about 45 mph as of 5 a.m. Sunday, the National
Weather Service reported. But those winds could strengthen to near 50 mph as Gabrielle nears
the coast, according to the weather service.
-
- Gabrielle's center was located about 50 miles southeast of Cape Lookout and was moving slowly
— about 10 mph — to the north-northwest.
-
- Forecasters issued a tropical storm warning for the North Carolina coastline north of Surf
City through the Outer Banks and to the Virginia border. A tropical storm warning was also
issued northward to Cape Charles Light, Va., along the Atlantic Coast, and a watch remains
in effect for the area extending to New Point Comfort peninsula, along the Chesapeake Bay.
-
- Local officials urged residents and visitors at the vacation hotspot to secure loose items
and to stay indoors as the storm blows through.
-
- Austin Lucas, a manager at Howard's Pub on Ocracoke Island, said workers there tied down
furniture that was on the roof. But beyond that, he said everyone was just waiting to see
when the storm would come.
-
- "We haven't really taken any severe precautions," Lucas said Sunday morning. "Nobody's too
concerned about it."
-
- The National Park Service closed all campgrounds on the Cape Hatteras National Seashore.
But they did not ask or recommend that people leave the islands.
-
- "When people hear about tropical storms, they assume houses are going to fall in the ocean,"
said Margot Jolly, a lifeguard with Nags Heads Ocean Rescue. "They shouldn't overreact like
that. Just relax, stay inside, and have a little hurricane party."
-
- Gabrielle's first showers reached the coastline late Saturday night. Quell said the storm
could produce a storm surge of up to 3 feet, with 1 to 3 inches of rain falling in coastal
areas and up to 5 inches in isolated spots.
-
- "The greatest danger will be flooding in low lying areas and on roads, such as Highway 12
on the Outer Banks," said North Carolina Gov. Mike Easley. "The most deaths during tropical
storms occur when people drive into flood waters and drown. Rip currents will be strong in
the ocean."
-
- Rip currents had already caused problems Saturday. David Baker, the Ocean Rescue director
for the Wrightsville Beach Fire Department about 150 miles south of Nags Head, told The Star-News
of Wilmington that lifeguards rescued about a dozen people from the water because of rip currents.
-
- Gabrielle spun into the storm late Friday after wandering in the Atlantic for several days,
caught along an old frontal boundary that stalled about midway between the Southeast coast
and Bermuda. Forecasters first labeled it a subtropical storm — a hybrid system that takes
power from warm ocean waters but also forms from warm and cold fronts colliding — before
classifying it a tropical system Saturday.
-
- WOW Gold,buy WOW Gold [http://www.isefc.com.cn/ wow gold]
- powerleveling [http://www.isefc.com.cn/powerleveling.asp powerleveling]
- world of warcraft gold [http://www.isefc.com.cn/ world of warcraft gold]
- Burglar alarm [http://www.teamflyelectronic.com/ Burglar alarm]
- [http://www.electronic-wire.com/ cables]
- [http://www.isefc.com.cn/powerleveling.asp powerleveling]
-
- "We've been asking residents to be prepared for anything," said Chris Baucom, a spokesman
for Dare County Emergency Management. "This storm's track has been kind of unpredictable."
-
- All of North Carolina's counties are facing drought conditions, with 91 percent under a
severe drought. Easley asked Friday that all the state's local governments immediately enact
voluntary or mandatory water restrictions.
-

[Beehive Wiki] Update of "Globe+Correspondent" by wikicninfo

2007-09-10T15:47:33Z

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Beehive Wiki" for change notification.

The following page has been changed by wikicninfo:
http://wiki.apache.org/beehive/Globe+Correspondent

New page:
But community health centers draw patients for a number of reasons. They offer "one-stop shopping,"
which can include dental care, substance abuse treatment,
pediatric and prenatal care, and social services. Most have child care and translators on
site for non-English speakers.

With the new Massachusetts health insurance law boosting the number of patients seeking care,
community health centers south of Boston are scrambling to meet
the demand.

Sign up for: Globe Headlines e-mail | Breaking News Alerts Manet Community Health Center,
which has four locations in Quincy and one in Hull, is hiring two
new family care physicians and a nurse practitioner. Brockton Neighborhood Health Center now
stays open two hours later on weeknights. In February, it hired
a nurse practitioner, two medical assistants, and two social workers, and is planning to hire
20 more staff members in the next six months.

"We've seen a really significant increase in visits by new patients," said Sue Joss, executive
director of the Brockton health center. "Our phones are
ringing off the hook for new patients."

The two centers are the only ones directly south of Boston. But community health centers in
Fall River and New Bedford, which also serve people from this
region, are experiencing the same increase in demand, and expanding hours to meet it.

The state's universal health insurance law, which is being rolled out this year, is bringing
formerly uninsured people into the healthcare system. Many of
these individuals and families are turning to community health centers, the locally based
nonprofit organizations that arose from the antipoverty movement of
the 1960s.

"We are front and center in the new healthcare legislation," said Kerin O'Toole, spokeswoman
for the Massachusetts League of Community Health Centers. "We've
seen quite a surge in demand. Although in many cases patients could go elsewhere, the health
centers offer a whole range of services you can't get from a
private provider."

The nation's first community health center opened at Columbia Point in Dorchester in 1965
as part of President Johnson's war on poverty.

Similar centers, supported by federal aid and private grants, opened across the country in
poor and medically underserved areas. Today, the United States has
more than a thousand centers, 52 of them in Massachusetts.

Business is thriving. In April, the Brockton center on Main Street saw a 12 percent spike
in patient visits over last year, and in May, a 9 percent increase.
A new $16 million center is under construction next to the cramped downtown facility and is
scheduled to open in November.

Statewide, patient loads at community health centers have been on the rise. In 2006, centers
in Massachusetts saw 760,301 patients, an increase of nearly
94,000, or 14 percent, over the previous year.

The surge in demand at community health centers with the new law was not fully expected. The
centers have long been a safety net in the healthcare system -
places where people could go whether they had insurance or not. The insured usually have many
choices when seeking care

Sign up for: Globe Headlines e-mail | Breaking News Alerts "People are more aware of the community
health centers and the services we provide," said Sheryl
Turgeon, chief executive officer of Healthfirst, which draws patients from Fall River and
nearby towns.

Community health centers also do outreach for Commonwealth Care, the new state health insurance
program, and visitors to most centers can sign up for health
insurance on the spot.

The heavy promotions the state has been doing to get the uninsured to sign up and take advantage
of healthcare also seems to be a factor in the increasing
number of visits, according to Toni McGuire, chief executive officer of the Manet center.

"I think one of the biggest reasons for the increase is the advertising around Commonwealth
Care," McGuire said. Said Joss of the Brockton center, "There was
never this kind of publicity around the free-care pool."

In the past, institutions that treated the uninsured were compensated by a pool of money administered
by the state and paid into by hospitals and other large
providers.

Another reason that community health centers are seeing more patients is that three of the
four insurers working with Commonwealth Care tend to direct
subscribers to the centers, according to Alan Sager, director of the health reform program
at Boston University School of Public Health.

Sager said he is concerned that some community health centers may not be able to hire physicians
quickly enough to meet the demand.

"If health centers were deluged by dozens more patients every day, how quickly could they
respond?" he asked.

A Massachusetts Medical Society report issued last month warned of a growing shortage of primary
care physicians and some specialists, based on surveys of
doctors and Massachusetts residents.

"The community health centers rely heavily on primary care physicians, and if there is a shortage
in the state, the centers would be exposed to that
shortage," said B. Dale Magee, president of the Massachusetts Medical Society.

So far, directors of centers south of Boston say they have been able to hire qualified staff
and otherwise meet the demands of new patients - in part by
expansion.

The Manet center recently purchased the building it had been renting in North Quincy and is
eyeing expansion on the site. The center also opened a clinic at
Quincy Medical Center.
[http://www.tnb120.com.cn/ 上海搬家公司],[http://www.168bc.com/ 上海搬场],[http://www.tunfar.com.cn/
物资回收]
[http://www.globalceoforum.com.cn/ 调节阀],[http://www.xcyouth.org.cn/ 上海搬家公司],[http://www.fdcchina.com.cn/
上海搬场公司]
[http://www.hbgm.cn/ 多动症],[http://www.sh-dzbc.com.cn/ 上海搬场],[http://www.isas.com.cn/
大众搬场],[http://www.easyday.cn/ 浦东搬场公司]
[http://www.shyxbc.com.cn/ 上海搬家公司],[http://www.hfire.cn/ 私人侦探],[http://www.168bc.com/price.html
上海搬家公司]
The Greater New Bedford center recently expanded its downtown facility, more than doubling
its square footage. Brockton's new facility will approximately
double its patient capacity.

"We're taking a pretty aggressive stance as we get ready to move into the new building," said
Joss. "It seems right now the demand will be there."

[Beehive Wiki] Update of "Carolina+Coast+" by wikicninfo

2007-09-10T15:32:44Z

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Beehive Wiki" for change notification.

The following page has been changed by wikicninfo:
http://wiki.apache.org/beehive/Carolina+Coast+

New page:
NAGS HEAD, N.C. (AP) — Tropical Storm Gabrielle began to shower North Carolina's Outer Banks
with rain and batter them with high winds Sunday as the storm slogged slowly toward the coast.

Forecasters expected the storm to increase its wind speed slightly — though not to hurricane
levels — before swiping the state's barrier islands on Sunday. After a brief landfall, Gabrielle
was expected to take a sharp turn back into the Atlantic, the National Weather Service said.

"All things considered, it's a pretty weak storm," said Casey Quell, a NWS forecaster in Morehead
City. "More than anything, it will bring some much-needed rain."

The storm carried top sustained winds of about 45 mph as of 5 a.m. Sunday, the National Weather
Service reported. But those winds could strengthen to near 50 mph as Gabrielle nears the coast,
according to the weather service.

Gabrielle's center was located about 50 miles southeast of Cape Lookout and was moving slowly
— about 10 mph — to the north-northwest.

Forecasters issued a tropical storm warning for the North Carolina coastline north of Surf
City through the Outer Banks and to the Virginia border. A tropical storm warning was also
issued northward to Cape Charles Light, Va., along the Atlantic Coast, and a watch remains
in effect for the area extending to New Point Comfort peninsula, along the Chesapeake Bay.

Local officials urged residents and visitors at the vacation hotspot to secure loose items
and to stay indoors as the storm blows through.

Austin Lucas, a manager at Howard's Pub on Ocracoke Island, said workers there tied down furniture
that was on the roof. But beyond that, he said everyone was just waiting to see when the storm
would come.

"We haven't really taken any severe precautions," Lucas said Sunday morning. "Nobody's too
concerned about it."

The National Park Service closed all campgrounds on the Cape Hatteras National Seashore. But
they did not ask or recommend that people leave the islands.

"When people hear about tropical storms, they assume houses are going to fall in the ocean,"
said Margot Jolly, a lifeguard with Nags Heads Ocean Rescue. "They shouldn't overreact like
that. Just relax, stay inside, and have a little hurricane party."

Gabrielle's first showers reached the coastline late Saturday night. Quell said the storm
could produce a storm surge of up to 3 feet, with 1 to 3 inches of rain falling in coastal
areas and up to 5 inches in isolated spots.

"The greatest danger will be flooding in low lying areas and on roads, such as Highway 12
on the Outer Banks," said North Carolina Gov. Mike Easley. "The most deaths during tropical
storms occur when people drive into flood waters and drown. Rip currents will be strong in
the ocean."

Rip currents had already caused problems Saturday. David Baker, the Ocean Rescue director
for the Wrightsville Beach Fire Department about 150 miles south of Nags Head, told The Star-News
of Wilmington that lifeguards rescued about a dozen people from the water because of rip currents.

Gabrielle spun into the storm late Friday after wandering in the Atlantic for several days,
caught along an old frontal boundary that stalled about midway between the Southeast coast
and Bermuda. Forecasters first labeled it a subtropical storm — a hybrid system that takes
power from warm ocean waters but also forms from warm and cold fronts colliding — before
classifying it a tropical system Saturday.

WOW Gold,buy WOW Gold [http://www.isefc.com.cn/ wow gold]
powerleveling [http://www.isefc.com.cn/powerleveling.asp powerleveling]
world of warcraft gold [http://www.isefc.com.cn/ world of warcraft gold]
Burglar alarm [http://www.teamflyelectronic.com/ Burglar alarm]
[http://www.electronic-wire.com/ cables]
[http://www.isefc.com.cn/powerleveling.asp powerleveling]

"We've been asking residents to be prepared for anything," said Chris Baucom, a spokesman
for Dare County Emergency Management. "This storm's track has been kind of unpredictable."

All of North Carolina's counties are facing drought conditions, with 91 percent under a severe
drought. Easley asked Friday that all the state's local governments immediately enact voluntary
or mandatory water restrictions.

svn commit: r573618 - /beehive/trunk/system-controls/src/jdbc/org/apache/beehive/controls/system/jdbc/JdbcControlImpl.java

2007-09-07T15:50:47Z

Author: cschoett
Date: Fri Sep  7 08:50:46 2007
New Revision: 573618

URL: http://svn.apache.org/viewvc?rev=573618&view=rev
Log:
Applied patch provided by Steven Dalton for BEEHIVE-1203.  
DRTs: jdbc-control drts passed


Modified:
    beehive/trunk/system-controls/src/jdbc/org/apache/beehive/controls/system/jdbc/JdbcControlImpl.java

Modified: beehive/trunk/system-controls/src/jdbc/org/apache/beehive/controls/system/jdbc/JdbcControlImpl.java
URL: http://svn.apache.org/viewvc/beehive/trunk/system-controls/src/jdbc/org/apache/beehive/controls/system/jdbc/JdbcControlImpl.java?rev=573618&r1=573617&r2=573618&view=diff
==============================================================================
--- beehive/trunk/system-controls/src/jdbc/org/apache/beehive/controls/system/jdbc/JdbcControlImpl.java
(original)
+++ beehive/trunk/system-controls/src/jdbc/org/apache/beehive/controls/system/jdbc/JdbcControlImpl.java
Fri Sep  7 08:50:46 2007
@@ -309,11 +309,12 @@
             // process returned data
             //
             ResultSet rs = null;
-            int updateCount = ps.getUpdateCount();
+            int updateCount = -1;
 
             if (hasResults) {
                 rs = ps.getResultSet();
             }
+            updateCount = ps.getUpdateCount();
 
             if (sqlStatement.getsGeneratedKeys()) {
                 rs = ps.getGeneratedKeys();

svn commit: r570927 - in /beehive/trunk/netui: src/compiler-core/org/apache/beehive/netui/compiler/ test/src/compilerTests/org/apache/beehive/netui/test/compiler/

2007-08-29T20:41:05Z

Author: crogers
Date: Wed Aug 29 13:41:04 2007
New Revision: 570927

URL: http://svn.apache.org/viewvc?rev=570927&view=rev
Log:
Added option for configuring NetUI compiler to run/skip the check for more than one Controller
class within the Controller's package (BEEHIVE-1204). Also updated the compiler test to explicitly
run the check for another Controller class.

Tests: NetUI BVT (WinXP passed)
CR: cschoett


Modified:
    beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/CompilerUtils.java
    beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerChecker.java
    beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/JpfLanguageConstants.java
    beehive/trunk/netui/test/src/compilerTests/org/apache/beehive/netui/test/compiler/RunApt.java

Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/CompilerUtils.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/CompilerUtils.java?rev=570927&r1=570926&r2=570927&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/CompilerUtils.java
(original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/CompilerUtils.java
Wed Aug 29 13:41:04 2007
@@ -1319,6 +1319,27 @@
         return phase != null && phase.length > 0 ? phase[0] : null;
     }
 
+    /**
+     * Utility method to see if the AP should perform the check for an
+     * overlapping Controller (another Controller in the same package).
+     *
+     * @param env the annotation processing environment
+     * @return true if the AP should perform the check
+     *         for an overlapping Controller.
+     * @throws FatalCompileTimeException if an error occurs getting
+     *         the value of the option
+     */
+    public static boolean isCheckForOverlappingController(CoreAnnotationProcessorEnv env)
+            throws FatalCompileTimeException {
+        // check for command line option
+        String[] option = getOption("-A" + JpfLanguageConstants.ANNOTATION_PROCESSOR_OPTION_OVERLAPPING_CONTROLLER,
false, env);
+        if (option != null && option.length > 0 && "true".equals(option[0]))
{
+            return true;
+        }
+
+        return false;
+    }
+
     private static String[] getOption( String optionName, boolean required, CoreAnnotationProcessorEnv
env )
         throws MissingOptionException
     {

Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerChecker.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerChecker.java?rev=570927&r1=570926&r2=570927&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerChecker.java
(original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerChecker.java
Wed Aug 29 13:41:04 2007
@@ -678,9 +678,15 @@
     protected void checkForOverlappingClasses( ClassDeclaration jpfClass, String baseClass,
String fileExtension,
                                                String errorKey )
     {
+        // By default this method will not go through the expensive of the APT
+        // checking for another Controller in the same package unless option
+        // (JpfLanguageConstants.ANNOTATION_PROCESSOR_OPTION_OVERLAPPING_CONTROLLER)
+        // is set to true. (BEEHIVE-1204)
+        boolean doCheck = false;
         boolean isReconcilePhase = false;
         try {
-            String phase = (String) CompilerUtils.isReconcilePhase(getEnv());
+            doCheck = CompilerUtils.isCheckForOverlappingController(getEnv());
+            String phase = CompilerUtils.isReconcilePhase(getEnv());
             isReconcilePhase = "RECONCILE".equals(phase);
         }
         catch (FatalCompileTimeException e) {
@@ -694,7 +700,7 @@
         // reconcile phase.
         // Custom AP environments that wish to control this should set the
         // "phase" option for the annotation processor to "RECONCILE".
-        if (isReconcilePhase) {
+        if (!doCheck || isReconcilePhase) {
             return;
         }
 

Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/JpfLanguageConstants.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/JpfLanguageConstants.java?rev=570927&r1=570926&r2=570927&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/JpfLanguageConstants.java
(original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/JpfLanguageConstants.java
Wed Aug 29 13:41:04 2007
@@ -27,6 +27,7 @@
     public static final String ANNOTATIONS_CLASSNAME = PAGEFLOW_PACKAGE + ".annotations.Jpf";
 
     public static final String ANNOTATION_PROCESSOR_OPTION_PHASE = "phase";
+    public static final String ANNOTATION_PROCESSOR_OPTION_OVERLAPPING_CONTROLLER = "checkForOverlappingController";
 
     public static final String ACTION_TAG_NAME = "Action";
     public static final String SIMPLE_ACTION_TAG_NAME = "SimpleAction";

Modified: beehive/trunk/netui/test/src/compilerTests/org/apache/beehive/netui/test/compiler/RunApt.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/src/compilerTests/org/apache/beehive/netui/test/compiler/RunApt.java?rev=570927&r1=570926&r2=570927&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/org/apache/beehive/netui/test/compiler/RunApt.java
(original)
+++ beehive/trunk/netui/test/src/compilerTests/org/apache/beehive/netui/test/compiler/RunApt.java
Wed Aug 29 13:41:04 2007
@@ -133,6 +133,9 @@
         aptArgs.add("-sourcepath");
         aptArgs.add(tempDir.getAbsolutePath());
 
+        // Option for the overlapping controller test.
+        aptArgs.add("-AcheckForOverlappingController=true");
+
         aptArgs.add("-Aweb.content.root=" + webappRoot);
 
         // Find all the source files by the specified extentions

svn commit: r559532 - /beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Exceptions.java

2007-07-25T17:40:50Z

Author: crogers
Date: Wed Jul 25 10:40:49 2007
New Revision: 559532

URL: http://svn.apache.org/viewvc?view=rev&rev=559532
Log:
This is a contribution from Drew Varner for BEEHIVE-1202 to fix the documentation in the NetUI
tags Exceptions class. Thanks Drew.


Modified:
    beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Exceptions.java

Modified: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Exceptions.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Exceptions.java?view=diff&rev=559532&r1=559531&r2=559532
==============================================================================
--- beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Exceptions.java (original)
+++ beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Exceptions.java Wed
Jul 25 10:40:49 2007
@@ -32,7 +32,7 @@
 
 /**
  * Renders formatted exception data, as found in the Request with the key:
- * org.apache.struts.action.Action.EXCEPTION_KEY.  Exceptions ignores
its
+ * org.apache.struts.Globals.EXCEPTION_KEY.  Exceptions ignores
its
  * body content.
  * @jsptagref.tagdescription Renders exception messages and stack traces inline on the JSP
page.
  * @example In this sample, the <netui:exceptions> tag will output the exception
title and message,

svn commit: r555078 - /beehive/trunk/system-controls/src/jdbc/org/apache/beehive/controls/system/jdbc/JdbcControlImpl.java

2007-07-10T21:13:30Z

Author: cschoett
Date: Tue Jul 10 14:13:28 2007
New Revision: 555078

URL: http://svn.apache.org/viewvc?view=rev&rev=555078
Log:
Fix for BEEHIVE-1201, applied patch submitted by Steven Dalton which releases prepared statements
when using the JDBC control setConnection API.

DRTs: JDBC control drts passed


Modified:
    beehive/trunk/system-controls/src/jdbc/org/apache/beehive/controls/system/jdbc/JdbcControlImpl.java

Modified: beehive/trunk/system-controls/src/jdbc/org/apache/beehive/controls/system/jdbc/JdbcControlImpl.java
URL: http://svn.apache.org/viewvc/beehive/trunk/system-controls/src/jdbc/org/apache/beehive/controls/system/jdbc/JdbcControlImpl.java?view=diff&rev=555078&r1=555077&r2=555078
==============================================================================
--- beehive/trunk/system-controls/src/jdbc/org/apache/beehive/controls/system/jdbc/JdbcControlImpl.java
(original)
+++ beehive/trunk/system-controls/src/jdbc/org/apache/beehive/controls/system/jdbc/JdbcControlImpl.java
Tue Jul 10 14:13:28 2007
@@ -140,10 +140,7 @@
         if (LOGGER.isDebugEnabled()) {
             LOGGER.debug("Enter: onRelease()");
         }
-
-        if (_connection != null && !_externalConnection) {
-            cleanupConnection();
-        }
+        cleanupConnection();
     }
 
     /**
@@ -411,15 +408,17 @@
         }
         getResources().clear();
 
-        try {
-            _connection.close();
-        }
-        catch (SQLException e) {
-            throw new ControlException("SQL Exception while attempting to close database
connection.", e);
-        }
+        if (_connection != null && !_externalConnection) {
+            try {
+                _connection.close();
+            }
+            catch (SQLException e) {
+                throw new ControlException("SQL Exception while attempting to close database
connection.", e);
+            }
 
-        _connection = null;
-        _externalConnection = false;
+            _connection = null;
+            _externalConnection = false;
+        }
     }
 
     /**

svn commit: r552041 [2/2] - in /beehive/trunk/netui/test/webapps/jsf: testRecorder/config/ testRecorder/tests-jsf-ri/ testRecorder/tests-myfaces/ web/faces/facesSmoke/

2007-06-29T21:49:22Z

Modified: beehive/trunk/netui/test/webapps/jsf/testRecorder/tests-myfaces/UseFormBean.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests-myfaces/UseFormBean.xml?view=diff&rev=552041&r1=552040&r2=552041
==============================================================================
--- beehive/trunk/netui/test/webapps/jsf/testRecorder/tests-myfaces/UseFormBean.xml (original)
+++ beehive/trunk/netui/test/webapps/jsf/testRecorder/tests-myfaces/UseFormBean.xml Fri Jun
29 14:49:19 2007
@@ -101,7 +101,7 @@
                 send bean through attribute
                 

                 send bean through command handler
-            ";
+        String query = name + "=" + value;
+        HttpServletRequest request = ServletFactory.getServletRequest(query);
+        String escapedName = ScopedServletUtils.getScopeIdParamValue(request);
+        assertEquals(escapedName, "%22%3E%3Cscript%3Ealert('gotcha')%3C/script%3E");
+    }
+
     public final class TestRequestWrapper extends HttpServletRequestWrapper
     {
         public TestRequestWrapper(HttpServletRequest delegate) {

Added: beehive/trunk/netui/test/webapps/drt/src/bugs/j1197/Controller.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/src/bugs/j1197/Controller.java?view=auto&rev=545494
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/src/bugs/j1197/Controller.java (added)
+++ beehive/trunk/netui/test/webapps/drt/src/bugs/j1197/Controller.java Fri Jun  8 05:42:28
2007
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 bugs.j1197;
+
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
+
+@Jpf.Controller()
+public class Controller extends PageFlowController
+{
+    private String _scopeId;
+    public String getScopeId() {
+        return _scopeId;
+    }
+    public void setScopeId(String id) {
+        _scopeId = id;
+    }
+
+    @Jpf.Action(
+        forwards={
+            @Jpf.Forward(name = "success", path = "index.jsp")
+        }
+    )
+    protected Forward begin() throws Throwable {
+        Forward forward = new Forward("success");
+        setScopeId(ScopedServletUtils.getScopeIdParamValue(getRequest()));
+        return forward;
+    }
+
+    @Jpf.Action(
+        forwards={
+            @Jpf.Forward(name = "success", path = "index.jsp")
+        }
+    )
+    protected Forward submit(MyBean bean) throws Throwable {
+        Forward forward = new Forward("success");
+        setScopeId(ScopedServletUtils.getScopeIdParamValue(getRequest()));
+        return forward;
+    }
+
+    @Jpf.FormBean
+    public static class MyBean implements java.io.Serializable {
+        private String _name;
+        public String getName() {
+            return _name;
+        }
+        public void setName(String name) {
+            _name = name;
+        }
+    }
+}

Propchange: beehive/trunk/netui/test/webapps/drt/src/bugs/j1197/Controller.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml?view=diff&rev=545494&r1=545493&r2=545494
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml (original)
+++ beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml Fri Jun
 8 05:42:28 2007
@@ -5293,6 +5293,16 @@
          
       
       
+         J1197
+         Filter script from jpfScopeID request param (BEEHIVE-1197).
+         coreWeb
+         
+            bvt
+            bvt.struts11
+            jiraBugs
+         
+      
+      
          JpfScopedFormsTest49
          JpfScopedFormsTest49
          coreWeb

Added: beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J1197.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J1197.xml?view=auto&rev=545494
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J1197.xml (added)
+++ beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J1197.xml Fri Jun  8 05:42:28
2007
@@ -0,0 +1,343 @@
+
+
+J1197
+crogers
+07 Jun 2007, 04:51:25.991 PM MDT
+Filter script from jpfScopeID request param (BEEHIVE-1197).
+
+
+1
+
+HTTP
+1.1
+localhost
+8080
+/coreWeb/bugs/j1197/begin.do
+GET
+
+
+
+
+JSESSIONID
+420651557751ADFDCF80A37B291B09EF
+
+
+
+
+---------------
+------------
+
+
+accept
+text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
+
+
+accept-charset
+UTF-8,*
+
+
+accept-encoding
+gzip, deflate
+
+
+accept-language
+en-us,en;q=0.5
+
+
+connection
+keep-alive
+
+
+cookie
+JSESSIONID=420651557751ADFDCF80A37B291B09EF
+
+
+host
+localhost:8080
+
+
+keep-alive
+300
+
+
+user-agent
+Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.4) Gecko/20070515 Firefox/2.0.0.4
+
+
+
+
+200
+
+
+
+
+
+
+    Test for BEEHIVE-1197
+
+
+    Beehive NetUI JavaServer Page - /coreWeb/bugs/j1197/index.jsp
+
+    Test for BEEHIVE-1197
+    
+        Add the following to either the Controller.jpf, begin.do,
+        or submit.do URLs
+    
+    ?jpfScopeID=%22%3E%3Cscript%3Ealert('gotcha')%3C/script%3E
+
+    
+        
+            
+                
+                
+            
+         Name: 
+        
+    
+
+    Begin
+
+    

+    Results: filtered jpfScopeID param =
+    
+
+
+]]>
+
+
+
+
+2
+
+HTTP
+1.1
+localhost
+8080
+/coreWeb/bugs/j1197/begin.do
+GET
+
+
+jpfScopeID
+%22%3E%3Cscript%3Ealert('gotcha')%3C/script%3E
+
+
+
+
+JSESSIONID
+420651557751ADFDCF80A37B291B09EF
+
+
+
+
+---------------
+------------
+
+
+accept
+text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
+
+
+accept-charset
+UTF-8,*
+
+
+accept-encoding
+gzip, deflate
+
+
+accept-language
+en-us,en;q=0.5
+
+
+connection
+keep-alive
+
+
+cookie
+JSESSIONID=420651557751ADFDCF80A37B291B09EF
+
+
+host
+localhost:8080
+
+
+keep-alive
+300
+
+
+user-agent
+Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.4) Gecko/20070515 Firefox/2.0.0.4
+
+
+
+
+200
+
+
+
+
+
+
+    Test for BEEHIVE-1197
+
+
+    Beehive NetUI JavaServer Page - /coreWeb/bugs/j1197/index.jsp
+
+    Test for BEEHIVE-1197
+    
+        Add the following to either the Controller.jpf, begin.do,
+        or submit.do URLs
+    
+    ?jpfScopeID=%22%3E%3Cscript%3Ealert('gotcha')%3C/script%3E
+
+    
+
+        
+            
+                
+                
+            
+         Name: 
+        
+    
+
+    Begin
+
+    

+    Results: filtered jpfScopeID param =
+    %22%3E%3Cscript%3Ealert('gotcha')%3C/script%3E
+
+
+]]>
+
+
+
+
+3
+
+HTTP
+1.1
+localhost
+8080
+/coreWeb/bugs/j1197/submit.do
+POST
+
+
+jpfScopeID
+%22%3E%3Cscript%3Ealert('gotcha')%3C/script%3E
+
+
+{actionForm.name}
+test
+
+
+
+
+JSESSIONID
+420651557751ADFDCF80A37B291B09EF
+
+
+
+
+-------
+----:-----------:------------------------------------------------------------------------------------------
+
+
+---------------
+------------
+
+
+accept
+text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
+
+
+accept-charset
+UTF-8,*
+
+
+accept-encoding
+gzip, deflate
+
+
+accept-language
+en-us,en;q=0.5
+
+
+connection
+keep-alive
+
+
+content-length
+106
+
+
+content-type
+application/x-www-form-urlencoded
+
+
+cookie
+JSESSIONID=420651557751ADFDCF80A37B291B09EF
+
+
+host
+localhost:8080
+
+
+keep-alive
+300
+
+
+user-agent
+Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.4) Gecko/20070515 Firefox/2.0.0.4
+
+
+
+
+200
+
+
+
+
+
+
+    Test for BEEHIVE-1197
+
+
+    Beehive NetUI JavaServer Page - /coreWeb/bugs/j1197/index.jsp
+
+    Test for BEEHIVE-1197
+    
+        Add the following to either the Controller.jpf, begin.do,
+        or submit.do URLs
+    
+    ?jpfScopeID=%22%3E%3Cscript%3Ealert('gotcha')%3C/script%3E
+
+    
+
+        
+            
+                
+                
+            
+         Name: 
+        
+    
+
+    Begin
+
+    

+    Results: filtered jpfScopeID param =
+    %22%3E%3Cscript%3Ealert('gotcha')%3C/script%3E
+
+
+]]>
+
+
+
+
+07 Jun 2007, 04:52:20.370 PM MDT
+3
+

Propchange: beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J1197.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: beehive/trunk/netui/test/webapps/drt/web/bugs/j1197/index.jsp
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/web/bugs/j1197/index.jsp?view=auto&rev=545494
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j1197/index.jsp (added)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j1197/index.jsp Fri Jun  8 05:42:28 2007
@@ -0,0 +1,51 @@
+<%--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You 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:$
+--%>
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
+
+
+    Test for BEEHIVE-1197
+
+
+    Beehive NetUI JavaServer Page - ${pageContext.request.requestURI}
+
+    Test for BEEHIVE-1197
+    
+        Add the following to either the Controller.jpf, begin.do,
+        or submit.do URLs
+    
+    ?jpfScopeID=%22%3E%3Cscript%3Ealert('gotcha')%3C/script%3E
+
+    
+        
+            
+                
+                
+            
+         Name: 
+        
+    
+
+    Begin
+
+    

+    Results: filtered jpfScopeID param =
+    
+
+

Propchange: beehive/trunk/netui/test/webapps/drt/web/bugs/j1197/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

svn commit: r544871 - in /beehive/trunk/controls/test: ./ src/junit-controls/org/apache/beehive/controls/test/controls/bindings/

2007-06-06T15:56:47Z

Author: cschoett
Date: Wed Jun  6 08:56:46 2007
New Revision: 544871

URL: http://svn.apache.org/viewvc?view=rev&rev=544871
Log:
Added new controls drt to test the use of the controlbindings.properties to override an control
implemenation at runtime.

Added:
    beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/bindings/
    beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/bindings/HelloCtrl.java
  (with props)
    beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/bindings/HelloCtrlImpl.java
  (with props)
    beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/bindings/HelloCtrlImpl2.java
  (with props)
    beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/bindings/controlbindings.properties
  (with props)
Modified:
    beehive/trunk/controls/test/build.xml

Modified: beehive/trunk/controls/test/build.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/test/build.xml?view=diff&rev=544871&r1=544870&r2=544871
==============================================================================
--- beehive/trunk/controls/test/build.xml (original)
+++ beehive/trunk/controls/test/build.xml Wed Jun  6 08:56:46 2007
@@ -155,6 +155,9 @@
             
         
 
+        
+
         

Added: beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/bindings/HelloCtrl.java
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/bindings/HelloCtrl.java?view=auto&rev=544871
==============================================================================
--- beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/bindings/HelloCtrl.java
(added)
+++ beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/bindings/HelloCtrl.java
Wed Jun  6 08:56:46 2007
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+package org.apache.beehive.controls.test.controls.bindings;
+
+import org.apache.beehive.controls.api.bean.ControlInterface;
+
+/**
+ * Control interface used for testing the controlbindings.properties file
+ * use for changing a control implementation at runtime.
+ */
+@ControlInterface
+public interface HelloCtrl {
+
+    public String echo(String message);
+}

Propchange: beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/bindings/HelloCtrl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/bindings/HelloCtrlImpl.java
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/bindings/HelloCtrlImpl.java?view=auto&rev=544871
==============================================================================
--- beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/bindings/HelloCtrlImpl.java
(added)
+++ beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/bindings/HelloCtrlImpl.java
Wed Jun  6 08:56:46 2007
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+package org.apache.beehive.controls.test.controls.bindings;
+
+import org.apache.beehive.controls.api.bean.ControlImplementation;
+
+/**
+ * Default control impl used if not changed in controlbingings.properties
+ */
+@ControlImplementation(isTransient = true)
+public class HelloCtrlImpl implements HelloCtrl {
+
+    public String echo(String message) {
+        return "HelloCtrlImpl: " + message;
+    }
+}

Propchange: beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/bindings/HelloCtrlImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/bindings/HelloCtrlImpl2.java
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/bindings/HelloCtrlImpl2.java?view=auto&rev=544871
==============================================================================
--- beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/bindings/HelloCtrlImpl2.java
(added)
+++ beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/bindings/HelloCtrlImpl2.java
Wed Jun  6 08:56:46 2007
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+package org.apache.beehive.controls.test.controls.bindings;
+
+import org.apache.beehive.controls.api.bean.ControlImplementation;
+
+/**
+ * This is the control implementation which should be used at runtime
+ * since it is the one specified in controlbindings.properties
+ */
+@ControlImplementation(isTransient = true)
+public class HelloCtrlImpl2 implements HelloCtrl {
+
+    public String echo(String message) {
+        return "HelloCtrlImpl2: " + message;
+    }
+}

Propchange: beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/bindings/HelloCtrlImpl2.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/bindings/controlbindings.properties
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/bindings/controlbindings.properties?view=auto&rev=544871
==============================================================================
--- beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/bindings/controlbindings.properties
(added)
+++ beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/bindings/controlbindings.properties
Wed Jun  6 08:56:46 2007
@@ -0,0 +1 @@
+org.apache.beehive.controls.test.controls.bindings.HelloCtrlBean=org.apache.beehive.controls.test.controls.bindings.HelloCtrlImpl2
\ No newline at end of file

Propchange: beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/bindings/controlbindings.properties
------------------------------------------------------------------------------
    svn:eol-style = native