Author: rich
Date: Tue Jan 25 23:25:58 2005
New Revision: 126479
URL: http://svn.apache.org/viewcvs?view=rev&rev=126479
Log:
Got rendering of secure links based on security-constraints working under
Tomcat, and got login and security DRTs running under a new Tomcat DRT app.
More Tomcat/NetUI setup information is coming soon...
DRT/BVT: netui (WinXP)
BB: self (linux)
Added:
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/SecureLinks.xml
(contents, props changed)
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/Security.xml
- copied, changed from r126460,
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/Security.xml
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/login/
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/login/Controller.jpf
(contents, props changed)
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/login/index.jsp
(contents, props changed)
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/login/loggedIn.jsp
(contents, props changed)
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/login/success.jsp
(contents, props changed)
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/security/
- copied from r126460,
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/security/
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/tags/
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/tags/secureLinks/
- copied from r126460,
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/secureLinks/
Removed:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/jpfSecurity/
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/jpfSecurityIndex.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/security/
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/secureLinks/
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/SecureLinks.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/Security.xml
Modified:
incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java
incubator/beehive/trunk/netui/test/conf/testRecorder-server.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/config/testRecorder-tests.xml
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/WEB-INF/web.xml
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/security/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/tags/secureLinks/linkToSecure/index.jsp
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/tags/secureLinks/linkToSecure/linkToSecureController.jpf
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/tags/secureLinks/linkToSecure/secure.jsp
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/tags/secureLinks/secure/index.jsp
Modified:
incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java?view=diff&rev=126479&p1=incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java&r1=126478&p2=incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java&r2=126479
==============================================================================
---
incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java
(original)
+++
incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java
Tue Jan 25 23:25:58 2005
@@ -102,6 +102,7 @@
@Override
public SecurityProtocol getSecurityProtocol( String uri,
HttpServletRequest request )
{
+ uri = ScopedServletUtils.normalizeURI( uri );
Boolean isSecure= getHelper( request ).isSecureResource( uri, request
);
return isSecure != null
Modified: incubator/beehive/trunk/netui/test/conf/testRecorder-server.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/conf/testRecorder-server.xml?view=diff&rev=126479&p1=incubator/beehive/trunk/netui/test/conf/testRecorder-server.xml&r1=126478&p2=incubator/beehive/trunk/netui/test/conf/testRecorder-server.xml&r2=126479
==============================================================================
--- incubator/beehive/trunk/netui/test/conf/testRecorder-server.xml
(original)
+++ incubator/beehive/trunk/netui/test/conf/testRecorder-server.xml Tue Jan
25 23:25:58 2005
@@ -20,6 +20,11 @@
<contextRoot>/jsfWeb</contextRoot>
<servletURI>testRecorder</servletURI>
</webapp>
+ <webapp>
+ <name>tomcatWeb</name>
+ <contextRoot>/tomcatWeb</contextRoot>
+ <servletURI>testRecorder</servletURI>
+ </webapp>
<webapp>
<name>urlTemplates</name>
@@ -29,4 +34,4 @@
<!--
-->
</webapps>
-</serverDefinition>
\ No newline at end of file
+</serverDefinition>
Deleted:
/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/jpfSecurityIndex.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/jpfSecurityIndex.jsp?view=auto&rev=126478
==============================================================================
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml?view=diff&rev=126479&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml&r1=126478&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml&r2=126479
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
Tue Jan 25 23:25:58 2005
@@ -5510,31 +5510,6 @@
<webapp>coreWeb</webapp>
</test>
<test>
- <name>SecureLinks</name>
- <description>Test of secure links from various tags</description>
- <webapp>coreWeb</webapp>
- <categories>
- <category>bvt</category>
- <category>tags</category>
- </categories>
- <features>
- <feature>Tags</feature>
- <feature>Security</feature>
- </features>
- </test>
- <test>
- <name>Security</name>
- <description>Security Test</description>
- <webapp>coreWeb</webapp>
- <categories>
- <category>bvt</category>
- <category>corePageFlow</category>
- </categories>
- <features>
- <feature>Security</feature>
- </features>
- </test>
- <test>
<name>Select</name>
<description>Test directly binding select boxes to page
flows.</description>
<webapp>coreWeb</webapp>
Deleted:
/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/SecureLinks.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/SecureLinks.xml?view=auto&rev=126478
==============================================================================
Deleted:
/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/Security.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/Security.xml?view=auto&rev=126478
==============================================================================
Modified:
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/config/testRecorder-tests.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/config/testRecorder-tests.xml?view=diff&rev=126479&p1=incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/config/testRecorder-tests.xml&r1=126478&p2=incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/config/testRecorder-tests.xml&r2=126479
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/config/testRecorder-tests.xml
(original)
+++
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/config/testRecorder-tests.xml
Tue Jan 25 23:25:58 2005
@@ -14,6 +14,31 @@
<categories>
<category>drt</category>
</categories>
+ <features>
+ <feature>Login</feature>
+ </features>
+ </test>
+ <test>
+ <name>SecureLinks</name>
+ <description>Test of rendering secure links in various tags, based
on security-constraints in web.xml for the referenced actions.</description>
+ <webapp>tomcatWeb</webapp>
+ <categories>
+ <category>drt</category>
+ </categories>
+ <features>
+ <feature>Security</feature>
+ </features>
+ </test>
+ <test>
+ <name>Security</name>
+ <description>Test of rendering secure links based on
security-constraints in web.xml for the actions specified in the
tags.</description>
+ <webapp>tomcatWeb</webapp>
+ <categories>
+ <category>drt</category>
+ </categories>
+ <features>
+ <feature>Security</feature>
+ </features>
</test>
</tests>
</testDefinitions>
Added:
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/SecureLinks.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/SecureLinks.xml?view=auto&rev=126479
==============================================================================
--- (empty file)
+++
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/SecureLinks.xml
Tue Jan 25 23:25:58 2005
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ses:recorderSession
xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";>
+ <ses:sessionName>SecureLinks</ses:sessionName>
+ <ses:tester>rich</ses:tester>
+ <ses:startDate>25 Jan 2005, 11:45:17.689 PM MST</ses:startDate>
+ <ses:description>Test of rendering secure links in various tags, based on
security-constraints in web.xml for the referenced actions.</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>/tomcatWeb/tags/secureLinks/linkToSecure/linkToSecureController.jpf</ses:uri>
+ <ses:method>GET</ses:method>
+ <ses:parameters/>
+ <ses:cookies>
+ <ses:cookie>
+ <ses:name>JSESSIONID</ses:name>
+ <ses:value>1D769EFB761AAC4946A9CD3C3EE5C826</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>ISO-8859-1,utf-8;q=0.7,*;q=0.7</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=1D769EFB761AAC4946A9CD3C3EE5C826</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.5) Gecko/20041107 Firefox/1.0</ses:value>
+ </ses:header>
+ </ses:headers>
+ </ses:request>
+ <ses:response>
+ <ses:statusCode>200</ses:statusCode>
+ <ses:reason/>
+ <ses:responseBody><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01
Transitional//EN"
+>
+<html lang="en">
+
+ <head>
+ <title>
+ Web Application Page
+ </title>
+ </head>
+ <body>
+ <a
href="https://localhost:8443/tomcatWeb/tags/secureLinks/linkToSecure/secureAction.do";>secureAction</a>
+ <br>
+ <a
href="https://localhost:8443/tomcatWeb/tags/secureLinks/secure/begin.do";>begin
in /secure</a>
+ <br>
+ <a
href="https://localhost:8443/tomcatWeb/tags/secureLinks/linkToSecure/../secure/begin.do";>begin
in /secure (relative)</a>
+ <br>
+ image under /secure: <img
src="https://localhost:8443/tomcatWeb/tags/secureLinks/secure/image.gif";>
+ <br>
+ image under /secure (relative): <img
src="https://localhost:8443/tomcatWeb/tags/secureLinks/linkToSecure/../secure/image.gif";>
+ <br>
+ imageAnchor under /secure: <a
href="https://localhost:8443/tomcatWeb/tags/secureLinks/linkToSecure/secureAction.do";><img
src="https://localhost:8443/tomcatWeb/tags/secureLinks/secure/image.gif";
onmouseout="swapImage(this,'https://localhost:8443/tomcatWeb/tags/secureLinks/secure/image.gif')"
onmouseover="swapImage(this,'https://localhost:8443/tomcatWeb/tags/secureLinks/secure/image.gif')"></a>
+ <br>
+ imageAnchor under /secure (relative): <a
href="https://localhost:8443/tomcatWeb/tags/secureLinks/linkToSecure/secureAction.do";><img
src="https://localhost:8443/tomcatWeb/tags/secureLinks/linkToSecure/../secure/image.gif";
onmouseout="swapImage(this,'https://localhost:8443/tomcatWeb/tags/secureLinks/linkToSecure/../secure/image.gif')"
onmouseover="swapImage(this,'https://localhost:8443/tomcatWeb/tags/secureLinks/linkToSecure/../secure/image.gif')"></a>
+ <br>
+ imageButton under /secure: <input type="image"
src="https://localhost:8443/tomcatWeb/tags/secureLinks/secure/image.gif";
onmouseout="swapImage(this,'https://localhost:8443/tomcatWeb/tags/secureLinks/secure/image.gif')"
onmouseover="swapImage(this,'https://localhost:8443/tomcatWeb/tags/secureLinks/secure/image.gif')">
+ <br>
+ imageButton under /secure (relative): <input type="image"
src="https://localhost:8443/tomcatWeb/tags/secureLinks/linkToSecure/../secure/image.gif";
onmouseout="swapImage(this,'https://localhost:8443/tomcatWeb/tags/secureLinks/linkToSecure/../secure/image.gif')"
onmouseover="swapImage(this,'https://localhost:8443/tomcatWeb/tags/secureLinks/linkToSecure/../secure/image.gif')">
+
+ </body>
+
+
+<script language="JavaScript" type="text/JavaScript">
+<!--
+
+// **** This section contains functions typically run as events ****
+
+
+// Simple rollover function which replaces the image.src with the passed image
+function swapImage(control, image)
+{
+ control.src = image;
+}
+-->
+</script>
+
+
+</html></ses:responseBody>
+ </ses:response>
+ </ses:test>
+ </ses:tests>
+ <ses:endDate>25 Jan 2005, 11:45:38.429 PM MST</ses:endDate>
+ <ses:testCount>1</ses:testCount>
+</ses:recorderSession>
Copied:
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/Security.xml
(from r126460,
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/Security.xml)
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/Security.xml?view=diff&rev=126479&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/Security.xml&r1=126460&p2=incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/Security.xml&r2=126479
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/Security.xml
(original)
+++
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/Security.xml
Tue Jan 25 23:25:58 2005
@@ -1,269 +1,200 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-<recorderSession
xmlns="http://beehive.apache.org/netui/tools/testrecorder/2004/session";>
-
- <sessionName>Security</sessionName>
- <tester>Daryl</tester>
- <startDate>03 May 2004, 03:13:03.204 PM MDT</startDate>
- <description>Verify that https and transitions work.</description>
-
- <tests>
- <test>
- <testNumber>1</testNumber>
-
- <request>
-
- <protocol>HTTP</protocol>
- <protocolVersion>1.1</protocolVersion>
- <host>localhost</host>
- <port>7001</port>
- <uri>/coreWeb/security/Controller.jpf</uri>
- <method>GET</method>
-
- <parameters>
- </parameters>
-
- <cookies>
- <cookie>
- <name>JSESSIONID</name>
-
<value>AWz3vXAsityS0I0TdpKKlJ8gDkbP8y4HQ5BWgjkOpqaTfFE0mA4X!872494358</value>
- </cookie>
- </cookies>
-
- <headers>
- <header>
- <name>Accept</name>
- <value>image/gif, image/x-xbitmap, image/jpeg, image/pjpeg,
application/vnd.ms-powerpoint, application/vnd.ms-excel, application/msword,
*/*</value>
- </header>
- <header>
- <name>Accept-Encoding</name>
- <value>gzip, deflate, x-gzip, compress, x-compress</value>
- </header>
- <header>
- <name>Accept-Language</name>
- <value>en-us</value>
- </header>
- <header>
- <name>Connection</name>
- <value>Keep-Alive, TE</value>
- </header>
- <header>
- <name>Cookie</name>
-
<value>JSESSIONID=AWz3vXAsityS0I0TdpKKlJ8gDkbP8y4HQ5BWgjkOpqaTfFE0mA4X!872494358</value>
- </header>
- <header>
- <name>Cookie2</name>
- <value>$Version="1"</value>
- </header>
- <header>
- <name>Host</name>
- <value>localhost:7001</value>
- </header>
- <header>
- <name>TE</name>
- <value>trailers, deflate, gzip, compress</value>
- </header>
- <header>
- <name>User-Agent</name>
- <value>Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0)
RPT-HTTPClient/0.3-3E RPT-HTTPClient/0.3-3E RPT-HTTPClient/0.3-3E
RPT-HTTPClient/0.3-3E RPT-HTTPClient/0.3-3E RPT-HTTPClient/0.3-3E
RPT-HTTPClient/0.3-3E</value>
- </header>
- <header>
- <name>testRecorder.playback.failMode</name>
- <value>stop</value>
- </header>
- <header>
- <name>testRecorder.playback.testID</name>
- <value>11f2533b:fc4cabbfdc:-7bf8</value>
- </header>
- <header>
- <name>testRecorder.playback.testNumber</name>
- <value>1</value>
- </header>
- </headers>
-
- </request>
-
- <response>
- <statusCode>200</statusCode>
- <reason></reason>
- <responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "//W3C//DTD HTML 4.01
Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd";>
+<ses:recorderSession
xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";>
+ <ses:sessionName>Security</ses:sessionName>
+ <ses:tester>rich</ses:tester>
+ <ses:startDate>25 Jan 2005, 11:19:16.113 PM MST</ses:startDate>
+ <ses:description>Test of rendering secure links based on
security-constraints in web.xml for the actions specified in the
tags.</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>/tomcatWeb/security/Controller.jpf</ses:uri>
+ <ses:method>GET</ses:method>
+ <ses:parameters/>
+ <ses:cookies>
+ <ses:cookie>
+ <ses:name>JSESSIONID</ses:name>
+ <ses:value>EF9AEA70F80DCD7DD4FC682B9E4B76CD</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>ISO-8859-1,utf-8;q=0.7,*;q=0.7</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=EF9AEA70F80DCD7DD4FC682B9E4B76CD</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.5) Gecko/20041107 Firefox/1.0</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>Security/Proxies</title>
+</head>
+<body bgcolor="white">
+<h3>Secure check</h3>
-<script language="JavaScript" type="text/JavaScript">
-<!--
+<form id="form" action="/tomcatWeb/security/unsecure.do" method="post">
+
+ <a href="https://localhost:8443/tomcatWeb/security/secure.do";>Secure</a>
+ <a href="/tomcatWeb/security/unsecure.do">Unsecure</a>
+</form>
-// **** This section contains code that will run when the page is loaded ****
+</body>
-// Build the netui_names table to map the tagId attributes
-// to the real id written into the HTML
-if (netui_names == null)
- var netui_names = new Object();
-netui_names.form="form"
+<script language="JavaScript" type="text/JavaScript">
+<!--
// **** This section contains functions typically run as events ****
-// method which will return a real id for a tagId,
-// the tag parameter will be used to find the scopeId for
-// containers that may scope their ids
-function getNetuiTagName(id, tag)
+// lookup by tagId to "real id"
+function lookupIdByTagId(id, tag)
{
- var scopeId = getScopeId(tag);
- if (scopeId == "")
- return netui_names[id];
- else
- return netui_names[scopeId + "__" + id];
+ var idScope = lookupIdScope(tag,".");
+ return (idScope == "") ? id : idScope + id;
}
-// This method will walk the hierarchy from the pass element looking for a
scopeId.
-// The first scopeId found will be returned or the empty string if a scopeId
is not found.
-function getScopeId(tag)
+//Non-Legacy lookup method creating a fully qualified scope id
+function lookupIdScope(tag,sep)
{
- if (tag == null)
- return "";
- if (tag.scopeId != null)
- return tag.scopeId;
- return getScopeId(tag.parentElement);
+ var val = "";
+ while (tag != null && tag.getAttribute != null) {
+ var attrVal = tag.getAttribute("netui:idScope");
+ if (attrVal != null)
+ val = attrVal + sep + val;
+ tag = tag.parentNode;
+ }
+ return val;
}
-->
</script>
-<head>
-<title>Security/Proxies</title>
-</head>
-<body bgcolor="white">
-
-<h3>Secure check</h3>
-
-<form id="form" action="/coreWeb/security/unsecure.do" method="post">
-
- <a
href="https://@NON_UNIQUE_HOST@:7002/coreWeb/security/secure.do";>Secure</a>
- <a href="/coreWeb/security/unsecure.do">Unsecure</a>
-</form>
-
-
-</body>
-</html>]]></responseBody>
-
- </response>
-
- <testResults>
- <testStatus>fail</testStatus>
-
- </testResults>
- </test>
- <test>
- <testNumber>2</testNumber>
-
- <request>
-
- <protocol>HTTP</protocol>
- <protocolVersion>1.1</protocolVersion>
- <host>localhost</host>
- <port>7001</port>
- <uri>/coreWeb/security/unsecure.do</uri>
- <method>GET</method>
-
- <parameters>
- </parameters>
-
- <cookies>
- <cookie>
- <name>JSESSIONID</name>
-
<value>AWz3vXAsityS0I0TdpKKlJ8gDkbP8y4HQ5BWgjkOpqaTfFE0mA4X!872494358</value>
- </cookie>
- </cookies>
-
- <headers>
- <header>
- <name>Accept</name>
- <value>image/gif, image/x-xbitmap, image/jpeg, image/pjpeg,
application/vnd.ms-powerpoint, application/vnd.ms-excel, application/msword,
*/*</value>
- </header>
- <header>
- <name>Accept-Encoding</name>
- <value>gzip, deflate, x-gzip, compress, x-compress</value>
- </header>
- <header>
- <name>Accept-Language</name>
- <value>en-us</value>
- </header>
- <header>
- <name>Connection</name>
- <value>Keep-Alive, TE</value>
- </header>
- <header>
- <name>Cookie</name>
-
<value>JSESSIONID=AWz3vXAsityS0I0TdpKKlJ8gDkbP8y4HQ5BWgjkOpqaTfFE0mA4X!872494358</value>
- </header>
- <header>
- <name>Cookie2</name>
- <value>$Version="1"</value>
- </header>
- <header>
- <name>Host</name>
- <value>localhost:7001</value>
- </header>
- <header>
- <name>TE</name>
- <value>trailers, deflate, gzip, compress</value>
- </header>
- <header>
- <name>User-Agent</name>
- <value>Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0)
RPT-HTTPClient/0.3-3E RPT-HTTPClient/0.3-3E RPT-HTTPClient/0.3-3E
RPT-HTTPClient/0.3-3E RPT-HTTPClient/0.3-3E RPT-HTTPClient/0.3-3E
RPT-HTTPClient/0.3-3E</value>
- </header>
- <header>
- <name>testRecorder.playback.failMode</name>
- <value>stop</value>
- </header>
- <header>
- <name>testRecorder.playback.testID</name>
- <value>11f2533b:fc4cabbfdc:-7bf8</value>
- </header>
- <header>
- <name>testRecorder.playback.testNumber</name>
- <value>2</value>
- </header>
- </headers>
-
- </request>
-
- <response>
- <statusCode>200</statusCode>
- <reason></reason>
- <responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "//W3C//DTD HTML 4.01
Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd";>
+</html>]]></ses:responseBody>
+ </ses:response>
+ </ses:test>
+ <ses:test>
+ <ses:testNumber>2</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>/tomcatWeb/security/unsecure.do</ses:uri>
+ <ses:method>GET</ses:method>
+ <ses:parameters/>
+ <ses:cookies>
+ <ses:cookie>
+ <ses:name>JSESSIONID</ses:name>
+ <ses:value>EF9AEA70F80DCD7DD4FC682B9E4B76CD</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>ISO-8859-1,utf-8;q=0.7,*;q=0.7</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=EF9AEA70F80DCD7DD4FC682B9E4B76CD</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>referer</ses:name>
+
<ses:value>http://localhost:8080/tomcatWeb/security/Controller.jpf</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.5) Gecko/20041107 Firefox/1.0</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">
<body bgcolor="white">
<h3>This is page 2!</h3>
-<a href="https://@NON_UNIQUE_HOST@:7002/coreWeb/security/back_secure.do";>Back
to index Secure</a><br>
-<a href="/coreWeb/security/back_unsecure.do">Back to index Unsecure</a>
+<a href="https://localhost:8443/tomcatWeb/security/back_secure.do";>Back to
index Secure</a><br>
+<a href="/tomcatWeb/security/back_unsecure.do">Back to index Unsecure</a>
</body>
-</html>]]></responseBody>
-
- </response>
-
- <testResults>
- <testStatus>pass</testStatus>
-
- </testResults>
- </test>
-
- </tests>
-
- <endDate>03 May 2004, 03:13:07.800 PM MDT</endDate>
- <sessionStatus>fail</sessionStatus>
- <testCount>2</testCount>
- <passedCount>1</passedCount>
- <failedCount>1</failedCount>
-</recorderSession>
\ No newline at end of file
+</html>]]></ses:responseBody>
+ </ses:response>
+ </ses:test>
+ </ses:tests>
+ <ses:endDate>25 Jan 2005, 11:19:35.852 PM MST</ses:endDate>
+ <ses:testCount>2</ses:testCount>
+</ses:recorderSession>
Modified:
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/WEB-INF/web.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/WEB-INF/web.xml?view=diff&rev=126479&p1=incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/WEB-INF/web.xml&r1=126478&p2=incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/WEB-INF/web.xml&r2=126479
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/WEB-INF/web.xml
(original)
+++ incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/WEB-INF/web.xml
Tue Jan 25 23:25:58 2005
@@ -157,4 +157,49 @@
</jsp-config>
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Secure PageFlow - all</web-resource-name>
+ <url-pattern>/security/secure.do</url-pattern>
+ <url-pattern>/security/back_secure.do</url-pattern>
+ </web-resource-collection>
+ <user-data-constraint>
+ <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Unsecure PageFlow - begin</web-resource-name>
+ <url-pattern>/security/unsecure.do</url-pattern>
+ <url-pattern>/security/back_unsecure.do</url-pattern>
+ </web-resource-collection>
+ <user-data-constraint>
+ <transport-guarantee>NONE</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
+
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>for SecureLinks test</web-resource-name>
+ <url-pattern>/tags/secureLinks/secure/*</url-pattern>
+
<url-pattern>/tags/secureLinks/linkToSecure/secureAction.do</url-pattern>
+ </web-resource-collection>
+ <user-data-constraint>
+ <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
+
+ <security-role>
+ <description>Test role for /miniTests/roles</description>
+ <role-name>GoodRole1</role-name>
+ </security-role>
+ <security-role>
+ <description>Test role for /miniTests/roles</description>
+ <role-name>GoodRole2</role-name>
+ </security-role>
+ <security-role>
+ <description>Test role for /miniTests/roles</description>
+ <role-name>BadRole</role-name>
+ </security-role>
+
</web-app>
Added:
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/login/Controller.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/login/Controller.jpf?view=auto&rev=126479
==============================================================================
--- (empty file)
+++
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/login/Controller.jpf
Tue Jan 25 23:25:58 2005
@@ -0,0 +1,76 @@
+package login;
+
+import org.apache.beehive.netui.pageflow.*;
+import org.apache.beehive.netui.pageflow.annotations.*;
+import javax.security.auth.login.LoginException;
+
[EMAIL PROTECTED](
+ simpleActions={
+ @Jpf.SimpleAction(name="begin", path="index.jsp"),
+ @Jpf.SimpleAction(name="mustBeLoggedIn", path="success.jsp",
loginRequired=true)
+ },
+ catches={
+ @Jpf.Catch(type=Exception.class, path="index.jsp")
+ }
+)
+public class Controller extends PageFlowController
+{
+ @Jpf.Action(
+ forwards={
+ @Jpf.Forward(name="success", path="loggedIn.jsp")
+ },
+ [EMAIL PROTECTED](name="failure",
navigateTo=Jpf.NavigateTo.currentPage)
+ )
+ public Forward doLogin( LoginForm form )
+ throws LoginException
+ {
+ login( form.getUsername(), form.getPassword() );
+ return new Forward( "success" );
+ }
+
+ @Jpf.Action(
+ forwards={
+ @Jpf.Forward(name="success", path="success.jsp")
+ }
+ )
+ public Forward doLogout()
+ throws LoginException
+ {
+ logout( false );
+ return new Forward( "success" );
+ }
+
+ public static class LoginForm
+ {
+ private String _username;
+ private String _password;
+
+ public void setUsername( String username )
+ {
+ _username = username;
+ }
+
+ @Jpf.ValidatableProperty(
+ displayName="The username",
+ [EMAIL PROTECTED]()
+ )
+ public String getUsername()
+ {
+ return _username;
+ }
+
+ public void setPassword( String password )
+ {
+ _password = password;
+ }
+
+ @Jpf.ValidatableProperty(
+ displayName="The password",
+ [EMAIL PROTECTED]()
+ )
+ public String getPassword()
+ {
+ return _password;
+ }
+ }
+}
Added:
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/login/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/login/index.jsp?view=auto&rev=126479
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/login/index.jsp
Tue Jan 25 23:25:58 2005
@@ -0,0 +1,44 @@
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ 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-template"
uri="http://beehive.apache.org/netui/tags-template-1.0"%>
+
+
+<netui:html>
+ <head>
+ <netui:base/>
+ </head>
+ <netui:body>
+ <h3>${pageFlow.URI}</h3>
+
+ <span style="color:red">
+ <netui:exceptions showStackTrace="false" showMessage="true"/>
+ </span>
+
+ <netui:form action="doLogin">
+ <table>
+ <tr>
+ <td>username:</td>
+ <td>
+ <netui:textBox dataSource="actionForm.username"/>
+ <span style="color:red"><netui:error
value="username"/></span>
+ </td>
+ </tr>
+ <tr>
+ <td>password:</td>
+ <td>
+ <netui:textBox dataSource="actionForm.password"
password="true"/>
+ <span style="color:red"><netui:error
value="password"/></span>
+ </td>
+ </tr>
+ </table>
+
+ <netui:button value="submit"/>
+ </netui:form>
+
+ <netui:anchor action="mustBeLoggedIn">mustBeLoggedIn</netui:anchor>
+ </netui:body>
+</netui:html>
+
+
+
Added:
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/login/loggedIn.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/login/loggedIn.jsp?view=auto&rev=126479
==============================================================================
--- (empty file)
+++
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/login/loggedIn.jsp
Tue Jan 25 23:25:58 2005
@@ -0,0 +1,23 @@
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ 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-template"
uri="http://beehive.apache.org/netui/tags-template-1.0"%>
+
+
+<netui:html>
+ <head>
+ <netui:base/>
+ </head>
+ <netui:body>
+ <h3>${pageFlow.URI}</h3>
+
+ Logged in as: <b><%= request.getUserPrincipal() %></b>
+
+ <br/>
+ <br/>
+ <netui:anchor action="mustBeLoggedIn">mustBeLoggedIn</netui:anchor>
+ </netui:body>
+</netui:html>
+
+
+
Added:
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/login/success.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/login/success.jsp?view=auto&rev=126479
==============================================================================
--- (empty file)
+++
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/login/success.jsp
Tue Jan 25 23:25:58 2005
@@ -0,0 +1,27 @@
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ 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-template"
uri="http://beehive.apache.org/netui/tags-template-1.0"%>
+
+
+<netui:html>
+ <head>
+ <netui:base/>
+ </head>
+ <netui:body>
+ <h3>${pageFlow.URI}</h3>
+ Success!
+ <br/>
+ <br/>
+ Logged in as: <b><%= request.getUserPrincipal() %></b>
+
+ <br/>
+ <br/>
+ <netui:anchor action="doLogout">log out</netui:anchor>
+ <br/>
+ <netui:anchor action="begin">start over</netui:anchor>
+ </netui:body>
+</netui:html>
+
+
+
Modified:
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/security/Controller.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/security/Controller.jpf?view=diff&rev=126479&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/security/Controller.jpf&r1=126460&p2=incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/security/Controller.jpf&r2=126479
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/security/Controller.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/security/Controller.jpf
Tue Jan 25 23:25:58 2005
@@ -24,10 +24,6 @@
@Jpf.Controller
public class Controller extends PageFlowController
{
- /**
- * @jpf:action
- * @jpf:forward name="index" path="index.jsp"
- */
@Jpf.Action(
forwards = {
@Jpf.Forward(
@@ -39,10 +35,6 @@
return new Forward( "index" );
}
- /**
- * @jpf:action
- * @jpf:forward name="secure" path="page2.jsp"
- */
@Jpf.Action(
forwards = {
@Jpf.Forward(
@@ -54,10 +46,6 @@
return new Forward( "secure" );
}
- /**
- * @jpf:action
- * @jpf:forward name="unsecure" path="page2.jsp"
- */
@Jpf.Action(
forwards = {
@Jpf.Forward(
@@ -69,10 +57,6 @@
return new Forward( "unsecure" );
}
- /**
- * @jpf:action
- * @jpf:forward name="back_secure" path="index.jsp"
- */
@Jpf.Action(
forwards = {
@Jpf.Forward(
@@ -84,10 +68,6 @@
return new Forward( "back_secure" );
}
- /**
- * @jpf:action
- * @jpf:forward name="back_unsecure" path="index.jsp"
- */
@Jpf.Action(
forwards = {
@Jpf.Forward(
Modified:
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/tags/secureLinks/linkToSecure/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/tags/secureLinks/linkToSecure/index.jsp?view=diff&rev=126479&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/secureLinks/linkToSecure/index.jsp&r1=126460&p2=incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/tags/secureLinks/linkToSecure/index.jsp&r2=126479
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/secureLinks/linkToSecure/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/tags/secureLinks/linkToSecure/index.jsp
Tue Jan 25 23:25:58 2005
@@ -1,4 +1,3 @@
-<!--Generated by WebLogic Workshop-->
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib uri="beehive-netui-tags-databinding.tld" prefix="netui-data"%>
<%@ taglib uri="beehive-netui-tags-html.tld" prefix="netui"%>
@@ -12,26 +11,24 @@
<body>
<netui:anchor action="secureAction">secureAction</netui:anchor>
<br>
- <netui:anchor href="/coreWeb/tags/secureLinks/secure/begin.do">begin
in /secure</netui:anchor>
+ <netui:anchor href="/tomcatWeb/tags/secureLinks/secure/begin.do">begin
in /secure</netui:anchor>
<br>
<netui:anchor href="../secure/begin.do">begin in /secure
(relative)</netui:anchor>
<br>
- image under /secure: <netui:image
src="/coreWeb/tags/secureLinks/secure/image.gif"
lowsrc="/coreWeb/tags/secureLinks/secure/image.gif"/>
+ image under /secure: <netui:image
src="/tomcatWeb/tags/secureLinks/secure/image.gif"/>
<br>
- image under /secure (relative): <netui:image src="../secure/image.gif"
lowsrc="../secure/image.gif"/>
+ image under /secure (relative): <netui:image
src="../secure/image.gif"/>
<br>
imageAnchor under /secure: <netui:imageAnchor action="secureAction"
-
src="/coreWeb/tags/secureLinks/secure/image.gif"
-
lowsrc="/coreWeb/tags/secureLinks/secure/image.gif"
-
rolloverImage="/coreWeb/tags/secureLinks/secure/image.gif" />
+
src="/tomcatWeb/tags/secureLinks/secure/image.gif"
+
rolloverImage="/tomcatWeb/tags/secureLinks/secure/image.gif" />
<br>
imageAnchor under /secure (relative): <netui:imageAnchor
action="secureAction"
src="../secure/image.gif"
-
lowsrc="../secure/image.gif"
rolloverImage="../secure/image.gif"/>
<br>
- imageButton under /secure: <netui:imageButton
src="/coreWeb/tags/secureLinks/secure/image.gif"
-
rolloverImage="/coreWeb/tags/secureLinks/secure/image.gif" />
+ imageButton under /secure: <netui:imageButton
src="/tomcatWeb/tags/secureLinks/secure/image.gif"
+
rolloverImage="/tomcatWeb/tags/secureLinks/secure/image.gif" />
<br>
imageButton under /secure (relative): <netui:imageButton
src="../secure/image.gif"
rolloverImage="../secure/image.gif"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/tags/secureLinks/linkToSecure/linkToSecureController.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/tags/secureLinks/linkToSecure/linkToSecureController.jpf?view=diff&rev=126479&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/secureLinks/linkToSecure/linkToSecureController.jpf&r1=126460&p2=incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/tags/secureLinks/linkToSecure/linkToSecureController.jpf&r2=126479
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/secureLinks/linkToSecure/linkToSecureController.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/tags/secureLinks/linkToSecure/linkToSecureController.jpf
Tue Jan 25 23:25:58 2005
@@ -15,125 +15,14 @@
*
* $Header:$
*/
-//
------------------------------------------------------------------------------
-// Generated by WebLogic Workshop
-//
-// Created on: Tue Aug 12 09:35:47 GMT-07:00 2003
-// By: rfeit
-//
-----------------------------------------------------------------------------
package tags.secureLinks.linkToSecure;
import org.apache.beehive.netui.pageflow.Forward;
import org.apache.beehive.netui.pageflow.PageFlowController;
import org.apache.beehive.netui.pageflow.annotations.Jpf;
-/**
- * @jpf:controller
- * @jpf:view-properties view-properties::
- * <!-- This data is auto-generated. Hand-editing this section is not
recommended. -->
- * <view-properties>
- * <pageflow-object id="pageflow:/linkToSecure/linkToSecureController.jpf"/>
- * <pageflow-object id="action:begin.do">
- * <property value="80" name="x"/>
- * <property value="100" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="action:secureAction.do">
- * <property value="380" name="x"/>
- * <property value="100" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="action-call:@page:[EMAIL
PROTECTED]@action:secureAction.do@">
- * <property value="276,310,310,344" name="elbowsX"/>
- * <property value="92,92,92,92" name="elbowsY"/>
- * <property value="East_1" name="fromPort"/>
- * <property value="West_1" name="toPort"/>
- * </pageflow-object>
- * <pageflow-object id="page:index.jsp">
- * <property value="240" name="x"/>
- * <property value="100" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="forward:[EMAIL PROTECTED]:begin.do@">
- * <property value="116,160,160,204" name="elbowsX"/>
- * <property value="92,92,92,92" name="elbowsY"/>
- * <property value="East_1" name="fromPort"/>
- * <property value="West_1" name="toPort"/>
- * <property value="success" name="label"/>
- * </pageflow-object>
- * <pageflow-object id="page:secure.jsp">
- * <property value="380" name="x"/>
- * <property value="240" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="action-call:@page:[EMAIL PROTECTED]@action:begin.do@">
- * <property value="344,80,80,80" name="elbowsX"/>
- * <property value="232,232,188,144" name="elbowsY"/>
- * <property value="West_1" name="fromPort"/>
- * <property value="South_1" name="toPort"/>
- * </pageflow-object>
- * <pageflow-object id="forward:[EMAIL PROTECTED]:secureAction.do@">
- * <property value="380,380,380,380" name="elbowsX"/>
- * <property value="144,170,170,196" name="elbowsY"/>
- * <property value="South_1" name="fromPort"/>
- * <property value="North_1" name="toPort"/>
- * <property value="success" name="label"/>
- * </pageflow-object>
- * </view-properties>
- * ::
- */
[EMAIL PROTECTED](
- )
[EMAIL PROTECTED](
- value = {
- "<!-- This data is auto-generated. Hand-editing this section is not
recommended. -->",
- "<view-properties>",
- "<pageflow-object
id='pageflow:/linkToSecure/linkToSecureController.jpf'/>",
- "<pageflow-object id='action:begin.do'>",
- " <property value='80' name='x'/>",
- " <property value='100' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action:secureAction.do'>",
- " <property value='380' name='x'/>",
- " <property value='100' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:secureAction.do@'>",
- " <property value='276,310,310,344' name='elbowsX'/>",
- " <property value='92,92,92,92' name='elbowsY'/>",
- " <property value='East_1' name='fromPort'/>",
- " <property value='West_1' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='page:index.jsp'>",
- " <property value='240' name='x'/>",
- " <property value='100' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='forward:[EMAIL PROTECTED]:begin.do@'>",
- " <property value='116,160,160,204' name='elbowsX'/>",
- " <property value='92,92,92,92' name='elbowsY'/>",
- " <property value='East_1' name='fromPort'/>",
- " <property value='West_1' name='toPort'/>",
- " <property value='success' name='label'/>",
- "</pageflow-object>",
- "<pageflow-object id='page:secure.jsp'>",
- " <property value='380' name='x'/>",
- " <property value='240' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:begin.do@'>",
- " <property value='344,80,80,80' name='elbowsX'/>",
- " <property value='232,232,188,144' name='elbowsY'/>",
- " <property value='West_1' name='fromPort'/>",
- " <property value='South_1' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='forward:[EMAIL PROTECTED]:secureAction.do@'>",
- " <property value='380,380,380,380' name='elbowsX'/>",
- " <property value='144,170,170,196' name='elbowsY'/>",
- " <property value='South_1' name='fromPort'/>",
- " <property value='North_1' name='toPort'/>",
- " <property value='success' name='label'/>",
- "</pageflow-object>",
- "</view-properties>"
- })
[EMAIL PROTECTED]()
public class linkToSecureController extends PageFlowController
{
- /**
- * @jpf:action
- * @jpf:forward name="success" path="index.jsp"
- */
@Jpf.Action(
forwards = {
@Jpf.Forward(
@@ -145,10 +34,6 @@
return new Forward( "success" );
}
- /**
- * @jpf:action
- * @jpf:forward name="success" path="secure.jsp"
- */
@Jpf.Action(
forwards = {
@Jpf.Forward(
Modified:
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/tags/secureLinks/linkToSecure/secure.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/tags/secureLinks/linkToSecure/secure.jsp?view=diff&rev=126479&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/secureLinks/linkToSecure/secure.jsp&r1=126460&p2=incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/tags/secureLinks/linkToSecure/secure.jsp&r2=126479
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/secureLinks/linkToSecure/secure.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/tags/secureLinks/linkToSecure/secure.jsp
Tue Jan 25 23:25:58 2005
@@ -1,4 +1,3 @@
-<!--Generated by WebLogic Workshop-->
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib uri="beehive-netui-tags-databinding.tld" prefix="netui-data"%>
<%@ taglib uri="beehive-netui-tags-html.tld" prefix="netui"%>
Modified:
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/tags/secureLinks/secure/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/tags/secureLinks/secure/index.jsp?view=diff&rev=126479&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/secureLinks/secure/index.jsp&r1=126460&p2=incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/tags/secureLinks/secure/index.jsp&r2=126479
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/secureLinks/secure/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/tags/secureLinks/secure/index.jsp
Tue Jan 25 23:25:58 2005
@@ -1,4 +1,3 @@
-<!--Generated by WebLogic Workshop-->
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib uri="beehive-netui-tags-databinding.tld" prefix="netui-data"%>
<%@ taglib uri="beehive-netui-tags-html.tld" prefix="netui"%>
![https://localhost:8443/tomcatWeb/tags/secureLinks/secure/image.gif"](https://localhost:8443/tomcatWeb/tags/secureLinks/secure/image.gif"){kind=link}
![https://localhost:8443/tomcatWeb/tags/secureLinks/linkToSecure/../secure/image.gif"](https://localhost:8443/tomcatWeb/tags/secureLinks/linkToSecure/../secure/image.gif"){kind=link}
