You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by cr...@apache.org on 2006/07/01 00:22:20 UTC
svn commit: r418395 - in /beehive/trunk/netui:
src/compiler-core/org/apache/beehive/netui/compiler/
src/pageflow/org/apache/beehive/netui/pageflow/internal/
test/webapps/drt/src/bugs/j1096/ test/webapps/drt/src/bugs/j1096/base/
test/webapps/drt/src/bug...
Author: crogers
Date: Fri Jun 30 15:22:18 2006
New Revision: 418395
URL: http://svn.apache.org/viewvc?rev=418395&view=rev
Log:
Fix for https://issues.apache.org/jira/browse/BEEHIVE-1096 - Inherited NetUI shared flow reference needs to be initialized correctly.
Modified the FlowControllerGenerator.includeFieldAnnotations() method so that the annotation processing will include all the declared fields, including the default (package) access and private inherited fields, for shared flows. I also made the change to the runtime CachedPageFlowInfo class to go through the fields of a page flow super class to get the inherited declared fields.
There's also a new test case that I added to the NetUI BVT to cover this scenario.
tests: NetUI BVT (Linux pass)
Added:
beehive/trunk/netui/test/webapps/drt/src/bugs/j1096/
beehive/trunk/netui/test/webapps/drt/src/bugs/j1096/SharedFlow.java (with props)
beehive/trunk/netui/test/webapps/drt/src/bugs/j1096/base/
beehive/trunk/netui/test/webapps/drt/src/bugs/j1096/base/BaseController.java (with props)
beehive/trunk/netui/test/webapps/drt/src/bugs/j1096/derived/
beehive/trunk/netui/test/webapps/drt/src/bugs/j1096/derived/Controller.java (with props)
beehive/trunk/netui/test/webapps/drt/testRecorder/tests/InheritSharedFlowField.xml (with props)
beehive/trunk/netui/test/webapps/drt/web/bugs/j1096/
beehive/trunk/netui/test/webapps/drt/web/bugs/j1096/base/
beehive/trunk/netui/test/webapps/drt/web/bugs/j1096/base/index.jsp (with props)
beehive/trunk/netui/test/webapps/drt/web/bugs/j1096/derived/
beehive/trunk/netui/test/webapps/drt/web/bugs/j1096/derived/index.jsp (with props)
Modified:
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerGenerator.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/CachedPageFlowInfo.java
beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerGenerator.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerGenerator.java?rev=418395&r1=418394&r2=418395&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerGenerator.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerGenerator.java Fri Jun 30 15:22:18 2006
@@ -24,13 +24,12 @@
import org.apache.beehive.netui.compiler.typesystem.declaration.FieldDeclaration;
import org.apache.beehive.netui.compiler.typesystem.declaration.TypeDeclaration;
import org.apache.beehive.netui.compiler.typesystem.env.CoreAnnotationProcessorEnv;
+import org.apache.beehive.netui.compiler.typesystem.type.ClassType;
import org.apache.beehive.netui.compiler.model.XmlModelWriterException;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.util.Collection;
-import java.util.Iterator;
abstract class FlowControllerGenerator
@@ -107,40 +106,49 @@
}
}
+ /*
+ * Gets all the public, protected, default (package) access,
+ * and private fields, including inherited fields, that have
+ * desired annotations.
+ */
static boolean includeFieldAnnotations( AnnotationToXML atx, TypeDeclaration typeDecl, String additionalAnnotation )
{
- Collection fields = CompilerUtils.getClassFields( typeDecl );
boolean hasFieldAnnotations = false;
-
- if ( fields.size() > 0 )
- {
- for ( Iterator i = fields.iterator(); i.hasNext(); )
- {
- FieldDeclaration field = ( FieldDeclaration ) i.next();
- AnnotationInstance fieldAnnotation =
- CompilerUtils.getAnnotation( field, JpfLanguageConstants.SHARED_FLOW_FIELD_TAG_NAME );
-
- if ( fieldAnnotation == null )
- {
- fieldAnnotation = CompilerUtils.getAnnotationFullyQualified( field, CONTROL_ANNOTATION );
- }
-
- if ( fieldAnnotation == null && additionalAnnotation != null )
- {
- fieldAnnotation = CompilerUtils.getAnnotation( field, additionalAnnotation );
- }
-
- if ( fieldAnnotation != null )
- {
- atx.include( field, fieldAnnotation );
- hasFieldAnnotations = true;
- }
+
+ if (! (typeDecl instanceof ClassDeclaration)) {
+ return hasFieldAnnotations;
+ }
+
+ ClassDeclaration jclass = (ClassDeclaration) typeDecl;
+ FieldDeclaration[] fields = jclass.getFields();
+
+ for (int i = 0; i < fields.length; i++) {
+ AnnotationInstance fieldAnnotation =
+ CompilerUtils.getAnnotation(fields[i], JpfLanguageConstants.SHARED_FLOW_FIELD_TAG_NAME);
+
+ if (fieldAnnotation == null) {
+ fieldAnnotation = CompilerUtils.getAnnotationFullyQualified(fields[i], CONTROL_ANNOTATION);
+ }
+
+ if (fieldAnnotation == null && additionalAnnotation != null) {
+ fieldAnnotation = CompilerUtils.getAnnotation(fields[i], additionalAnnotation);
+ }
+
+ if (fieldAnnotation != null) {
+ atx.include(fields[i], fieldAnnotation);
+ hasFieldAnnotations = true;
}
}
-
- return hasFieldAnnotations;
+
+ ClassType superclass = jclass.getSuperclass();
+ boolean superclassHasFieldAnns = false;
+ if (superclass != null) {
+ superclassHasFieldAnns = includeFieldAnnotations(atx, CompilerUtils.getDeclaration(superclass), additionalAnnotation);
+ }
+
+ return hasFieldAnnotations || superclassHasFieldAnns;
}
-
+
protected void generateStrutsConfig( GenStrutsApp app, ClassDeclaration publicClass )
{
File strutsConfigFile = null;
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/CachedPageFlowInfo.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/CachedPageFlowInfo.java?rev=418395&r1=418394&r2=418395&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/CachedPageFlowInfo.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/CachedPageFlowInfo.java Fri Jun 30 15:22:18 2006
@@ -18,13 +18,16 @@
package org.apache.beehive.netui.pageflow.internal;
import org.apache.beehive.netui.pageflow.PageFlowConstants;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
import javax.servlet.ServletContext;
/**
* Information that is cached per pageflow class.
- */
+ */
public class CachedPageFlowInfo
extends CachedSharedFlowRefInfo
{
@@ -32,47 +35,61 @@
* A cached copy of the module path for this PageFlowController (the path starting at the webapp root).
*/
private String _modulePath;
-
+
/**
* A cached copy of the webapp-relative URI for this PageFlowController.
- */
+ */
private String _URI;
-
-
- public CachedPageFlowInfo( Class pageFlowClass, ServletContext servletContext )
- {
+
+
+ public CachedPageFlowInfo(Class pageFlowClass, ServletContext servletContext) {
AnnotationReader annReader = AnnotationReader.getAnnotationReader( pageFlowClass, servletContext );
- initSharedFlowFields( annReader, pageFlowClass.getDeclaredFields() );
-
- //
+ initSharedFlowFields( annReader, getFields(pageFlowClass) );
+
// URI
- //
String className = pageFlowClass.getName();
_URI = '/' + className.replace( '.', '/' ) + PageFlowConstants.PAGEFLOW_EXTENSION;
-
- //
+
// module path
- //
_modulePath = InternalUtils.inferModulePathFromClassName( className );
}
- public String getModulePath()
- {
+ public String getModulePath() {
return _modulePath;
}
- public void setModulePath( String modulePath )
- {
+ public void setModulePath(String modulePath) {
_modulePath = modulePath;
}
- public String getURI()
- {
+ public String getURI() {
return _URI;
}
- public void setURI( String URI )
- {
+ public void setURI(String URI) {
_URI = URI;
+ }
+
+ /*
+ * Get the declared fields of the page flow. This includes the
+ * inherited fields from super class page flows.
+ */
+ private static Field[] getFields(Class pageFlowClass) {
+ if (! (PageFlowController.class.isAssignableFrom(pageFlowClass))) {
+ return new Field[0];
+ }
+
+ ArrayList results = new ArrayList();
+ do {
+ Field[] fields = pageFlowClass.getDeclaredFields();
+ for (int i = 0; i < fields.length; i++) {
+ results.add(fields[i]);
+ }
+ pageFlowClass = pageFlowClass.getSuperclass();
+ } while (pageFlowClass != null
+ && !PageFlowController.class.equals(pageFlowClass)
+ && PageFlowController.class.isAssignableFrom(pageFlowClass));
+
+ return (Field[]) results.toArray(new Field[ results.size() ]);
}
}
Added: beehive/trunk/netui/test/webapps/drt/src/bugs/j1096/SharedFlow.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/src/bugs/j1096/SharedFlow.java?rev=418395&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/src/bugs/j1096/SharedFlow.java (added)
+++ beehive/trunk/netui/test/webapps/drt/src/bugs/j1096/SharedFlow.java Fri Jun 30 15:22:18 2006
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2006 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 bugs.j1096;
+
+import org.apache.beehive.netui.pageflow.SharedFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+@Jpf.Controller()
+public class SharedFlow extends SharedFlowController
+{
+ private String sharedFlowMessage = "Message from SharedFlow: ";
+
+ public String getSharedFlowMessage(){
+ return sharedFlowMessage + getDisplayName();
+ }
+}
Propchange: beehive/trunk/netui/test/webapps/drt/src/bugs/j1096/SharedFlow.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/src/bugs/j1096/base/BaseController.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/src/bugs/j1096/base/BaseController.java?rev=418395&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/src/bugs/j1096/base/BaseController.java (added)
+++ beehive/trunk/netui/test/webapps/drt/src/bugs/j1096/base/BaseController.java Fri Jun 30 15:22:18 2006
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2006 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 bugs.j1096.base;
+
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+@Jpf.Controller(
+ simpleActions={
+ @Jpf.SimpleAction(name = "begin", path = "index.jsp")
+ },
+ sharedFlowRefs={
+ @Jpf.SharedFlowRef(name="mySharedFlow", type=bugs.j1096.SharedFlow.class)
+ })
+public class BaseController extends PageFlowController
+{
+ @Jpf.SharedFlowField(name = "mySharedFlow")
+ private bugs.j1096.SharedFlow sf;
+
+ public String getSharedFlowMsg() {
+ return sf.getSharedFlowMessage();
+ }
+
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(name = "success", path = "index.jsp")
+ }
+ )
+ protected Forward sfFieldTest() throws Exception{
+ return new Forward("success", "sharedFlowName", getSharedFlowMsg());
+ }
+}
+
Propchange: beehive/trunk/netui/test/webapps/drt/src/bugs/j1096/base/BaseController.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/src/bugs/j1096/derived/Controller.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/src/bugs/j1096/derived/Controller.java?rev=418395&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/src/bugs/j1096/derived/Controller.java (added)
+++ beehive/trunk/netui/test/webapps/drt/src/bugs/j1096/derived/Controller.java Fri Jun 30 15:22:18 2006
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2006 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 bugs.j1096.derived;
+
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import org.apache.beehive.netui.pageflow.Forward;
+
+import bugs.j1096.base.BaseController;
+
+@Jpf.Controller(
+ sharedFlowRefs={
+ @Jpf.SharedFlowRef(name="mySharedFlow",type=bugs.j1096.SharedFlow.class)
+ }
+)
+public class Controller extends BaseController
+{
+}
+
Propchange: beehive/trunk/netui/test/webapps/drt/src/bugs/j1096/derived/Controller.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml?rev=418395&r1=418394&r2=418395&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml (original)
+++ beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml Fri Jun 30 15:22:18 2006
@@ -4608,6 +4608,20 @@
</features>
</test>
<test>
+ <name>InheritSharedFlowField</name>
+ <description>Test SharedFlow fields declared in a base page flow class and inherited in a derived class. (J1096)</description>
+ <webapp>coreWeb</webapp>
+ <categories>
+ <category>bvt</category>
+ <category>bvt.struts11</category>
+ <category>jiraBugs</category>
+ </categories>
+ <features>
+ <feature>PageFlow</feature>
+ <feature>Inheritance</feature>
+ </features>
+ </test>
+ <test>
<name>InheritUseFormBean</name>
<description>Test inheritance of actions and simple actions with the useFormBean annotation attribute.</description>
<webapp>coreWeb</webapp>
Added: beehive/trunk/netui/test/webapps/drt/testRecorder/tests/InheritSharedFlowField.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/InheritSharedFlowField.xml?rev=418395&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/testRecorder/tests/InheritSharedFlowField.xml (added)
+++ beehive/trunk/netui/test/webapps/drt/testRecorder/tests/InheritSharedFlowField.xml Fri Jun 30 15:22:18 2006
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<recorderSession xmlns="http://beehive.apache.org/netui/tools/testrecorder/2004/session">
+<sessionName>InheritSharedFlowField</sessionName>
+<tester>crogers</tester>
+<startDate>30 Jun 2006, 02:40:38.353 PM MDT</startDate>
+<description>Test SharedFlow fields declared in a base class and inherited in a derived class. (J1096)</description>
+<tests>
+<test>
+<testNumber>1</testNumber>
+<request>
+<protocol>HTTP</protocol>
+<protocolVersion>1.1</protocolVersion>
+<host>localhost</host>
+<port>8080</port>
+<uri>/coreWeb/bugs/j1096/derived/begin.do</uri>
+<method>GET</method>
+<parameters>
+</parameters>
+<cookies>
+<cookie>
+<name>JSESSIONID</name>
+<value>532C15E67E0E4A4EBCB74E1F7D5A183C</value>
+</cookie>
+</cookies>
+<headers>
+<header>
+<name>accept</name>
+<value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</value>
+</header>
+<header>
+<name>accept-charset</name>
+<value>UTF-8,*</value>
+</header>
+<header>
+<name>accept-encoding</name>
+<value>gzip,deflate</value>
+</header>
+<header>
+<name>accept-language</name>
+<value>en-us,en;q=0.5</value>
+</header>
+<header>
+<name>connection</name>
+<value>keep-alive</value>
+</header>
+<header>
+<name>cookie</name>
+<value>JSESSIONID=532C15E67E0E4A4EBCB74E1F7D5A183C</value>
+</header>
+<header>
+<name>host</name>
+<value>localhost:8080</value>
+</header>
+<header>
+<name>keep-alive</name>
+<value>300</value>
+</header>
+<header>
+<name>user-agent</name>
+<value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.0.4) Gecko/20060508 Firefox/1.5.0.4</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 lang="en">
+
+ <head>
+ <title>Inherited SharedFlow Field</title>
+ <base href="http://localhost:8080/coreWeb/bugs/j1096/derived/index.jsp">
+ </head>
+ <body>
+ <h2>Inherited Shared Flow Field</h2>
+ <br/>
+ <a href="/coreWeb/bugs/j1096/derived/sfFieldTest.do">Try Field Test</a>
+ <br/>
+ <span></span>
+ </body>
+
+</html>]]>
+</responseBody>
+</response>
+</test>
+<test>
+<testNumber>2</testNumber>
+<request>
+<protocol>HTTP</protocol>
+<protocolVersion>1.1</protocolVersion>
+<host>localhost</host>
+<port>8080</port>
+<uri>/coreWeb/bugs/j1096/derived/sfFieldTest.do</uri>
+<method>GET</method>
+<parameters>
+</parameters>
+<cookies>
+<cookie>
+<name>JSESSIONID</name>
+<value>532C15E67E0E4A4EBCB74E1F7D5A183C</value>
+</cookie>
+</cookies>
+<headers>
+<header>
+<name>accept</name>
+<value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</value>
+</header>
+<header>
+<name>accept-charset</name>
+<value>UTF-8,*</value>
+</header>
+<header>
+<name>accept-encoding</name>
+<value>gzip,deflate</value>
+</header>
+<header>
+<name>accept-language</name>
+<value>en-us,en;q=0.5</value>
+</header>
+<header>
+<name>connection</name>
+<value>keep-alive</value>
+</header>
+<header>
+<name>cookie</name>
+<value>JSESSIONID=532C15E67E0E4A4EBCB74E1F7D5A183C</value>
+</header>
+<header>
+<name>host</name>
+<value>localhost:8080</value>
+</header>
+<header>
+<name>keep-alive</name>
+<value>300</value>
+</header>
+<header>
+<name>referer</name>
+<value>http://localhost:8080/coreWeb/bugs/j1096/derived/begin.do</value>
+</header>
+<header>
+<name>user-agent</name>
+<value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.0.4) Gecko/20060508 Firefox/1.5.0.4</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 lang="en">
+
+ <head>
+ <title>Inherited SharedFlow Field</title>
+ <base href="http://localhost:8080/coreWeb/bugs/j1096/derived/index.jsp">
+ </head>
+ <body>
+ <h2>Inherited Shared Flow Field</h2>
+ <br/>
+ <a href="/coreWeb/bugs/j1096/derived/sfFieldTest.do">Try Field Test</a>
+ <br/>
+ <span>Message from SharedFlow: bugs.j1096.SharedFlow</span>
+ </body>
+
+</html>]]>
+</responseBody>
+</response>
+</test>
+</tests>
+<endDate>30 Jun 2006, 02:41:04.049 PM MDT</endDate>
+<testCount>2</testCount>
+</recorderSession>
Propchange: beehive/trunk/netui/test/webapps/drt/testRecorder/tests/InheritSharedFlowField.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/bugs/j1096/base/index.jsp
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/web/bugs/j1096/base/index.jsp?rev=418395&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j1096/base/index.jsp (added)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j1096/base/index.jsp Fri Jun 30 15:22:18 2006
@@ -0,0 +1,39 @@
+<%--
+ Copyright 2006 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:$
+--%>
+<%@ 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>SharedFlow Field</title>
+ <netui:base/>
+ </head>
+ <body>
+ <jsp:include page="../common/header.jsp"/>
+
+ <h2>Shared Flow Field</h2>
+ <br/>
+ <netui:anchor action="sfFieldTest">Try Field Test</netui:anchor>
+ <br/>
+ <netui:span value="${pageInput.sharedFlowName}"/>
+
+ <jsp:include page="../common/footer.jsp"/>
+ </body>
+</netui:html>
+
+
Propchange: beehive/trunk/netui/test/webapps/drt/web/bugs/j1096/base/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/bugs/j1096/derived/index.jsp
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/web/bugs/j1096/derived/index.jsp?rev=418395&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j1096/derived/index.jsp (added)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j1096/derived/index.jsp Fri Jun 30 15:22:18 2006
@@ -0,0 +1,35 @@
+<%--
+ Copyright 2006 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:$
+--%>
+<%@ 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>Inherited SharedFlow Field</title>
+ <netui:base/>
+ </head>
+ <body>
+ <h2>Inherited Shared Flow Field</h2>
+ <br/>
+ <netui:anchor action="sfFieldTest">Try Field Test</netui:anchor>
+ <br/>
+ <netui:span value="${pageInput.sharedFlowName}"/>
+ </body>
+</netui:html>
+
+
Propchange: beehive/trunk/netui/test/webapps/drt/web/bugs/j1096/derived/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native