Re: svn commit: r165267 - in /incubator/beehive/trunk/netui: src/pageflow/org/apache/beehive/netui/pageflow/ src/pageflow/org/apache/beehive/netui/pageflow/adapter/ src/pageflow/org/apache/beehive/netui/pageflow/internal/ src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/ src/util/org/apache/beehive/netui/core/urltemplates/ test/webapps/urlTemplates/ test/webapps/urlTemplates/testRecorder/tests/ test/webapps/urlTemplates/urlTemplates/WEB-INF/ test/webapps/urlTemplates/urlTemplates/WEB-INF/src/META-INF/ test/webapps/urlTemplates/urlTemplates/WEB-INF/src/META-INF/services/ test/webapps/urlTemplates/urlTemplates/WEB-INF/src/test/ test/webapps/urlTemplates/urlTemplates/testUrlTemplates/

29 Apr 2005 19:32:55 -0000

No problem... our BVT suite is going to be a force to be reckoned with (as if it wasn't already)! :)

Carlin Rogers wrote:

Rich,

Nice! Thank you for adding the ServletContainerAdapter for the
URL templates test, updating the test, and the other added changes.
Thanks for cleaning that up so we can automate the tests.

Carlin

[EMAIL PROTECTED] wrote:

Author: rich
Date: Thu Apr 28 23:15:42 2005
New Revision: 165267

URL: http://svn.apache.org/viewcvs?rev=165267&view=rev
Log:
This is a patch from Carlin Rogers to address http://issues.apache.org/jira/browse/BEEHIVE-577 : add beehive- prefix to url-template-config file and clean up URLTemplatesFactory

I also added a ServletContainerAdapter to the urlTemplates test webapp. The adapter mocks up the right secure/unsecure listen ports and claims that certain URLs are secure, so that the URL Templates tests can be run without integrating a TomcatServletContainerAdapter.

tests: bvt in netui, drt in test/webapps/urlTemplates (WinXP)
BB: self (linux)



Added:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/adapter/

incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/adapter/Adapter.java

- copied, changed from r165250, incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/Adapter.java

incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/adapter/AdapterContext.java

- copied, changed from r165250, incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterContext.java

incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/beehive-url-template-config.xml

- copied unchanged from r165250, incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/url-template-config.xml

incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/src/META-INF/

incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/src/META-INF/services/

incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/src/META-INF/services/org.apache.beehive.netui.pageflow.ServletContainerAdapter

incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/src/test/

incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/src/test/TestServletContainerAdapter.java (with props)
Removed:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/Adapter.java

incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterContext.java

incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/url-template-config.xml

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

incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ServletContainerAdapter.java

incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterManager.java

incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java

incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplateDescriptor.java

incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplatesFactory.java

incubator/beehive/trunk/netui/test/webapps/urlTemplates/build.xml
incubator/beehive/trunk/netui/test/webapps/urlTemplates/testRecorder/tests/UrlTemplates.xml

incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/testUrlTemplates/image.gif

incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/testUrlTemplates/index.jsp


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

URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultServletContainerAdapter.java?rev=165267&r1=165266&r2=165267&view=diff

==============================================================================

--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultServletContainerAdapter.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultServletContainerAdapter.java Thu Apr 28 23:15:42 2005
@@ -20,7 +20,7 @@
import org.apache.beehive.netui.util.internal.InternalStringBuilder;
import org.apache.beehive.netui.pageflow.internal.PageFlowBeanContext;
-import org.apache.beehive.netui.pageflow.internal.AdapterContext;
+import org.apache.beehive.netui.pageflow.adapter.AdapterContext;
import org.apache.beehive.netui.util.logging.Logger;
import javax.servlet.ServletContext;

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

URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ServletContainerAdapter.java?rev=165267&r1=165266&r2=165267&view=diff

==============================================================================

--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ServletContainerAdapter.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ServletContainerAdapter.java Thu Apr 28 23:15:42 2005
@@ -17,7 +17,7 @@
*/
package org.apache.beehive.netui.pageflow;
-import org.apache.beehive.netui.pageflow.internal.Adapter;
+import org.apache.beehive.netui.pageflow.adapter.Adapter;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

Copied: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/adapter/Adapter.java (from r165250, incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/Adapter.java)

URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/adapter/Adapter.java?p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/adapter/Adapter.java&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/Adapter.java&r1=165250&r2=165267&rev=165267&view=diff

==============================================================================

--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/Adapter.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/adapter/Adapter.java Thu Apr 28 23:15:42 2005
@@ -15,9 +15,8 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.pageflow.internal;
+package org.apache.beehive.netui.pageflow.adapter;
-// TODO: this class should go into a beehive-common area
/**
* Base interface for all discoverable adapters.
*/
Copied: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/adapter/AdapterContext.java (from r165250, incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterContext.java)

URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/adapter/AdapterContext.java?p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/adapter/AdapterContext.java&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterContext.java&r1=165250&r2=165267&rev=165267&view=diff

==============================================================================

--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterContext.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/adapter/AdapterContext.java Thu Apr 28 23:15:42 2005
@@ -15,9 +15,8 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.pageflow.internal;
+package org.apache.beehive.netui.pageflow.adapter;
-// TODO: this class should go into a beehive-common area
/**
* Generic context passed to [EMAIL PROTECTED] Adapter}.
*/
Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterManager.java

URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterManager.java?rev=165267&r1=165266&r2=165267&view=diff

==============================================================================

--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterManager.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterManager.java Thu Apr 28 23:15:42 2005
@@ -19,6 +19,8 @@
import org.apache.beehive.netui.pageflow.DefaultServletContainerAdapter;
import org.apache.beehive.netui.pageflow.ServletContainerAdapter;
+import org.apache.beehive.netui.pageflow.adapter.Adapter;
+import org.apache.beehive.netui.pageflow.adapter.AdapterContext;
import org.apache.beehive.netui.util.internal.DiscoveryUtils;
import org.apache.beehive.netui.util.logging.Logger;


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?rev=165267&r1=165266&r2=165267&view=diff

==============================================================================

--- 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 Thu Apr 28 23:15:42 2005
@@ -20,7 +20,7 @@
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
import org.apache.beehive.netui.pageflow.DefaultServletContainerAdapter;
import org.apache.beehive.netui.pageflow.SecurityProtocol;
-import org.apache.beehive.netui.pageflow.internal.AdapterContext;
+import org.apache.beehive.netui.pageflow.adapter.AdapterContext;
import org.apache.beehive.netui.util.logging.Logger;
import org.apache.beehive.netui.util.internal.DiscoveryUtils;


Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplateDescriptor.java

URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplateDescriptor.java?rev=165267&r1=165266&r2=165267&view=diff

==============================================================================

--- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplateDescriptor.java (original)
+++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplateDescriptor.java Thu Apr 28 23:15:42 2005
@@ -29,9 +29,6 @@
*/
public class URLTemplateDescriptor
{
- // Path to the URL template config file
- private static final String DESCRIPTOR_PATH = "/WEB-INF/url-template-config.xml";
-
// Logger
private static final Logger _log = new Logger( URLTemplateDescriptor.class );
@@ -56,10 +53,10 @@
public static final String QUERY_STRING_TOKEN = "{url:queryString}";
public static final String FRAGMENT_TOKEN = "{url:fragment}";
- private static final List/*<String>*/ KNOWN_TEMPLATE_TOKENS =
+ private static final List KNOWN_TEMPLATE_TOKENS =
Arrays.asList( new String[]{ SCHEME_TOKEN, DOMAIN_TOKEN, PORT_TOKEN, FRAGMENT_TOKEN } );
- private static final List/*<String>*/ REQUIRED_TEMPLATE_TOKENS =
+ private static final List REQUIRED_TEMPLATE_TOKENS =
Arrays.asList( new String[]{ PATH_TOKEN, QUERY_STRING_TOKEN } );
// URL templates
@@ -127,20 +124,11 @@
return;
}
- try
- {
- URLTemplatesFactory.setKnownTokens( KNOWN_TEMPLATE_TOKENS );
- URLTemplatesFactory.setRequiredTokens( REQUIRED_TEMPLATE_TOKENS );
- _urlTemplates = URLTemplatesFactory.getTemplates( servletContext );
- }
- catch ( Exception e )
- {
- // Bad descriptor
- _log.error( "Exception while loading URL templates, " + DESCRIPTOR_PATH, e );
- }
+ URLTemplatesFactory urlTemplatesFactory = new URLTemplatesFactory();
+ urlTemplatesFactory.setKnownTokens( KNOWN_TEMPLATE_TOKENS );
+ urlTemplatesFactory.setRequiredTokens( REQUIRED_TEMPLATE_TOKENS );
+ _urlTemplates = urlTemplatesFactory.getTemplates( servletContext );
_loaded = true;
}
}
-
-

Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplatesFactory.java

URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplatesFactory.java?rev=165267&r1=165266&r2=165267&view=diff

==============================================================================

--- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplatesFactory.java (original)
+++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplatesFactory.java Thu Apr 28 23:15:42 2005
@@ -23,10 +23,12 @@
import org.apache.beehive.netui.core.urltemplates.schema.UrlTemplateRefDocument;

import org.apache.beehive.netui.util.logging.Logger;
import org.apache.xmlbeans.XmlCursor;
+import org.apache.xmlbeans.XmlException;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import java.io.InputStream;
+import java.io.IOException;
import java.util.Collection;
import java.util.HashMap;
@@ -37,17 +39,35 @@
{
private static final Logger _log = Logger.getInstance( DefaultURLTemplateFileParser.class );
+ /** Default value for path from the web app to the URL templates. */
+ public static final String DEFAULT_URL_TEMPLATE_CONFIG_FILE_PATH = "/WEB-INF/beehive-url-template-config.xml";
+
// Path to the URL templates.
- private static final String URL_TEMPLATE_CONFIG_FILE_PATH = "/WEB-INF/url-template-config.xml";
+ private String _configFilePath = DEFAULT_URL_TEMPLATE_CONFIG_FILE_PATH;
// Parser to use on the URL template config file.
- private static URLTemplateFileParser _parser = new DefaultURLTemplateFileParser();
+ private URLTemplateFileParser _parser = new DefaultURLTemplateFileParser();
// The set of known tokens in a valid template.
- private static Collection _knownTokens = null;
+ private Collection _knownTokens = null;
// The set of required tokens in a valid template.
- private static Collection _requiredTokens = null;
+ private Collection _requiredTokens = null;
+
+ /**
+ * Allow clients to set their own URL template config file name or path.
+ *
+ * @param configFilePath An absolute path from the web app root tothe URL template config file.
+ */
+ public void setConfigFilePath( String configFilePath )
+ {
+ if ( configFilePath == null )
+ {
+ throw new IllegalArgumentException( "Config file path cannot be null." );
+ }
+
+ _configFilePath = configFilePath;
+ }
/**
* Allow clients to set their own parser.
@@ -58,7 +78,7 @@
*
* @param parser The parser to use on the URL template config file.
*/
- public static void setParser( URLTemplateFileParser parser )
+ public void setParser( URLTemplateFileParser parser )
{
if ( parser == null )
{
@@ -78,7 +98,7 @@
*
* @param knownTokens The set of known tokens for a valid template.
*/
- public static void setKnownTokens( Collection knownTokens )
+ public void setKnownTokens( Collection knownTokens )
{
_knownTokens = knownTokens;
}
@@ -93,7 +113,7 @@
*
* @param requiredTokens The set of required tokens in a valid template.
*/
- public static void setRequiredTokens( Collection requiredTokens )
+ public void setRequiredTokens( Collection requiredTokens )
{
_requiredTokens = requiredTokens;
}
@@ -104,7 +124,7 @@
*
* @return The URL templates found in the config file.
*/
- public static URLTemplates getTemplates( ServletContext servletContext ) throws ServletException
+ public URLTemplates getTemplates( ServletContext servletContext )
{
URLTemplates urlTemplates = new URLTemplates();
InputStream stream = null;
@@ -112,7 +132,7 @@
try
{
UrlTemplateConfig urlTemplateConfig = null;
- stream = servletContext.getResourceAsStream( URL_TEMPLATE_CONFIG_FILE_PATH );
+ stream = servletContext.getResourceAsStream( _configFilePath );
if ( stream != null )
{
urlTemplateConfig = _parser.parse( stream );
@@ -121,16 +141,18 @@
else
{
// No descriptor
- _log.warn( "Could not find URL template descriptor at path " + URL_TEMPLATE_CONFIG_FILE_PATH );
+ _log.warn( "Could not find URL template descriptor at path " + _configFilePath );
}
}
- catch ( Throwable t )
+ catch ( XmlException xe )
+ {
+ // Bad descriptor
+ _log.error( "Malformed URL template descriptor in " + _configFilePath, xe );
+ }
+ catch ( IOException ioe )
{
// Bad descriptor
- _log.debug( "Malformed URL template descriptor in " + URL_TEMPLATE_CONFIG_FILE_PATH, t );
- ServletException se = new ServletException( t );
- se.initCause( t );
- throw se;
+ _log.error( "Problem parsing URL template descriptor in " + _configFilePath, ioe );
}
finally
{
@@ -156,7 +178,7 @@
* @param urlTemplateConfig the parsed XMLBean document for the URL template config.
* @return The URL templates found in the config document.
*/
- protected static URLTemplates getTemplatesFromConfig( UrlTemplateConfig urlTemplateConfig )
+ protected URLTemplates getTemplatesFromConfig( UrlTemplateConfig urlTemplateConfig )
{
URLTemplates urlTemplates = new URLTemplates();


Modified: incubator/beehive/trunk/netui/test/webapps/urlTemplates/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/urlTemplates/build.xml?rev=165267&r1=165266&r2=165267&view=diff

==============================================================================

--- incubator/beehive/trunk/netui/test/webapps/urlTemplates/build.xml (original)
+++ incubator/beehive/trunk/netui/test/webapps/urlTemplates/build.xml Thu Apr 28 23:15:42 2005
@@ -45,6 +45,13 @@
<property name="webapp.file" location="${app.dir}/urlTemplates/testRecorder/config/testRecorder-webapp.xml"/>

<property name="struts.version" value="${struts.version}"/>
</ant>
+
+ <!-- Copy a META-INF reference to our test.TestServletContainerAdapter (see
+ /WEB-INF/src/test/TestServletContainerAdapter.java for more details. -->
+ <copy todir="${webapp.dir}/WEB-INF/classes">
+ <fileset dir="${webapp.dir}/WEB-INF/src" includes="META-INF/**"/>
+ </copy>
+
</target>
<target name="clean" description="Clean webapp">

Modified: incubator/beehive/trunk/netui/test/webapps/urlTemplates/testRecorder/tests/UrlTemplates.xml

URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/urlTemplates/testRecorder/tests/UrlTemplates.xml?rev=165267&r1=165266&r2=165267&view=diff

==============================================================================

--- incubator/beehive/trunk/netui/test/webapps/urlTemplates/testRecorder/tests/UrlTemplates.xml (original)
+++ incubator/beehive/trunk/netui/test/webapps/urlTemplates/testRecorder/tests/UrlTemplates.xml Thu Apr 28 23:15:42 2005
@@ -102,7 +102,6 @@
/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>

/urlTemplates/testUrlTemplates/secureImage.gif: <img src="https://@NON_UNIQUE_HOST@:8443/urlTemplates/testUrlTemplates/secureImage.gif?URLTEMPLATE=secure-resource&";><br>

- http://www.bea.com/content/images/bea_logo.gif?foo=bar: <img src="http://www.bea.com/content/images/bea_logo.gif?foo=bar";><br>
</body>
</html>]]></responseBody>

Added: incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/src/META-INF/services/org.apache.beehive.netui.pageflow.ServletContainerAdapter

URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/src/META-INF/services/org.apache.beehive.netui.pageflow.ServletContainerAdapter?rev=165267&view=auto

==============================================================================

--- incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/src/META-INF/services/org.apache.beehive.netui.pageflow.ServletContainerAdapter (added)
+++ incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/src/META-INF/services/org.apache.beehive.netui.pageflow.ServletContainerAdapter Thu Apr 28 23:15:42 2005
@@ -0,0 +1 @@
+test.TestServletContainerAdapter

Added: incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/src/test/TestServletContainerAdapter.java

URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/src/test/TestServletContainerAdapter.java?rev=165267&view=auto

==============================================================================

--- incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/src/test/TestServletContainerAdapter.java (added)
+++ incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/src/test/TestServletContainerAdapter.java Thu Apr 28 23:15:42 2005
@@ -0,0 +1,40 @@
+package test;
+
+import org.apache.beehive.netui.pageflow.DefaultServletContainerAdapter;
+import org.apache.beehive.netui.pageflow.SecurityProtocol;
+import org.apache.beehive.netui.pageflow.adapter.AdapterContext;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Dummy adapter that gives secure/unsecure ports of 8443/8080, and says that any path that starts
+ * with "/secure" is secure.
+ */
+public class TestServletContainerAdapter
+ extends DefaultServletContainerAdapter
+{
+ public SecurityProtocol getSecurityProtocol( String uri, HttpServletRequest request )
+ {
+ if ( uri.indexOf( "/secure" ) != -1 )
+ {
+ return SecurityProtocol.SECURE;
+ }
+
+ return SecurityProtocol.UNSPECIFIED;
+ }
+
+ public int getListenPort( HttpServletRequest request )
+ {
+ return 8080;
+ }
+
+ public int getSecureListenPort( HttpServletRequest request )
+ {
+ return 8443;
+ }
+
+ public boolean accept( AdapterContext context )
+ {
+ return true;
+ }
+}

Propchange: incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/src/test/TestServletContainerAdapter.java

------------------------------------------------------------------------------ 

    svn:eol-style = native

Modified: incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/testUrlTemplates/image.gif

URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/testUrlTemplates/image.gif?rev=165267&r1=165266&r2=165267&view=diff

============================================================================== 

Binary files - no diff available.

Modified: incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/testUrlTemplates/index.jsp

URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/testUrlTemplates/index.jsp?rev=165267&r1=165266&r2=165267&view=diff

==============================================================================

--- incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/testUrlTemplates/index.jsp (original)
+++ incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/testUrlTemplates/index.jsp Thu Apr 28 23:15:42 2005
@@ -20,6 +20,5 @@
/urlTemplates/testUrlTemplates/image.gif: <netui:image src="/urlTemplates/testUrlTemplates/image.gif"/><br>
secureImage.gif: <netui:image src="secureImage.gif"/><br>
/urlTemplates/testUrlTemplates/secureImage.gif: <netui:image src="/urlTemplates/testUrlTemplates/secureImage.gif"/><br>
- http://www.bea.com/content/images/bea_logo.gif?foo=bar: <netui:image src="http://www.bea.com/content/images/bea_logo.gif?foo=bar"/><br>
</body>
</netui:html>





Reply via email to