Re: svn commit: r160923 - in incubator/beehive/trunk/netui: src/util/org/apache/beehive/netui/core/urls/DefaultTemplatedURLFormatter.java test/webapps/drt/coreWeb/WEB-INF/beehive-netui-config.xml

[Carlin Rogers]

Yes, but I figured that we have this other check for doc type of
of the document using the NetUI tags. The TemplatedURLFormatter
is the last step in the rewriting of URLs for our tags. That's
how I saw this as tag related. I could put this in the
PageFlowUtils class to expose it to other non tag users.

My real concern was trying to pull together the logic to check
for XHTML as well as the configuration setting all in one place
and to make sure that another TemplatedURLFormatter implementation
didn't have to worry about making the configuration check.
Also, in this way, the result of the configuration check will
also be passed to an actual template if it exists.

Thanks again.

Daryl Olander wrote:

I'm not sure I understand.  This seems like it's actually not related
to tags at all.  I would have thought that by default we write out
"&" and that it's a URL thing.

On 4/14/05, Carlin Rogers <[EMAIL PROTECTED]> wrote:

Daryl,

I'm making my changes for JIRA 509 and thought that I'd make some
additional changes to what you've done for the encoding of '&' as
the "&" entity inside of a URL query.

I thought I'd move the testing for the existence and value of the
configuration in the beehive-netui-config file out of the
DefaultTemplatedURLFormatter and place it at the same point in
the tag process that we check the doc type to see if it's XML.
I have a method that I'll add to the PageFlowTagUtils that
will check for isXHTML and if it's an HTML doc type, then check
for the existence and value of the configuration.

This would place the common logic all in one place for the tags.
Also, if another implementor registers their own
TemplatedURLFormatter, we'll still be checking the
configuration and passing in our boolean setting. They
won't have to do the check.

What do you think?

Thanks for the help.
Carlin

[EMAIL PROTECTED] wrote:

Author: dolander
Date: Mon Apr 11 09:43:21 2005
New Revision: 160923

URL: http://svn.apache.org/viewcvs?view=rev&rev=160923
Log:
Make entity encoding in a URL the default.  The result is that for
both HTML and XHTML the '&' will be encoded as "&" inside of a URL.

There is a configuration in the beehive-netui-config file that will turn
the use the '&' character.

At the moment, the BVT/DRT webapp uses the '&' character instead of the default.

Modified:
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/DefaultTemplatedURLFormatter.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/beehive-netui-config.xml

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/DefaultTemplatedURLFormatter.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/DefaultTemplatedURLFormatter.java?view=diff&r1=160922&r2=160923
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/DefaultTemplatedURLFormatter.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/DefaultTemplatedURLFormatter.java
 Mon Apr 11 09:43:21 2005
@@ -19,6 +19,8 @@

import org.apache.beehive.netui.core.urltemplates.URLTemplate;
import org.apache.beehive.netui.core.urltemplates.URLTemplateDescriptor;
+import org.apache.beehive.netui.util.config.bean.UrlConfig;
+import org.apache.beehive.netui.util.config.ConfigUtil;

import javax.servlet.ServletRequest;

@@ -52,7 +54,13 @@
            }
            else
            {
-                result = uri.getURIString();
+                UrlConfig urlConfig = ConfigUtil.getConfig().getUrlConfig();
+                if (urlConfig == null) {
+                    result = uri.getURIStringForXML();
+                }
+                else {
+                    result = (urlConfig.getHtmlAmpEntity()) ? 
uri.getURIStringForXML() : uri.getURIString();
+                }
            }
        }

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/beehive-netui-config.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/beehive-netui-config.xml?view=diff&r1=160922&r2=160923
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/beehive-netui-config.xml
 (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/beehive-netui-config.xml
 Mon Apr 11 09:43:21 2005
@@ -146,6 +146,10 @@
       <id-javascript>legacy</id-javascript>
    </jsp-tag-config>

+    <url-config>
+     <html-amp-entity>false</html-amp-entity>
+    </url-config>
+
    <iterator-factories>
    </iterator-factories>