You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ri...@apache.org on 2005/08/09 07:19:58 UTC
svn commit: r230971 - in /beehive/trunk/netui/test/webapps/urlTemplates:
testRecorder/config/ testRecorder/tests/ urlTemplates/WEB-INF/
urlTemplates/WEB-INF/src/formatter/ urlTemplates/formatter/
urlTemplates/index/ urlTemplates/testUrlTemplates/
Author: rich
Date: Mon Aug 8 22:19:16 2005
New Revision: 230971
URL: http://svn.apache.org/viewcvs?rev=230971&view=rev
Log:
This is a contribution from Carlin Rogers to address http://issues.apache.org/jira/browse/BEEHIVE-864 : Add a test for registering a request based TemplatedURLFormatter with the URLRewriterService API
tests: bvt in netui (WinXP)
BB: self (linux)
Added:
beehive/trunk/netui/test/webapps/urlTemplates/testRecorder/tests/Formatter.xml (with props)
beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/src/formatter/
beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/src/formatter/Formatter.java (with props)
beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/src/formatter/FormatterFilter.java (with props)
beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/formatter/
beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/formatter/Controller.jpf (with props)
beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/formatter/image.gif (with props)
beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/formatter/index.jsp (with props)
beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/formatter/secure.jsp (with props)
beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/formatter/secureImage.gif (with props)
Modified:
beehive/trunk/netui/test/webapps/urlTemplates/testRecorder/config/testRecorder-tests.xml
beehive/trunk/netui/test/webapps/urlTemplates/testRecorder/tests/UrlTemplates.xml
beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/web.xml
beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/index/Controller.jpf
beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/testUrlTemplates/index.jsp
beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/testUrlTemplates/secure.jsp
Modified: beehive/trunk/netui/test/webapps/urlTemplates/testRecorder/config/testRecorder-tests.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/urlTemplates/testRecorder/config/testRecorder-tests.xml?rev=230971&r1=230970&r2=230971&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/urlTemplates/testRecorder/config/testRecorder-tests.xml (original)
+++ beehive/trunk/netui/test/webapps/urlTemplates/testRecorder/config/testRecorder-tests.xml Mon Aug 8 22:19:16 2005
@@ -12,6 +12,14 @@
</categories>
<tests>
<test>
+ <name>Formatter</name>
+ <description>Test the URLRewriterService APi and register a custom TemplatedURLFormatter.</description>
+ <webapp>urlTemplates</webapp>
+ <categories>
+ <category>bvt</category>
+ </categories>
+ </test>
+ <test>
<name>UrlTemplates</name>
<description>Test URL templates using /WEB-INF/url-template-config.xml</description>
<webapp>urlTemplates</webapp>
Added: beehive/trunk/netui/test/webapps/urlTemplates/testRecorder/tests/Formatter.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/urlTemplates/testRecorder/tests/Formatter.xml?rev=230971&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/urlTemplates/testRecorder/tests/Formatter.xml (added)
+++ beehive/trunk/netui/test/webapps/urlTemplates/testRecorder/tests/Formatter.xml Mon Aug 8 22:19:16 2005
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session">
+ <ses:sessionName>Formatter</ses:sessionName>
+ <ses:tester>crogers</ses:tester>
+ <ses:startDate>26 Jul 2005, 04:38:08.572 PM MDT</ses:startDate>
+ <ses:description>Test the URLRewriterService APi and register a custom TemplatedURLFormatter.</ses:description>
+ <ses:tests>
+ <ses:test>
+ <ses:testNumber>1</ses:testNumber>
+ <ses:request>
+ <ses:protocol>HTTP</ses:protocol>
+ <ses:protocolVersion>1.1</ses:protocolVersion>
+ <ses:host>localhost</ses:host>
+ <ses:port>8080</ses:port>
+ <ses:uri>/urlTemplates/formatter/</ses:uri>
+ <ses:method>GET</ses:method>
+ <ses:parameters/>
+ <ses:cookies>
+ <ses:cookie>
+ <ses:name>JSESSIONID</ses:name>
+ <ses:value>415AFF23D933886F0264F907B1FB0948</ses:value>
+ </ses:cookie>
+ <ses:cookie>
+ <ses:name>nde-textsize</ses:name>
+ <ses:value>16px</ses:value>
+ </ses:cookie>
+ </ses:cookies>
+ <ses:headers>
+ <ses:header>
+ <ses:name>accept</ses:name>
+ <ses:value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>accept-charset</ses:name>
+ <ses:value>UTF-8,*</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>accept-encoding</ses:name>
+ <ses:value>gzip,deflate</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>accept-language</ses:name>
+ <ses:value>en-us,en;q=0.5</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>connection</ses:name>
+ <ses:value>keep-alive</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>cookie</ses:name>
+ <ses:value>JSESSIONID=415AFF23D933886F0264F907B1FB0948; nde-textsize=16px</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>host</ses:name>
+ <ses:value>localhost:8080</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>keep-alive</ses:name>
+ <ses:value>300</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>user-agent</ses:name>
+ <ses:value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.8) Gecko/20050511 Firefox/1.0.4</ses:value>
+ </ses:header>
+ </ses:headers>
+ </ses:request>
+ <ses:response>
+ <ses:statusCode>200</ses:statusCode>
+ <ses:reason/>
+ <ses:responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+>
+<html lang="en">
+
+ <head>
+ <title>URL Templates Test</title>
+ </head>
+ <body>
+ <a href="http://beehive.apache.org:8080/prefix/urlTemplates/formatter/begin.do?URLTEMPLATE=action&"><i>begin action</i></a><br>
+ <a href="https://beehive.apache.org:8443/prefix/urlTemplates/formatter/secure.do?URLTEMPLATE=secure-action&"><i>secure action</i></a><br>
+ <a href="http://beehive.apache.org:8080/prefix/urlTemplates/formatter/unsecure.do?URLTEMPLATE=action&"><i>unsecure action</i></a><br>
+ <a href="http://beehive.apache.org:8080/prefix/urlTemplates/formatter/index.jsp?URLTEMPLATE=action&">index.jsp</a><br>
+ <a href="https://beehive.apache.org:8443/prefix/urlTemplates/formatter/secure.jsp?URLTEMPLATE=secure-action&">secure.jsp</a><br>
+ <a href="http://beehive.apache.org:8080/prefix/urlTemplates/formatter/index.jsp?URLTEMPLATE=action&foo=bar">/urlTemplates/formatter/index.jsp?foo=bar</a><br>
+ <a href="https://beehive.apache.org:8443/prefix/urlTemplates/formatter/secure.jsp?URLTEMPLATE=secure-action&foo=bar">/urlTemplates/formatter/secure.jsp?foo=bar</a><br>
+ <a href="http://apache.org/?foo=bar">http://apache.org/?foo=bar</a><br>
+ image.gif: <img src="http://localhost:8080/urlTemplates/formatter/image.gif?URLTEMPLATE=resource&"><br>
+ /urlTemplates/formatter/image.gif: <img src="http://localhost:8080/urlTemplates/formatter/image.gif?URLTEMPLATE=resource&"><br>
+ secureImage.gif: <img src="https://localhost:8443/urlTemplates/formatter/secureImage.gif?URLTEMPLATE=secure-resource&"><br>
+ /urlTemplates/formatter/secureImage.gif: <img src="https://localhost:8443/urlTemplates/formatter/secureImage.gif?URLTEMPLATE=secure-resource&"><br>
+ </body>
+
+</html>]]></ses:responseBody>
+ </ses:response>
+ </ses:test>
+ </ses:tests>
+ <ses:endDate>26 Jul 2005, 04:38:19.618 PM MDT</ses:endDate>
+ <ses:testCount>1</ses:testCount>
+</ses:recorderSession>
\ No newline at end of file
Propchange: beehive/trunk/netui/test/webapps/urlTemplates/testRecorder/tests/Formatter.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/test/webapps/urlTemplates/testRecorder/tests/UrlTemplates.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/urlTemplates/testRecorder/tests/UrlTemplates.xml?rev=230971&r1=230970&r2=230971&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/urlTemplates/testRecorder/tests/UrlTemplates.xml (original)
+++ beehive/trunk/netui/test/webapps/urlTemplates/testRecorder/tests/UrlTemplates.xml Mon Aug 8 22:19:16 2005
@@ -97,7 +97,7 @@
<a href="https://@NON_UNIQUE_HOST@:8443/urlTemplates/testUrlTemplates/secure.jsp?URLTEMPLATE=secure-action&">secure.jsp</a><br>
<a href="http://@NON_UNIQUE_HOST@:@NON_UNIQUE_PORT@/urlTemplates/testUrlTemplates/index.jsp?URLTEMPLATE=action&foo=bar">/urlTemplates/testUrlTemplates/index.jsp?foo=bar</a><br>
<a href="https://@NON_UNIQUE_HOST@:8443/urlTemplates/testUrlTemplates/secure.jsp?URLTEMPLATE=secure-action&foo=bar">/urlTemplates/testUrlTemplates/secure.jsp?foo=bar</a><br>
- <a href="http://www.bea.com?foo=bar">http://www.bea.com?foo=bar</a><br>
+ <a href="http://apache.org/?foo=bar">http://apache.org/?foo=bar</a><br>
image.gif: <img src="http://@NON_UNIQUE_HOST@:@NON_UNIQUE_PORT@/urlTemplates/testUrlTemplates/image.gif?URLTEMPLATE=resource&"><br>
/urlTemplates/testUrlTemplates/image.gif: <img src="http://@NON_UNIQUE_HOST@:@NON_UNIQUE_PORT@/urlTemplates/testUrlTemplates/image.gif?URLTEMPLATE=resource&"><br>
secureImage.gif: <img src="https://@NON_UNIQUE_HOST@:8443/urlTemplates/testUrlTemplates/secureImage.gif?URLTEMPLATE=secure-resource&"><br>
Added: beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/src/formatter/Formatter.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/src/formatter/Formatter.java?rev=230971&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/src/formatter/Formatter.java (added)
+++ beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/src/formatter/Formatter.java Mon Aug 8 22:19:16 2005
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package formatter;
+
+import org.apache.beehive.netui.core.urls.MutableURI;
+import org.apache.beehive.netui.core.urls.TemplatedURLFormatter;
+import org.apache.beehive.netui.core.urls.URIContext;
+import org.apache.beehive.netui.core.urltemplates.URLTemplate;
+import org.apache.beehive.netui.core.urltemplates.URLTemplatesFactory;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletRequest;
+
+
+/**
+ * Test implementation of TemplatedURLFormatter for formatting URLs
+ * based on templates from a URL template config file.
+ */
+public class Formatter extends TemplatedURLFormatter
+{
+ /**
+ * Format the given URL using a URL template, if defined in a URL
+ * template config file.
+ *
+ * @param servletContext the current ServletContext.
+ * @param request the current ServletRequest.
+ * @param uri the MutableURI to be formatted into a String.
+ * @param key key for the URL template type to use for formatting the URI
+ * @param uriContext data required to write out the string form.
+ * @return the URL as a <code>String</code>
+ */
+ public String getTemplatedURL( ServletContext servletContext,
+ ServletRequest request, MutableURI uri,
+ String key, URIContext uriContext ) {
+ // Look for the template config and get the right template.
+ // If it is found, apply the value to the template.
+ String result = null;
+ URLTemplate template = null;
+ URLTemplatesFactory factory = URLTemplatesFactory.getURLTemplatesFactory( servletContext );
+
+ if ( factory != null ) {
+ String templateName = factory.getTemplateNameByRef( DEFAULT_TEMPLATE_REF, key );
+
+ if ( templateName != null ) {
+ template = factory.getURLTemplate( templateName );
+ }
+ }
+
+ if ( template != null ) {
+ result = formatURIWithTemplate( request, uri, uriContext, template, key );
+ } else {
+ // no template found, just return the uri as a String...
+ result = uri.getURIString( uriContext );
+ }
+
+ return result;
+ }
+
+ private String formatURIWithTemplate( ServletRequest request, MutableURI uri,
+ URIContext uriContext, URLTemplate template,
+ String key ) {
+ String scheme = uri.getScheme();
+ String host = uri.getHost();
+ int port = uri.getPort();
+ String path = uri.getPath();
+
+ if ( scheme == null || scheme.length() == 0 ) { scheme = request.getScheme(); }
+
+ if ( host == null || host.length() == 0 ) { host = request.getServerName(); }
+
+ if ( port < 0 ) { port = request.getServerPort(); }
+
+ // for this test, override host and path for actions...
+ if ( key.equals( URLTemplatesFactory.ACTION_TEMPLATE )
+ || key.equals( URLTemplatesFactory.SECURE_ACTION_TEMPLATE ) ) {
+ host = "beehive.apache.org";
+ path = "/prefix" + path;
+ }
+
+ template.substitute( TemplatedURLFormatter.SCHEME_TOKEN, scheme );
+ template.substitute( TemplatedURLFormatter.DOMAIN_TOKEN, host );
+ template.substitute( TemplatedURLFormatter.PORT_TOKEN, port );
+ template.substitute( TemplatedURLFormatter.PATH_TOKEN, path );
+
+ String query = null;
+ query = uri.getQuery( uriContext );
+
+ if ( query == null ) {
+ query = "";
+ }
+
+ template.substitute( TemplatedURLFormatter.QUERY_STRING_TOKEN, query );
+
+ return template.format();
+ }
+}
Propchange: beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/src/formatter/Formatter.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/src/formatter/FormatterFilter.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/src/formatter/FormatterFilter.java?rev=230971&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/src/formatter/FormatterFilter.java (added)
+++ beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/src/formatter/FormatterFilter.java Mon Aug 8 22:19:16 2005
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package formatter;
+
+import org.apache.beehive.netui.core.urls.TemplatedURLFormatter;
+import org.apache.beehive.netui.core.urls.URLRewriterService;
+
+import java.io.IOException;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+// Servlet Filter used with the formatter test
+public class FormatterFilter implements Filter {
+
+ public void doFilter(ServletRequest request,
+ ServletResponse response,
+ FilterChain chain)
+ throws IOException, ServletException {
+
+ // create and register a custom TemplatedURLFormatter
+ TemplatedURLFormatter formatter = new Formatter();
+ URLRewriterService.registerTemplatedURLFormatter( request, formatter );
+
+ // pass the request/response on
+ chain.doFilter(request, response);
+
+ // unregister the custom TemplatedURLFormatter
+ URLRewriterService.unregisterTemplatedURLFormatter( request );
+ }
+
+ public void init(FilterConfig filterConfig) {
+ }
+
+ public void destroy() {
+ }
+}
Propchange: beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/src/formatter/FormatterFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/web.xml?rev=230971&r1=230970&r2=230971&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/web.xml (original)
+++ beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/web.xml Mon Aug 8 22:19:16 2005
@@ -16,6 +16,12 @@
</init-param>
</filter>
+ <!-- Filter for the URLTemplatedFormatter test -->
+ <filter>
+ <filter-name>FormatterFilter</filter-name>
+ <filter-class>formatter.FormatterFilter</filter-class>
+ </filter>
+
<filter>
<filter-name>PageFlowJspFilter</filter-name>
<filter-class>org.apache.beehive.netui.pageflow.PageFlowJspFilter</filter-class>
@@ -29,6 +35,11 @@
<filter-mapping>
<filter-name>TestRecorderFilter</filter-name>
<url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>FormatterFilter</filter-name>
+ <url-pattern>/formatter/index.jsp</url-pattern>
</filter-mapping>
<filter-mapping>
Added: beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/formatter/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/formatter/Controller.jpf?rev=230971&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/formatter/Controller.jpf (added)
+++ beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/formatter/Controller.jpf Mon Aug 8 22:19:16 2005
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package formatter;
+
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+
+@Jpf.Controller(forwards = { @Jpf.Forward(name = "index", path = "index.jsp") })
+public class Controller extends PageFlowController
+{
+ @Jpf.Action()
+ public Forward begin()
+ {
+ return new Forward( "index" );
+ }
+
+ @Jpf.Action()
+ public Forward secure()
+ {
+ return new Forward( "index" );
+ }
+
+ @Jpf.Action()
+ public Forward unsecure()
+ {
+ return new Forward( "index" );
+ }
+}
Propchange: beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/formatter/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/formatter/image.gif
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/formatter/image.gif?rev=230971&view=auto
==============================================================================
Binary file - no diff available.
Propchange: beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/formatter/image.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/formatter/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/formatter/index.jsp?rev=230971&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/formatter/index.jsp (added)
+++ beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/formatter/index.jsp Mon Aug 8 22:19:16 2005
@@ -0,0 +1,24 @@
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
+<netui:html>
+ <head>
+ <title>URL Templates Test</title>
+ </head>
+ <body>
+ <netui:anchor action="begin"><i>begin action</i></netui:anchor><br>
+ <netui:anchor action="secure"><i>secure action</i></netui:anchor><br>
+ <netui:anchor action="unsecure"><i>unsecure action</i></netui:anchor><br>
+ <netui:anchor href="index.jsp">index.jsp</netui:anchor><br>
+ <netui:anchor href="secure.jsp">secure.jsp</netui:anchor><br>
+ <netui:anchor href="/urlTemplates/formatter/index.jsp?foo=bar">/urlTemplates/formatter/index.jsp?foo=bar</netui:anchor><br>
+ <netui:anchor href="/urlTemplates/formatter/secure.jsp?foo=bar">/urlTemplates/formatter/secure.jsp?foo=bar</netui:anchor><br>
+ <netui:anchor href="http://apache.org/">
+ http://apache.org/?foo=bar
+ <netui:parameter name="foo" value="bar"/>
+ </netui:anchor><br>
+ image.gif: <netui:image src="image.gif"/><br>
+ /urlTemplates/formatter/image.gif: <netui:image src="/urlTemplates/formatter/image.gif"/><br>
+ secureImage.gif: <netui:image src="secureImage.gif"/><br>
+ /urlTemplates/formatter/secureImage.gif: <netui:image src="/urlTemplates/formatter/secureImage.gif"/><br>
+ </body>
+</netui:html>
Propchange: beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/formatter/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/formatter/secure.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/formatter/secure.jsp?rev=230971&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/formatter/secure.jsp (added)
+++ beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/formatter/secure.jsp Mon Aug 8 22:19:16 2005
@@ -0,0 +1,10 @@
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
+<netui:html>
+ <head>
+ <title>URL Templates Test</title>
+ </head>
+ <body>
+ <netui:anchor action="unsecure">go back</netui:anchor><br>
+ </body>
+</netui:html>
Propchange: beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/formatter/secure.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/formatter/secureImage.gif
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/formatter/secureImage.gif?rev=230971&view=auto
==============================================================================
Binary file - no diff available.
Propchange: beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/formatter/secureImage.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/index/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/index/Controller.jpf?rev=230971&r1=230970&r2=230971&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/index/Controller.jpf (original)
+++ beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/index/Controller.jpf Mon Aug 8 22:19:16 2005
@@ -43,7 +43,7 @@
private final String TESTS = " Tests";
transient private TestDefinitions _td;
transient private Category[] _cats;
- private String _cat = "drt";
+ private String _cat = "bvt";
private boolean _rowOn = false;
Modified: beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/testUrlTemplates/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/testUrlTemplates/index.jsp?rev=230971&r1=230970&r2=230971&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/testUrlTemplates/index.jsp (original)
+++ beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/testUrlTemplates/index.jsp Mon Aug 8 22:19:16 2005
@@ -12,8 +12,8 @@
<netui:anchor href="secure.jsp">secure.jsp</netui:anchor><br>
<netui:anchor href="/urlTemplates/testUrlTemplates/index.jsp?foo=bar">/urlTemplates/testUrlTemplates/index.jsp?foo=bar</netui:anchor><br>
<netui:anchor href="/urlTemplates/testUrlTemplates/secure.jsp?foo=bar">/urlTemplates/testUrlTemplates/secure.jsp?foo=bar</netui:anchor><br>
- <netui:anchor href="http://www.bea.com">
- http://www.bea.com?foo=bar
+ <netui:anchor href="http://apache.org/">
+ http://apache.org/?foo=bar
<netui:parameter name="foo" value="bar"/>
</netui:anchor><br>
image.gif: <netui:image src="image.gif"/><br>
Modified: beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/testUrlTemplates/secure.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/testUrlTemplates/secure.jsp?rev=230971&r1=230970&r2=230971&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/testUrlTemplates/secure.jsp (original)
+++ beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/testUrlTemplates/secure.jsp Mon Aug 8 22:19:16 2005
@@ -1,8 +1,5 @@
-<!--Generated by WebLogic Workshop-->
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
<netui:html>
<head>
<title>URL Templates Test</title>