You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by cs...@apache.org on 2006/01/31 17:55:43 UTC
svn commit: r373873 - in
/beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName:
./ expectedOutput/ fieldWithNullName/
Author: cschoett
Date: Tue Jan 31 08:55:35 2006
New Revision: 373873
URL: http://svn.apache.org/viewcvs?rev=373873&view=rev
Log:
Added compiler test for fix for BEEHIVE-1055, contributed by Julie Zhuo.
Added:
beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/
beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/expectedOutput/
beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/expectedOutput/annotations-fieldWithNullName-Controller.expected
beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/expectedOutput/annotations-fieldWithNullName-SharedFlow.expected
beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/expectedOutput/struts-config--fieldWithNullName.expected
beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/expectedOutput/struts-config-fieldWithNullName.expected
beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/expectedOutput/warningsorerrors.expected
beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/fieldWithNullName/
beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/fieldWithNullName/Controller.jpf
beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/fieldWithNullName/SharedFlow.jpfs
beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/fieldWithNullName/index.jsp
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/expectedOutput/annotations-fieldWithNullName-Controller.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/expectedOutput/annotations-fieldWithNullName-Controller.expected?rev=373873&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/expectedOutput/annotations-fieldWithNullName-Controller.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/expectedOutput/annotations-fieldWithNullName-Controller.expected Tue Jan 31 08:55:35 2006
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<processed-annotations>
+ <!-- Generated from fieldWithNullName.Controller on Mon Jan 30 16:32:02 MST 2006 -->
+ <type-name>fieldWithNullName.Controller</type-name>
+ <annotated-element>
+ <element-name>sfRef</element-name>
+ <annotation>
+ <annotation-name>org.apache.beehive.netui.pageflow.annotations.Jpf.SharedFlowField</annotation-name>
+ </annotation>
+ </annotated-element>
+</processed-annotations>
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/expectedOutput/annotations-fieldWithNullName-SharedFlow.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/expectedOutput/annotations-fieldWithNullName-SharedFlow.expected?rev=373873&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/expectedOutput/annotations-fieldWithNullName-SharedFlow.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/expectedOutput/annotations-fieldWithNullName-SharedFlow.expected Tue Jan 31 08:55:35 2006
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<processed-annotations>
+ <!-- Generated from fieldWithNullName.SharedFlow on Mon Jan 30 16:32:02 MST 2006 -->
+ <type-name>fieldWithNullName.SharedFlow</type-name>
+</processed-annotations>
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/expectedOutput/struts-config--fieldWithNullName.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/expectedOutput/struts-config--fieldWithNullName.expected?rev=373873&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/expectedOutput/struts-config--fieldWithNullName.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/expectedOutput/struts-config--fieldWithNullName.expected Tue Jan 31 08:55:35 2006
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
+<struts-config>
+ <!-- Generated from /fieldWithNullName/SharedFlow.java on Mon Jan 30 16:32:02 MST 2006 -->
+ <form-beans/>
+ <global-exceptions/>
+ <global-forwards>
+ <forward name="_auto" path=""/>
+ </global-forwards>
+ <action-mappings/>
+ <controller className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig" inputForward="true" processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor">
+ <set-property property="isSharedFlow" value="true"/>
+ <set-property property="isReturnToPageDisabled" value="true"/>
+ <set-property property="isReturnToActionDisabled" value="true"/>
+ <set-property property="sharedFlows" value=""/>
+ <set-property property="controllerClass" value="fieldWithNullName.SharedFlow"/>
+ <set-property property="isMissingDefaultMessages" value="true"/>
+ </controller>
+ <message-resources key="_defaultMsgs" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/expectedOutput/struts-config-fieldWithNullName.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/expectedOutput/struts-config-fieldWithNullName.expected?rev=373873&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/expectedOutput/struts-config-fieldWithNullName.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/expectedOutput/struts-config-fieldWithNullName.expected Tue Jan 31 08:55:35 2006
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
+<struts-config>
+ <!-- Generated from /fieldWithNullName/Controller.java on Mon Jan 30 16:32:02 MST 2006 -->
+ <form-beans/>
+ <global-exceptions/>
+ <global-forwards>
+ <forward name="_auto" path=""/>
+ </global-forwards>
+ <action-mappings>
+ <action className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping" parameter="fieldWithNullName.Controller" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
+ <set-property property="readonly" value="true"/>
+ <set-property property="simpleAction" value="true"/>
+ <set-property property="defaultForward" value="_defaultForward"/>
+ <forward name="_defaultForward" path="/index.jsp"/>
+ </action>
+ <action parameter="fieldWithNullName.Controller" path="/getShared" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
+ <forward className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward" name="success" path="currentPage">
+ <set-property property="returnToPage" value="true"/>
+ </forward>
+ </action>
+ </action-mappings>
+ <controller className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig" inputForward="true" processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor">
+ <set-property property="isReturnToActionDisabled" value="true"/>
+ <set-property property="sharedFlows" value="shared=fieldWithNullName.SharedFlow"/>
+ <set-property property="controllerClass" value="fieldWithNullName.Controller"/>
+ <set-property property="isMissingDefaultMessages" value="true"/>
+ </controller>
+ <message-resources key="_defaultMsgs" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/expectedOutput/warningsorerrors.expected?rev=373873&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/expectedOutput/warningsorerrors.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/expectedOutput/warningsorerrors.expected Tue Jan 31 08:55:35 2006
@@ -0,0 +1,4 @@
+[LOCAL_PATH]/WEB-INF/.tmpbeansrc/fieldWithNullName/Controller.java:25: annotation org.apache.beehive.netui.pageflow.annotations.Jpf.SharedFlowField is missing name
+ @Jpf.SharedFlowField()
+ ^
+1 error
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/fieldWithNullName/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/fieldWithNullName/Controller.jpf?rev=373873&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/fieldWithNullName/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/fieldWithNullName/Controller.jpf Tue Jan 31 08:55:35 2006
@@ -0,0 +1,53 @@
+package fieldWithNullName;
+
+import javax.servlet.http.HttpSession;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+/*
+ * This test verifies that:
+ * It is an error if the name and type specifed in the @Jpf.SharedFlowRef annotation does not match the name used
+ * in the @Jpf.SharedFlowField annotation.
+ */
+
+@Jpf.Controller(
+ simpleActions={
+ @Jpf.SimpleAction(name="begin", path="index.jsp")
+ },
+ sharedFlowRefs={
+ @Jpf.SharedFlowRef(name="shared", type=fieldWithNullName.SharedFlow.class)
+ }
+)
+public class Controller
+ extends PageFlowController
+{
+ @Jpf.SharedFlowField()
+ private fieldWithNullName.SharedFlow sfRef;
+
+
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(name= "success", navigateTo=Jpf.NavigateTo.currentPage)
+ }
+ )
+ protected Forward getShared() {
+ Forward forward = new Forward("success");
+ return new Forward( "success", "message", sfRef.getSharedMessage());
+ }
+
+
+ /**
+ * Callback that is invoked when this controller instance is created.
+ */
+ protected void onCreate()
+ {
+ }
+
+ /**
+ * Callback that is invoked when this controller instance is destroyed.
+ */
+ protected void onDestroy(HttpSession session)
+ {
+ }
+}
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/fieldWithNullName/SharedFlow.jpfs
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/fieldWithNullName/SharedFlow.jpfs?rev=373873&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/fieldWithNullName/SharedFlow.jpfs (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/fieldWithNullName/SharedFlow.jpfs Tue Jan 31 08:55:35 2006
@@ -0,0 +1,25 @@
+package fieldWithNullName;
+
+import java.io.IOException;
+
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowException;
+import org.apache.beehive.netui.pageflow.SharedFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+
+@Jpf.Controller()
+public class SharedFlow
+ extends SharedFlowController
+{
+ private String sharedMessage;
+
+ public String getSharedMessage(){
+ return this.sharedMessage;
+ }
+
+ protected void onCreate()
+ {
+ sharedMessage = "Message initialized from sharedFlowReference.SharedFlow.onCreate()";
+ }
+}
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/fieldWithNullName/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/fieldWithNullName/index.jsp?rev=373873&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/fieldWithNullName/index.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/SF_FieldWithNullName/fieldWithNullName/index.jsp Tue Jan 31 08:55:35 2006
@@ -0,0 +1,14 @@
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
+<netui:html>
+ <head>
+ <title>Web Application Page</title>
+ <netui:base/>
+ </head>
+ <netui:body>
+ Use a shared action to get the value of <netui:anchor action="getShared" >sharedMessage: </netui:anchor>
+ <netui:label value="${pageInput.message}"/>
+ </netui:body>
+</netui:html>