You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/06/23 19:25:08 UTC
svn commit: r193188 [1/3] - in /incubator/beehive/sandbox/ekoneil: ./
controls/src/api/org/apache/beehive/controls/api/properties/
controls/test/infra/tch/ controls/test/tools/tch/ external/xmlbeans/
netui/src/compiler-core/org/apache/beehive/netui/com...
Author: ekoneil
Date: Thu Jun 23 10:25:04 2005
New Revision: 193188
URL: http://svn.apache.org/viewcvs?rev=193188&view=rev
Log:
Update sandbox to HEAD of trunk/ in order to pickup the recent WSM JavaBean model changes.
Added:
incubator/beehive/sandbox/ekoneil/netui/test/webapps/drt/coreWeb/bugs/j757/
- copied from r193185, incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j757/
incubator/beehive/sandbox/ekoneil/netui/test/webapps/drt/coreWeb/bugs/j757/Controller.jpf (props changed)
- copied unchanged from r193185, incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j757/Controller.jpf
incubator/beehive/sandbox/ekoneil/netui/test/webapps/drt/coreWeb/bugs/j757/error.jsp (props changed)
- copied unchanged from r193185, incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j757/error.jsp
incubator/beehive/sandbox/ekoneil/netui/test/webapps/drt/coreWeb/bugs/j757/index.jsp (props changed)
- copied unchanged from r193185, incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j757/index.jsp
incubator/beehive/sandbox/ekoneil/netui/test/webapps/drt/testRecorder/tests/FileUpload.xml (props changed)
- copied unchanged from r193185, incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/FileUpload.xml
incubator/beehive/sandbox/ekoneil/netui/test/webapps/drt/testRecorder/tests/J757.xml (props changed)
- copied unchanged from r193185, incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J757.xml
incubator/beehive/sandbox/ekoneil/netui/test/webapps/jsf/jsfWeb/onCreate/
- copied from r193185, incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/onCreate/
incubator/beehive/sandbox/ekoneil/netui/test/webapps/jsf/jsfWeb/onCreate/Controller.jpf (props changed)
- copied unchanged from r193185, incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/onCreate/Controller.jpf
incubator/beehive/sandbox/ekoneil/netui/test/webapps/jsf/jsfWeb/onCreate/page1.jsfb (props changed)
- copied unchanged from r193185, incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/onCreate/page1.jsfb
incubator/beehive/sandbox/ekoneil/netui/test/webapps/jsf/jsfWeb/onCreate/page1.jsp (props changed)
- copied unchanged from r193185, incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/onCreate/page1.jsp
incubator/beehive/sandbox/ekoneil/netui/test/webapps/jsf/jsfWeb/onCreate/page2.jsfb (props changed)
- copied unchanged from r193185, incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/onCreate/page2.jsfb
incubator/beehive/sandbox/ekoneil/netui/test/webapps/jsf/jsfWeb/onCreate/page2.jsp (props changed)
- copied unchanged from r193185, incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/onCreate/page2.jsp
incubator/beehive/sandbox/ekoneil/netui/test/webapps/jsf/testRecorder/tests-jsf-ri/OnCreate.xml (props changed)
- copied unchanged from r193185, incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests-jsf-ri/OnCreate.xml
incubator/beehive/sandbox/ekoneil/netui/test/webapps/jsf/testRecorder/tests-myfaces/OnCreate.xml (props changed)
- copied unchanged from r193185, incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests-myfaces/OnCreate.xml
incubator/beehive/sandbox/ekoneil/wsm/src/core/org/apache/beehive/wsm/model/impl/
- copied from r193185, incubator/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/impl/
incubator/beehive/sandbox/ekoneil/wsm/src/core/org/apache/beehive/wsm/model/impl/DefaultMethodMetadataImpl.java
- copied unchanged from r193185, incubator/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/impl/DefaultMethodMetadataImpl.java
incubator/beehive/sandbox/ekoneil/wsm/src/core/org/apache/beehive/wsm/model/impl/DefaultParameterMetadataImpl.java
- copied unchanged from r193185, incubator/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/impl/DefaultParameterMetadataImpl.java
incubator/beehive/sandbox/ekoneil/wsm/src/core/org/apache/beehive/wsm/model/impl/DefaultSOAPBindingInfoImpl.java
- copied unchanged from r193185, incubator/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/impl/DefaultSOAPBindingInfoImpl.java
incubator/beehive/sandbox/ekoneil/wsm/src/core/org/apache/beehive/wsm/model/impl/DefaultSOAPMessageHandlerInfoImpl.java
- copied unchanged from r193185, incubator/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/impl/DefaultSOAPMessageHandlerInfoImpl.java
incubator/beehive/sandbox/ekoneil/wsm/src/core/org/apache/beehive/wsm/model/impl/DefaultTypeMetadataImpl.java
- copied unchanged from r193185, incubator/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/impl/DefaultTypeMetadataImpl.java
Removed:
incubator/beehive/sandbox/ekoneil/wsm/src/core/org/apache/beehive/wsm/model/BeehiveWsSecurityRolesInfo.java
incubator/beehive/sandbox/ekoneil/wsm/src/core/org/apache/beehive/wsm/model/jsr181/SOAPBindingInfo.java
incubator/beehive/sandbox/ekoneil/wsm/src/core/org/apache/beehive/wsm/model/jsr181/SOAPMessageHandlerInfo.java
Modified:
incubator/beehive/sandbox/ekoneil/beehive-imports.xml
incubator/beehive/sandbox/ekoneil/controls/src/api/org/apache/beehive/controls/api/properties/AnnotatedElementMap.java
incubator/beehive/sandbox/ekoneil/controls/test/infra/tch/schema.jar
incubator/beehive/sandbox/ekoneil/controls/test/tools/tch/build.xml
incubator/beehive/sandbox/ekoneil/external/xmlbeans/apache-xbean.jar
incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BaseValidationRuleGrammar.java
incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java
incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateCustomGrammar.java
incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateTypeGrammar.java
incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateValidWhenGrammar.java
incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidationRulesContainerGrammar.java
incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java
incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/internal/PageFlowNavigationHandler.java
incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/internal/PageFlowViewHandler.java
incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java
incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java
incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowRequestWrapper.java
incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectUtil.java
incubator/beehive/sandbox/ekoneil/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
incubator/beehive/sandbox/ekoneil/netui/test/webapps/drt/testRecorder/tests/LifecycleExceptions.xml
incubator/beehive/sandbox/ekoneil/netui/test/webapps/jsf/testRecorder/config/testRecorder-tests.xml
incubator/beehive/sandbox/ekoneil/system-controls/test/src/webservice/build.xml
incubator/beehive/sandbox/ekoneil/system-controls/test/src/webservice/schemas/SoapMarshallingDocLitBare.wsdl
incubator/beehive/sandbox/ekoneil/system-controls/test/src/webservice/schemas/SoapMarshallingDocLitBareArrayTypes.wsdl
incubator/beehive/sandbox/ekoneil/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/soapMarshalling/SoapMarshallingDocLitBare.jws
incubator/beehive/sandbox/ekoneil/system-controls/test/src/webservice/servers/webapp/WEB-INF/webservices/soapMarshalling/SoapMarshallingDocLitBareArrayTypes.jws
incubator/beehive/sandbox/ekoneil/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitBareArrayTypesTest.java
incubator/beehive/sandbox/ekoneil/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitBareTest.java
incubator/beehive/sandbox/ekoneil/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitWrappedArrayTypesTest.java
incubator/beehive/sandbox/ekoneil/system-controls/test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/SoapMarshallingDocLitWrappedTest.java
incubator/beehive/sandbox/ekoneil/wsm/drt/tests/org/apache/beehive/wsm/axis/AxisHookTest.java
incubator/beehive/sandbox/ekoneil/wsm/src/core/org/apache/beehive/wsm/model/BeehiveWsMethodMetadata.java
incubator/beehive/sandbox/ekoneil/wsm/src/core/org/apache/beehive/wsm/model/BeehiveWsParameterMetadata.java
incubator/beehive/sandbox/ekoneil/wsm/src/core/org/apache/beehive/wsm/model/BeehiveWsSOAPBindingInfo.java
incubator/beehive/sandbox/ekoneil/wsm/src/core/org/apache/beehive/wsm/model/BeehiveWsSOAPMessageHandlerInfo.java
incubator/beehive/sandbox/ekoneil/wsm/src/core/org/apache/beehive/wsm/model/BeehiveWsTypeMetadata.java
incubator/beehive/sandbox/ekoneil/wsm/src/core/org/apache/beehive/wsm/model/jsr181/Jsr181MethodMetadataImpl.java
incubator/beehive/sandbox/ekoneil/wsm/src/core/org/apache/beehive/wsm/model/jsr181/Jsr181ParameterMetadataImpl.java
incubator/beehive/sandbox/ekoneil/wsm/src/core/org/apache/beehive/wsm/model/jsr181/Jsr181TypeMetadataImpl.java
incubator/beehive/sandbox/ekoneil/wsm/src/core/org/apache/beehive/wsm/model/wsdl/XmlBeanWSDLProcessor.java
incubator/beehive/sandbox/ekoneil/wsm/src/core/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessor.java
Modified: incubator/beehive/sandbox/ekoneil/beehive-imports.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/sandbox/ekoneil/beehive-imports.xml?rev=193188&r1=193187&r2=193188&view=diff
==============================================================================
--- incubator/beehive/sandbox/ekoneil/beehive-imports.xml (original)
+++ incubator/beehive/sandbox/ekoneil/beehive-imports.xml Thu Jun 23 10:25:04 2005
@@ -141,7 +141,7 @@
<!-- controls test classpaths; these should move down into the controls/test/external directory -->
<path id="regexp.dependency.path">
- <pathelement location="${beehive.home}/external/jakarta-regexp-1.3.jar"/>
+ <pathelement location="${beehive.home}/external/jakarta/jakarta-regexp-1.2.jar"/>
</path>
<path id="httpunit.dependency.path">
Modified: incubator/beehive/sandbox/ekoneil/controls/src/api/org/apache/beehive/controls/api/properties/AnnotatedElementMap.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/sandbox/ekoneil/controls/src/api/org/apache/beehive/controls/api/properties/AnnotatedElementMap.java?rev=193188&r1=193187&r2=193188&view=diff
==============================================================================
--- incubator/beehive/sandbox/ekoneil/controls/src/api/org/apache/beehive/controls/api/properties/AnnotatedElementMap.java (original)
+++ incubator/beehive/sandbox/ekoneil/controls/src/api/org/apache/beehive/controls/api/properties/AnnotatedElementMap.java Thu Jun 23 10:25:04 2005
@@ -233,7 +233,7 @@
_annotElem = _elemClass;
else
{
- int argsIndex = _elemDesc.indexOf('/');
+ int argsIndex = _elemDesc.indexOf('(');
if (argsIndex < 0) // element is a Field
{
try
Modified: incubator/beehive/sandbox/ekoneil/controls/test/infra/tch/schema.jar
URL: http://svn.apache.org/viewcvs/incubator/beehive/sandbox/ekoneil/controls/test/infra/tch/schema.jar?rev=193188&r1=193187&r2=193188&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/beehive/sandbox/ekoneil/controls/test/tools/tch/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/sandbox/ekoneil/controls/test/tools/tch/build.xml?rev=193188&r1=193187&r2=193188&view=diff
==============================================================================
--- incubator/beehive/sandbox/ekoneil/controls/test/tools/tch/build.xml (original)
+++ incubator/beehive/sandbox/ekoneil/controls/test/tools/tch/build.xml Thu Jun 23 10:25:04 2005
@@ -1,3 +1,22 @@
+<?xml version="1.0"?>
+<!--
+ Copyright 2004 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:$
+-->
+
<project name="tch" default="all" basedir=".">
<property name="buildenv-props" value="common.props"/>
@@ -17,13 +36,11 @@
<property name="schema.compiler" value="org.apache.xmlbeans.impl.tool.SchemaCompiler"/>
<property name="schema.jar.file" location="deploy/schema.jar"/>
- <path id="classpath">
- <path refid="xbean.dependency.path" />
- </path>
-
+ <path id="classpath">
+ <path refid="xbean.dependency.path" />
+ </path>
-
- <target name="all" depends="build, jar, gen-root"/>
+ <target name="all" depends="build,jar,gen-root"/>
<target name="clean">
<delete quiet="true" dir="${classes}"/>
@@ -42,20 +59,20 @@
<mkdir dir="${classes}"/>
<echo message="java-src is: ${java-src}"/>
- <javac
- debug="${debug}" srcdir="${java-src}" destdir="${classes}"
- excludes="tch/version.java,
- tch/**"
- >
+
+ <javac debug="${debug}"
+ srcdir="${java-src}"
+ destdir="${classes}"
+ excludes="tch/version.java,tch/**">
<classpath>
- <pathelement path="${os.CLASSPATH}"/>
+ <path refid="regexp.dependency.path"/>
+ <path refid="servlet.dependency.path"/>
<path refid="xbean.dependency.path"/>
<pathelement location="${schema.jar.file}"/>
</classpath>
</javac>
<!-- rmic -->
-
<rmic
base="${classes}"
sourcebase="${branch-home}/stubs"
@@ -64,7 +81,7 @@
org/apache/beehive/test/tools/tch/core/remote/RemoteProcessStateImpl.class,
org/apache/beehive/test/tools/tch/core/remote/RemoteExecTaskRunnerImpl.class,
org/apache/beehive/test/tools/tch/core/remote/RemoteProcessEngineWrapperImpl.class,
- org/apache/beehive/test/tools/tch/core/remote/RemoteTchManagerImpl.class,
+ org/apache/beehive/test/tools/tch/core/remote/RemoteTchManagerImpl.class,
org/apache/beehive/test/tools/tch/tool/ThreadDumperImpl.class,
org/apache/beehive/test/tools/tch/util/io/RemoteOutputStreamSubscriberAdapter.class"
/>
@@ -76,18 +93,20 @@
running VersionGenerator
---------------------------
</echo>
- <java
- classname="org.apache.beehive.test.tools.tch.core.VersionGenerator"
- fork="true" dir="${java-src}/org/apache/beehive/test/tools/tch/"
- >
+ <java classname="org.apache.beehive.test.tools.tch.core.VersionGenerator"
+ fork="true"
+ dir="${java-src}/org/apache/beehive/test/tools/tch/">
<classpath>
<pathelement path="${classes}"/>
</classpath>
<sysproperty key="nop4" value="${nop4}"/>
</java>
- <javac debug="${debug}" srcdir="${java-src}" destdir="${classes}"
- includes="org/apache/beehive/test/tools/tch/core/version.java,
- tch/version.java"/>
+
+ <javac debug="${debug}"
+ srcdir="${java-src}"
+ destdir="${classes}"
+ includes="org/apache/beehive/test/tools/tch/core/version.java,tch/version.java"/>
+
<delete file="${java-src}/org/apache/beehive/test/tools/tch/core/version.java"/>
<delete file="${classes}/org/apache/beehive/test/tools/tch/core/VersionGenerator.class"/>
</target>
@@ -205,8 +224,7 @@
org/apache/beehive/test/tools/tch/util/TestResultBean.class,
org/apache/beehive/test/tools/tch/util/TestResultType.class
org/apache/beehive/test/tools/tch/util/gtlf/**,
- org/apache/beehive/test/tools/tch/util/xml/**"
- >
+ org/apache/beehive/test/tools/tch/util/xml/**">
<!-- also need the dtds for local GTLFEntityResolver -->
<fileset
@@ -227,19 +245,11 @@
<!-- package tch src -->
<target name="package.src">
<mkdir dir="${packagedir}"/>
- <zip
- destfile="${packagedir}/${src-core-zip}"
- update="true"
- >
- <zipfileset
- dir="${java-src}"
- includes="org/**/*.java"
- />
+ <zip destfile="${packagedir}/${src-core-zip}" update="true">
+ <zipfileset dir="${java-src}" includes="org/**/*.java"/>
</zip>
</target>
-
-
<!-- compiles the schema using xbeans -->
<target name="compile.schema">
<echo message="Using compiler from: ${schema.compiler}"/>
@@ -253,9 +263,8 @@
<delete dir="${temp.dir}"/>
<mkdir dir="${temp.dir}"/>
-
- <java classname="${schema.compiler}"
- classpathref="classpath"
+ <!-- todo: this should use the build-schema macro... -->
+ <java classname="${schema.compiler}" classpathref="classpath"
fork="true">
<arg line="-out ${schema.jar.file}"/>
<arg line="-d ${temp.dir}"/>
@@ -265,7 +274,6 @@
<echo message="schema.jar.file: ${schema.jar.file}"/>
<delete dir="${temp.dir}"/>
</target>
-
</project>
Modified: incubator/beehive/sandbox/ekoneil/external/xmlbeans/apache-xbean.jar
URL: http://svn.apache.org/viewcvs/incubator/beehive/sandbox/ekoneil/external/xmlbeans/apache-xbean.jar?rev=193188&r1=193187&r2=193188&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BaseValidationRuleGrammar.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BaseValidationRuleGrammar.java?rev=193188&r1=193187&r2=193188&view=diff
==============================================================================
--- incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BaseValidationRuleGrammar.java (original)
+++ incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BaseValidationRuleGrammar.java Thu Jun 23 10:25:04 2005
@@ -28,6 +28,7 @@
import java.util.List;
import java.util.Iterator;
+import java.util.ArrayList;
public class BaseValidationRuleGrammar
@@ -43,23 +44,35 @@
{ BUNDLE_NAME_ATTR, MESSAGE_KEY_ATTR }
};
+ private String[][] _requiredAttrs = null;
public BaseValidationRuleGrammar( AnnotationProcessorEnvironment env, Diagnostics diags,
RuntimeVersionChecker rvc )
{
super( env, diags, VERSION_9_0_STRING, rvc );
-
+
addMemberType( MESSAGE_KEY_ATTR, new MessageKeyType( null, this ) );
addMemberArrayGrammar( MESSAGE_ARGS_ATTR, new ValidationMessageArgsGrammar( env, diags, rvc ) );
addMemberType( BUNDLE_NAME_ATTR, new BundleNameType( null, this ) );
}
-
+ public BaseValidationRuleGrammar( AnnotationProcessorEnvironment env, Diagnostics diags,
+ RuntimeVersionChecker rvc, String[][] requiredAttrs )
+ {
+ this( env, diags, rvc );
+
+ _requiredAttrs = requiredAttrs;
+ }
+
+ public String[][] getRequiredAttrs()
+ {
+ return _requiredAttrs;
+ }
+
public String[][] getMutuallyExclusiveAttrs()
{
return MUTUALLY_EXCLUSIVE_ATTRS;
}
-
public String[][] getAttrDependencies()
{
Modified: incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java?rev=193188&r1=193187&r2=193188&view=diff
==============================================================================
--- incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java (original)
+++ incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java Thu Jun 23 10:25:04 2005
@@ -113,6 +113,7 @@
{
private static String[][] REQUIRED_SIMPLEACTION_ATTRS =
{
+ { CONDITION_ATTR },
{ PATH_ATTR, TILES_DEFINITION_ATTR, RETURN_ACTION_ATTR, NAVIGATE_TO_ATTR, ACTION_ATTR }
};
Modified: incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateCustomGrammar.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateCustomGrammar.java?rev=193188&r1=193187&r2=193188&view=diff
==============================================================================
--- incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateCustomGrammar.java (original)
+++ incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateCustomGrammar.java Thu Jun 23 10:25:04 2005
@@ -20,21 +20,39 @@
import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment;
import org.apache.beehive.netui.compiler.Diagnostics;
import org.apache.beehive.netui.compiler.RuntimeVersionChecker;
+import org.apache.beehive.netui.compiler.AnnotationGrammar;
public class ValidateCustomGrammar
extends BaseValidationRuleGrammar
{
- private static final String[][] REQUIRED_ATTRS = { { MESSAGE_ATTR, MESSAGE_KEY_ATTR } };
+ private static final String[][] REQUIRED_ATTRS = { { RULE_ATTR }, { MESSAGE_ATTR, MESSAGE_KEY_ATTR } };
+ private static final String[][] VARIABLE_REQUIRED_ATTRS = { { NAME_ATTR }, { VALUE_ATTR } };
public ValidateCustomGrammar( AnnotationProcessorEnvironment env, Diagnostics diagnostics,
RuntimeVersionChecker rvc )
{
super( env, diagnostics, rvc );
+ addMemberArrayGrammar( VARIABLES_ATTR, new ValidateCustomVariableGrammar() );
}
public String[][] getRequiredAttrs()
{
return REQUIRED_ATTRS;
+ }
+
+ private class ValidateCustomVariableGrammar
+ extends AnnotationGrammar
+ {
+ public ValidateCustomVariableGrammar()
+ {
+ super( ValidateCustomGrammar.this.getEnv(), ValidateCustomGrammar.this.getDiagnostics(),
+ null, ValidateCustomGrammar.this.getRuntimeVersionChecker() );
+ }
+
+ public String[][] getRequiredAttrs()
+ {
+ return VARIABLE_REQUIRED_ATTRS;
+ }
}
}
Modified: incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateTypeGrammar.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateTypeGrammar.java?rev=193188&r1=193187&r2=193188&view=diff
==============================================================================
--- incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateTypeGrammar.java (original)
+++ incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateTypeGrammar.java Thu Jun 23 10:25:04 2005
@@ -33,12 +33,19 @@
public class ValidateTypeGrammar
extends BaseValidationRuleGrammar
{
+ private static final String[][] REQUIRED_ATTRS = { { TYPE_ATTR } };
+
public ValidateTypeGrammar( AnnotationProcessorEnvironment env, Diagnostics diags,
- RuntimeVersionChecker runtimeVersionChecker )
+ RuntimeVersionChecker runtimeVersionChecker )
{
super( env, diags, runtimeVersionChecker );
addMemberType( TYPE_ATTR, new PrimitiveTypeType() );
+ }
+
+ public String[][] getRequiredAttrs()
+ {
+ return REQUIRED_ATTRS;
}
private class PrimitiveTypeType
Modified: incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateValidWhenGrammar.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateValidWhenGrammar.java?rev=193188&r1=193187&r2=193188&view=diff
==============================================================================
--- incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateValidWhenGrammar.java (original)
+++ incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateValidWhenGrammar.java Thu Jun 23 10:25:04 2005
@@ -25,7 +25,7 @@
public class ValidateValidWhenGrammar
extends BaseValidationRuleGrammar
{
- private static final String[][] REQUIRED_ATTRS = { { MESSAGE_ATTR, MESSAGE_KEY_ATTR } };
+ private static final String[][] REQUIRED_ATTRS = { { CONDITION_ATTR }, { MESSAGE_ATTR, MESSAGE_KEY_ATTR } };
public ValidateValidWhenGrammar( AnnotationProcessorEnvironment env, Diagnostics diagnostics,
RuntimeVersionChecker rvc )
Modified: incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidationRulesContainerGrammar.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidationRulesContainerGrammar.java?rev=193188&r1=193187&r2=193188&view=diff
==============================================================================
--- incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidationRulesContainerGrammar.java (original)
+++ incubator/beehive/sandbox/ekoneil/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidationRulesContainerGrammar.java Thu Jun 23 10:25:04 2005
@@ -32,12 +32,16 @@
addMemberGrammar( VALIDATE_REQUIRED_ATTR, new ValidateRequiredGrammar( env, diags, rvc ) );
addMemberGrammar( VALIDATE_RANGE_ATTR, new ValidateRangeGrammar( env, diags, rvc ) );
- addMemberGrammar( VALIDATE_MIN_LENGTH_ATTR, new BaseValidationRuleGrammar( env, diags, rvc ) );
- addMemberGrammar( VALIDATE_MAX_LENGTH_ATTR, new BaseValidationRuleGrammar( env, diags, rvc ) );
+ addMemberGrammar( VALIDATE_MIN_LENGTH_ATTR,
+ new BaseValidationRuleGrammar( env, diags, rvc, new String[][]{ { CHARS_ATTR } } ) );
+ addMemberGrammar( VALIDATE_MAX_LENGTH_ATTR,
+ new BaseValidationRuleGrammar( env, diags, rvc, new String[][]{ { CHARS_ATTR } } ) );
addMemberGrammar( VALIDATE_CREDIT_CARD_ATTR, new BaseValidationRuleGrammar( env, diags, rvc ) );
addMemberGrammar( VALIDATE_EMAIL_ATTR, new BaseValidationRuleGrammar( env, diags, rvc ) );
- addMemberGrammar( VALIDATE_MASK_ATTR, new BaseValidationRuleGrammar( env, diags, rvc ) );
- addMemberGrammar( VALIDATE_DATE_ATTR, new BaseValidationRuleGrammar( env, diags, rvc ) );
+ addMemberGrammar( VALIDATE_MASK_ATTR,
+ new BaseValidationRuleGrammar( env, diags, rvc, new String[][]{ { REGEX_ATTR } } ) );
+ addMemberGrammar( VALIDATE_DATE_ATTR,
+ new BaseValidationRuleGrammar( env, diags, rvc, new String[][]{ { PATTERN_ATTR } } ) );
addMemberGrammar( VALIDATE_TYPE_ATTR, new ValidateTypeGrammar( env, diags, rvc ) );
addMemberGrammar( VALIDATE_VALID_WHEN_ATTR, new ValidateValidWhenGrammar( env, diags, rvc ) );
addMemberArrayGrammar( VALIDATE_CUSTOM_ATTR, new ValidateCustomGrammar( env, diags, rvc ) );
Modified: incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java?rev=193188&r1=193187&r2=193188&view=diff
==============================================================================
--- incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java (original)
+++ incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java Thu Jun 23 10:25:04 2005
@@ -585,6 +585,12 @@
PageFlowController jpf = PageFlowUtils.getCurrentPageFlow( request );
//
+ // Remove any current JavaServer Faces backing bean. We have "left" any JSF page and are now processing a
+ // Page Flow action.
+ //
+ InternalUtils.removeCurrentFacesBackingBean( request, servletContext );
+
+ //
// Set up implicit objects used by the expression language in simple actions and in declarative validation.
//
ImplicitObjectUtil.loadImplicitObjects( request, response, servletContext, jpf );
Modified: incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java?rev=193188&r1=193187&r2=193188&view=diff
==============================================================================
--- incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java (original)
+++ incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java Thu Jun 23 10:25:04 2005
@@ -231,6 +231,22 @@
* Get the current PageFlowController.
*
* @param request the current HttpServletRequest.
+ * @param servletContext the current ServletContext.
+ * @return the current PageFlowController from the user session, or <code>null</code>
+ * if there is none.
+ */
+ public static final PageFlowController getCurrentPageFlow( HttpServletRequest request, ServletContext servletContext )
+ {
+ ActionResolver cur = getCurrentActionResolver( request, servletContext );
+ return cur != null && cur.isPageFlow() ? ( PageFlowController ) cur : null;
+ }
+
+ /**
+ /**
+ * Get the current PageFlowController.
+ * @deprecated Use {@link #getCurrentPageFlow(HttpServletRequest, ServletContext)} instead.
+ *
+ * @param request the current HttpServletRequest.
* @return the current PageFlowController from the user session, or <code>null</code>
* if there is none.
*/
@@ -241,13 +257,26 @@
}
/**
- * Get the current ActionResolver ({@link PageFlowController}).
+ * Get the current ActionResolver.
+ * @deprecated Use {@link #getCurrentActionResolver(HttpServletRequest, ServletContext)} instead.
*
* @return the current ActionResolver from the user session, or <code>null</code> if there is none.
*/
public static ActionResolver getCurrentActionResolver( HttpServletRequest request )
{
ServletContext servletContext = InternalUtils.getServletContext( request );
+ return getCurrentActionResolver( request, servletContext );
+ }
+
+ /**
+ * Get the current ActionResolver.
+ *
+ * @param request the current HttpServletRequest.
+ * @param servletContext the current ServletContext.
+ * @return the current ActionResolver from the user session, or <code>null</code> if there is none.
+ */
+ public static ActionResolver getCurrentActionResolver( HttpServletRequest request, ServletContext servletContext )
+ {
StorageHandler sh = Handlers.get( servletContext ).getStorageHandler();
HttpServletRequest unwrappedRequest = unwrapMultipart( request );
RequestContext rc = new RequestContext( unwrappedRequest, null );
@@ -302,6 +331,7 @@
/**
* Get the shared flow with the given class name.
+ * @deprecated Use {@link #getSharedFlow(String, HttpServletRequest, ServletContext)} instead.
*
* @param sharedFlowClassName the class name of the shared flow to remove.
* @param request the current HttpServletRequest.
@@ -310,6 +340,19 @@
public static SharedFlowController getSharedFlow( String sharedFlowClassName, HttpServletRequest request )
{
ServletContext servletContext = InternalUtils.getServletContext( request );
+ return getSharedFlow( sharedFlowClassName, request, servletContext );
+ }
+
+ /**
+ * Get the shared flow with the given class name.
+ *
+ * @param sharedFlowClassName the class name of the shared flow to remove.
+ * @param request the current HttpServletRequest.
+ * @return the {@link SharedFlowController} of the given class name which is stored in the user session.
+ */
+ public static SharedFlowController getSharedFlow( String sharedFlowClassName, HttpServletRequest request,
+ ServletContext servletContext )
+ {
StorageHandler sh = Handlers.get( servletContext ).getStorageHandler();
HttpServletRequest unwrappedRequest = unwrapMultipart( request );
RequestContext rc = new RequestContext( unwrappedRequest, null );
@@ -319,28 +362,52 @@
/**
* Destroy the current {@link SharedFlowController} of the given class name.
+ * @deprecated Use {@link #removeSharedFlow(String, HttpServletRequest, ServletContext)} instead.
* @param sharedFlowClassName the class name of the current SharedFlowController to destroy.
* @param request the current HttpServletRequest.
*/
public static void removeSharedFlow( String sharedFlowClassName, HttpServletRequest request )
{
ServletContext servletContext = InternalUtils.getServletContext( request );
+ removeSharedFlow( sharedFlowClassName, request, servletContext );
+ }
+
+ /**
+ * Destroy the current {@link SharedFlowController} of the given class name.
+ * @param sharedFlowClassName the class name of the current SharedFlowController to destroy.
+ * @param request the current HttpServletRequest.
+ */
+ public static void removeSharedFlow( String sharedFlowClassName, HttpServletRequest request,
+ ServletContext servletContext )
+ {
StorageHandler sh = Handlers.get( servletContext ).getStorageHandler();
HttpServletRequest unwrappedRequest = unwrapMultipart( request );
RequestContext rc = new RequestContext( unwrappedRequest, null );
sh.removeAttribute( rc, SHARED_FLOW_ATTR_PREFIX + sharedFlowClassName );
}
-
/**
* Remove a "long-lived" page flow from the session. Once it is created, a long-lived page flow
* is never removed from the session unless this method or {@link PageFlowController#remove} is
* called. Navigating to another page flow hides the current long-lived controller, but does not
* remove it.
+ * @deprecated Use {@link #removeLongLivedPageFlow(String, HttpServletRequest, ServletContext)} instead.
*/
public static void removeLongLivedPageFlow( String modulePath, HttpServletRequest request )
{
ServletContext servletContext = InternalUtils.getServletContext( request );
+ removeLongLivedPageFlow( modulePath, request, servletContext );
+ }
+
+ /**
+ * Remove a "long-lived" page flow from the session. Once it is created, a long-lived page flow
+ * is never removed from the session unless this method or {@link PageFlowController#remove} is
+ * called. Navigating to another page flow hides the current long-lived controller, but does not
+ * remove it.
+ */
+ public static void removeLongLivedPageFlow( String modulePath, HttpServletRequest request,
+ ServletContext servletContext )
+ {
StorageHandler sh = Handlers.get( servletContext ).getStorageHandler();
HttpServletRequest unwrappedRequest = unwrapMultipart( request );
RequestContext rc = new RequestContext( unwrappedRequest, null );
@@ -365,6 +432,7 @@
/**
* Get the long-lived page flow instance associated with the given module (directory) path.
+ * @deprecated Use {@link #getLongLivedPageFlow(String, HttpServletRequest, ServletContext)} instead.
*
* @param modulePath the webapp-relative path to the directory containing the long-lived page flow.
* @param request the current HttpServletRequest.
@@ -373,6 +441,20 @@
public static PageFlowController getLongLivedPageFlow( String modulePath, HttpServletRequest request )
{
ServletContext servletContext = InternalUtils.getServletContext( request );
+ return getLongLivedPageFlow( modulePath, request, servletContext );
+ }
+
+ /**
+ * Get the long-lived page flow instance associated with the given module (directory) path.
+ *
+ * @param modulePath the webapp-relative path to the directory containing the long-lived page flow.
+ * @param request the current HttpServletRequest.
+ * @param servletContext the current ServletContext.
+ * @return the long-lived page flow instance associated with the given module, or <code>null</code> if none is found.
+ */
+ public static PageFlowController getLongLivedPageFlow( String modulePath, HttpServletRequest request,
+ ServletContext servletContext )
+ {
StorageHandler sh = Handlers.get( servletContext ).getStorageHandler();
HttpServletRequest unwrappedRequest = unwrapMultipart( request );
RequestContext rc = new RequestContext( unwrappedRequest, null );
Modified: incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java?rev=193188&r1=193187&r2=193188&view=diff
==============================================================================
--- incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java (original)
+++ incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java Thu Jun 23 10:25:04 2005
@@ -933,7 +933,7 @@
/**
* A String version of the type information that can be used by tools or as runtime-accessable information,
* particularly to add generics to the type (generics are "erased" during compilation and are not available
- * to the runtime through reflection.
+ * to the runtime through reflection).
*/
String typeHint() default "";
Modified: incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/internal/PageFlowNavigationHandler.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/internal/PageFlowNavigationHandler.java?rev=193188&r1=193187&r2=193188&view=diff
==============================================================================
--- incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/internal/PageFlowNavigationHandler.java (original)
+++ incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/internal/PageFlowNavigationHandler.java Thu Jun 23 10:25:04 2005
@@ -83,10 +83,12 @@
try
{
+ //
+ // We only forward to Page Flow actions if there's a page flow appropriate for this request.
+ //
ServletContext servletContext = ( ServletContext ) extContext;
FlowControllerFactory fcFactory = FlowControllerFactory.get( servletContext );
PageFlowController pfc = fcFactory.getPageFlowForRequest( new RequestContext( httpRequest, httpResponse ) );
- PageFlowUtils.getCurrentPageFlow( httpRequest );
if ( pfc != null )
{
Modified: incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/internal/PageFlowViewHandler.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/internal/PageFlowViewHandler.java?rev=193188&r1=193187&r2=193188&view=diff
==============================================================================
--- incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/internal/PageFlowViewHandler.java (original)
+++ incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/internal/PageFlowViewHandler.java Thu Jun 23 10:25:04 2005
@@ -21,15 +21,23 @@
import org.apache.beehive.netui.pageflow.PageFlowController;
import org.apache.beehive.netui.pageflow.PreviousPageInfo;
import org.apache.beehive.netui.pageflow.FacesBackingBean;
+import org.apache.beehive.netui.pageflow.FacesBackingBeanFactory;
+import org.apache.beehive.netui.pageflow.RequestContext;
import org.apache.beehive.netui.pageflow.internal.PageFlowRequestWrapper;
import org.apache.beehive.netui.pageflow.internal.InternalUtils;
import org.apache.beehive.netui.util.internal.FileUtils;
+import org.apache.beehive.netui.script.common.ImplicitObjectUtil;
import javax.faces.application.ViewHandler;
import javax.faces.context.FacesContext;
+import javax.faces.context.ExternalContext;
import javax.faces.component.UIViewRoot;
import javax.faces.FacesException;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
import java.util.Locale;
import java.io.IOException;
import java.io.Serializable;
@@ -92,17 +100,36 @@
}
}
+ private static void setBackingBean( ServletRequest request, ServletResponse response, ServletContext servletContext )
+ {
+ if ( request instanceof HttpServletRequest )
+ {
+ FacesBackingBeanFactory factory = FacesBackingBeanFactory.get( servletContext );
+ FacesBackingBean fbb = factory.getFacesBackingBeanForRequest( new RequestContext( request, response ) );
+
+ if ( fbb != null )
+ {
+ ImplicitObjectUtil.loadFacesBackingBean( request, fbb );
+ }
+ else
+ {
+ ImplicitObjectUtil.unloadFacesBackingBean( request );
+ }
+ }
+ }
+
public UIViewRoot createView(FacesContext context, String viewId)
{
- Object request = context.getExternalContext().getRequest();
+ ExternalContext externalContext = context.getExternalContext();
+ Object request = externalContext.getRequest();
HttpServletRequest httpRequest = null;
- //
- // First, if this is a navigateTo=Jpf.NavigateTo.currentPage or a navigateTo=Jpf.NavigateTo.previousPage,
- // see if we've saved view state from the original page. If so, just restore that.
- //
if ( request instanceof HttpServletRequest )
{
+ //
+ // If this is a navigateTo=Jpf.NavigateTo.currentPage or a navigateTo=Jpf.NavigateTo.previousPage,
+ // see if we've saved view state from the original page. If so, just restore that.
+ //
httpRequest = ( HttpServletRequest ) request;
PageFlowRequestWrapper rw = PageFlowRequestWrapper.unwrap( httpRequest );
@@ -122,6 +149,13 @@
}
}
}
+
+ //
+ // Create/restore the backing bean that corresponds to this request.
+ //
+ HttpServletResponse response = ( HttpServletResponse ) externalContext.getResponse();
+ ServletContext servletContext = ( ServletContext ) externalContext.getContext();
+ setBackingBean( httpRequest, response, servletContext );
}
UIViewRoot viewRoot = _delegate.createView( context, viewId );
@@ -142,6 +176,15 @@
public void renderView(FacesContext context, UIViewRoot viewToRender)
throws IOException, FacesException
{
+ //
+ // Create/restore the backing bean that corresponds to this request.
+ //
+ ExternalContext externalContext = context.getExternalContext();
+ HttpServletRequest request = ( HttpServletRequest ) externalContext.getRequest();
+ HttpServletResponse response = ( HttpServletResponse ) externalContext.getResponse();
+ ServletContext servletContext = ( ServletContext ) externalContext.getContext();
+ setBackingBean( request, response, servletContext );
+
_delegate.renderView( context, viewToRender );
}
@@ -151,7 +194,8 @@
*/
public UIViewRoot restoreView(FacesContext context, String viewId)
{
- Object request = context.getExternalContext().getRequest();
+ ExternalContext externalContext = context.getExternalContext();
+ Object request = externalContext.getRequest();
HttpServletRequest httpRequest = null;
if ( request instanceof HttpServletRequest )
@@ -165,6 +209,14 @@
{
return null;
}
+
+ //
+ // Create/restore the backing bean that corresponds to this request.
+ //
+ HttpServletResponse response = ( HttpServletResponse ) externalContext.getResponse();
+ ServletContext servletContext = ( ServletContext ) externalContext.getContext();
+ setBackingBean( httpRequest, response, servletContext );
+
}
UIViewRoot viewRoot = _delegate.restoreView( context, viewId );
Modified: incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java?rev=193188&r1=193187&r2=193188&view=diff
==============================================================================
--- incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java (original)
+++ incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java Thu Jun 23 10:25:04 2005
@@ -56,7 +56,6 @@
import org.apache.beehive.netui.pageflow.PageFlowEventReporter;
import org.apache.beehive.netui.pageflow.ExpressionMessage;
import org.apache.beehive.netui.pageflow.PageFlowUtils;
-import org.apache.beehive.netui.pageflow.RequestContext;
import org.apache.beehive.netui.pageflow.interceptor.InterceptorException;
import org.apache.beehive.netui.pageflow.handler.ExceptionsHandler;
import org.apache.beehive.netui.pageflow.handler.FlowControllerHandlerContext;
@@ -98,13 +97,32 @@
if ( _log.isInfoEnabled() )
{
- _log.info( "Handling uncaught Throwable " + ex.getClass().getName() );
+ _log.info( "Handling Throwable " + ex.getClass().getName() );
}
+ //
+ // If we're already in the process of handling an exception, bail out.
+ //
+ PageFlowRequestWrapper rw = PageFlowRequestWrapper.get( context.getRequest() );
+ Throwable alreadyBeingHandled = rw.getExceptionBeingHandled();
+
+ if ( alreadyBeingHandled != null )
+ {
+ if ( _log.isDebugEnabled() )
+ {
+ _log.debug( "Already in the process of handling " + alreadyBeingHandled.getClass().getName()
+ + "; bailing out of handling for " + ex.getClass().getName() );
+ }
+
+ throw new UnhandledException( ex );
+ }
+
+ rw.setExceptionBeingHandled( ex );
+
+
// Callback to the event reporter.
- RequestContext rc = new RequestContext( request, response );
ActionMapping originalActionMapping = actionMapping;
- _eventReporter.exceptionRaised( rc, ex, originalActionMapping, form, flowController );
+ _eventReporter.exceptionRaised( context, ex, originalActionMapping, form, flowController );
long startTime = System.currentTimeMillis();
//
@@ -144,7 +162,7 @@
assert request instanceof HttpServletRequest : request.getClass().getName();
InternalUtils.selectModule( flowController.getModuleConfig().getPrefix(),
( HttpServletRequest ) request, getServletContext() );
- PageFlowRequestWrapper.get( request ).setCurrentFlowController( flowController );
+ rw.setCurrentFlowController( flowController );
}
}
@@ -180,7 +198,7 @@
// Callback to the event reporter.
long timeTaken = System.currentTimeMillis() - startTime;
- _eventReporter.exceptionHandled( rc, ex, originalActionMapping, form, flowController, ret, timeTaken );
+ _eventReporter.exceptionHandled( context, ex, originalActionMapping, form, flowController, ret, timeTaken );
return ret;
}
Modified: incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java?rev=193188&r1=193187&r2=193188&view=diff
==============================================================================
--- incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java (original)
+++ incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java Thu Jun 23 10:25:04 2005
@@ -219,6 +219,12 @@
throws ControlFieldInitializationException
{
Class controlClientClass = controlClient.getClass();
+
+ //
+ // First, just return if there are no annotated Control fields. This saves us from having to catch a
+ // (wrapped) ClassNotFoundException for the control client initializer if we were to simply call
+ // Controls.initializeClient().
+ //
Map controlFields = getAccessibleControlFieldAnnotations( controlClientClass, servletContext );
if ( controlFields.isEmpty() ) return;
Modified: incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowRequestWrapper.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowRequestWrapper.java?rev=193188&r1=193187&r2=193188&view=diff
==============================================================================
--- incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowRequestWrapper.java (original)
+++ incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowRequestWrapper.java Thu Jun 23 10:25:04 2005
@@ -41,6 +41,7 @@
public boolean processPopulateAlreadyCalled = false;
public boolean forwardedByButton = false;
public MultipartRequestWrapper multipartRequestWrapper;
+ public Throwable exceptionBeingHandled = null;
}
private State _state = new State();
@@ -188,6 +189,16 @@
public void setMultipartRequestWrapper( MultipartRequestWrapper multipartRequestWrapper )
{
_state.multipartRequestWrapper = multipartRequestWrapper;
+ }
+
+ public Throwable getExceptionBeingHandled()
+ {
+ return _state.exceptionBeingHandled;
+ }
+
+ public void setExceptionBeingHandled( Throwable th )
+ {
+ _state.exceptionBeingHandled = th;
}
public static PageFlowRequestWrapper wrapRequest( HttpServletRequest req )
Modified: incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectUtil.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectUtil.java?rev=193188&r1=193187&r2=193188&view=diff
==============================================================================
--- incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectUtil.java (original)
+++ incubator/beehive/sandbox/ekoneil/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectUtil.java Thu Jun 23 10:25:04 2005
@@ -66,16 +66,23 @@
jspContext.removeAttribute(ACTION_FORM_IMPLICIT_OBJECT_KEY);
}
- public static final void loadPageFlow(ServletRequest request, PageFlowController pageFlow, FacesBackingBean fbb) {
+ public static final void loadPageFlow(ServletRequest request, PageFlowController pageFlow) {
if(pageFlow != null)
request.setAttribute(PAGE_FLOW_IMPLICIT_OBJECT_KEY, pageFlow);
- if(fbb != null)
- request.setAttribute(BACKING_IMPLICIT_OBJECT_KEY, fbb);
Map map = InternalUtils.getPageInputMap(request);
request.setAttribute(PAGE_INPUT_IMPLICIT_OBJECT_KEY, map != null ? map : Collections.EMPTY_MAP);
}
+ public static final void loadFacesBackingBean(ServletRequest request, FacesBackingBean fbb) {
+ if(fbb != null)
+ request.setAttribute(BACKING_IMPLICIT_OBJECT_KEY, fbb);
+ }
+
+ public static final void unloadFacesBackingBean(ServletRequest request) {
+ request.removeAttribute(BACKING_IMPLICIT_OBJECT_KEY);
+ }
+
public static final void loadSharedFlow(ServletRequest request, Map/*<String, SharedFlowController>*/ sharedFlows) {
if(sharedFlows != null)
request.setAttribute(SHARED_FLOW_IMPLICIT_OBJECT_KEY, sharedFlows);
@@ -158,9 +165,7 @@
public static final void loadImplicitObjects(HttpServletRequest request, HttpServletResponse response, ServletContext servletContext, PageFlowController curJpf) {
// @todo: need to wrap this in checks for JSP 1.2
// @todo: feature: need to add support for chaining in user-code to run when setting implicit objects on the request
- FacesBackingBean fbb =
- FacesBackingBeanFactory.get(servletContext).getFacesBackingBeanForRequest(new RequestContext(request, response));
- loadPageFlow(request, curJpf, fbb);
+ loadPageFlow(request, curJpf);
// @todo: need to move bundleMap creation to a BundleMapFactory
BundleMap bundleMap = new BundleMap(request, servletContext);
Propchange: incubator/beehive/sandbox/ekoneil/netui/test/webapps/drt/coreWeb/bugs/j757/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/beehive/sandbox/ekoneil/netui/test/webapps/drt/coreWeb/bugs/j757/error.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/beehive/sandbox/ekoneil/netui/test/webapps/drt/coreWeb/bugs/j757/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/beehive/sandbox/ekoneil/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/sandbox/ekoneil/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml?rev=193188&r1=193187&r2=193188&view=diff
==============================================================================
--- incubator/beehive/sandbox/ekoneil/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml (original)
+++ incubator/beehive/sandbox/ekoneil/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml Thu Jun 23 10:25:04 2005
@@ -10,6 +10,10 @@
<description>bvt</description>
</category>
<category>
+ <name>manualTests</name>
+ <description>manual tests</description>
+ </category>
+ <category>
<name>bvt.struts11</name>
<description>bvt using Struts 1.1</description>
</category>
@@ -3749,6 +3753,17 @@
</features>
</test>
<test>
+ <name>FileUpload</name>
+ <description>MANUAL test of File Upload. TestRecorder does not currently handle multipart requests.</description>
+ <webapp>coreWeb</webapp>
+ <categories>
+ <category>manualTests</category>
+ </categories>
+ <features>
+ <feature>Upload</feature>
+ </features>
+ </test>
+ <test>
<name>FlowControllerFactory</name>
<description>Test to ensure that a FlowControllerFactory can be specified through <flowcontroller-factory> in beehive-netui-config.xml</description>
<webapp>coreWeb</webapp>
@@ -4574,6 +4589,17 @@
<category>bvt</category>
<category>jiraBugs</category>
</categories>
+ </test>
+ <test>
+ <name>J757</name>
+ <description>Test to ensure that if an exception is handled by forwarding to an error page, and the error page itself throws an exception, the second exception is thrown out to the container, to avoid an infinite loop of exception handling.</description>
+ <webapp>coreWeb</webapp>
+ <categories>
+ <category>manualTests</category>
+ </categories>
+ <features>
+ <feature>Exceptions</feature>
+ </features>
</test>
<test>
<name>J785</name>
Propchange: incubator/beehive/sandbox/ekoneil/netui/test/webapps/drt/testRecorder/tests/FileUpload.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/beehive/sandbox/ekoneil/netui/test/webapps/drt/testRecorder/tests/J757.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/beehive/sandbox/ekoneil/netui/test/webapps/drt/testRecorder/tests/LifecycleExceptions.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/sandbox/ekoneil/netui/test/webapps/drt/testRecorder/tests/LifecycleExceptions.xml?rev=193188&r1=193187&r2=193188&view=diff
==============================================================================
--- incubator/beehive/sandbox/ekoneil/netui/test/webapps/drt/testRecorder/tests/LifecycleExceptions.xml (original)
+++ incubator/beehive/sandbox/ekoneil/netui/test/webapps/drt/testRecorder/tests/LifecycleExceptions.xml Thu Jun 23 10:25:04 2005
@@ -432,126 +432,6 @@
<ses:protocolVersion>1.1</ses:protocolVersion>
<ses:host>localhost</ses:host>
<ses:port>8080</ses:port>
- <ses:uri>/coreWeb/miniTests/lifecycleExceptions/throwEverywhere.do</ses:uri>
- <ses:method>GET</ses:method>
- <ses:parameters/>
- <ses:cookies>
- <ses:cookie>
- <ses:name>JSESSIONID</ses:name>
- <ses:value>E3F6BE9D237039148B38CED6D972345E</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=E3F6BE9D237039148B38CED6D972345E</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/coreWeb/miniTests/lifecycleExceptions/throwInAfterAction.do</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[<!--Generated by WebLogic Workshop-->
-
-
-
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en">
-
- <head>
- <title>
- Exceptions in Lifecycle Methods
- </title>
- </head>
- <body>
- <h3>Exceptions in Lifecycle Methods</h3>
-
- <a href="/coreWeb/miniTests/lifecycleExceptions/throwInBeforeAction.do">throw in beforeAction()</a><br>
- <a href="/coreWeb/miniTests/lifecycleExceptions/throwInAction.do">throw in an action</a><br>
- <a href="/coreWeb/miniTests/lifecycleExceptions/throwInAfterAction.do">throw in afterAction()</a><br>
- <a href="/coreWeb/miniTests/lifecycleExceptions/throwEverywhere.do">throw in the action and in afterAction()</a><br>
- <a href="/coreWeb/miniTests/lifecycleExceptions/noThrow.do">don't throw anything</a>
- <br>
- <br>
- <hr>
- History:
- <ul>
-
- <li><span>onCreate</span>
- threw a <span>miniTests.lifecycleExceptions.lifecycleExceptionsController$OnCreateException</span>
- (<span></span>)</li>
-
- <li><span>beforeAction</span>
- threw a <span>miniTests.lifecycleExceptions.lifecycleExceptionsController$BeforeActionException</span>
- (<span>throwInBeforeAction</span>)</li>
-
- <li><span>action method</span>
- threw a <span>miniTests.lifecycleExceptions.lifecycleExceptionsController$ActionMethodException</span>
- (<span>throwInAction</span>)</li>
-
- <li><span>afterAction</span>
- threw a <span>miniTests.lifecycleExceptions.lifecycleExceptionsController$AfterActionException</span>
- (<span>throwInAfterAction</span>)</li>
-
- <li><span>action method</span>
- threw a <span>miniTests.lifecycleExceptions.lifecycleExceptionsController$ActionMethodException</span>
- (<span>throwEverywhere</span>)</li>
-
- <li><span>afterAction</span>
- threw a <span>miniTests.lifecycleExceptions.lifecycleExceptionsController$AfterActionException</span>
- (<span>throwEverywhere</span>)</li>
-
- </ul>
- </body>
-
-</html>]]></ses:responseBody>
- </ses:response>
- </ses:test>
- <ses:test>
- <ses:testNumber>6</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>/coreWeb/miniTests/lifecycleExceptions/noThrow.do</ses:uri>
<ses:method>GET</ses:method>
<ses:parameters/>
@@ -651,14 +531,6 @@
threw a <span>miniTests.lifecycleExceptions.lifecycleExceptionsController$AfterActionException</span>
(<span>throwInAfterAction</span>)</li>
- <li><span>action method</span>
- threw a <span>miniTests.lifecycleExceptions.lifecycleExceptionsController$ActionMethodException</span>
- (<span>throwEverywhere</span>)</li>
-
- <li><span>afterAction</span>
- threw a <span>miniTests.lifecycleExceptions.lifecycleExceptionsController$AfterActionException</span>
- (<span>throwEverywhere</span>)</li>
-
</ul>
</body>
@@ -667,5 +539,5 @@
</ses:test>
</ses:tests>
<ses:endDate>26 Jan 2005, 12:32:46.165 AM MST</ses:endDate>
- <ses:testCount>6</ses:testCount>
+ <ses:testCount>5</ses:testCount>
</ses:recorderSession>
Propchange: incubator/beehive/sandbox/ekoneil/netui/test/webapps/jsf/jsfWeb/onCreate/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/beehive/sandbox/ekoneil/netui/test/webapps/jsf/jsfWeb/onCreate/page1.jsfb
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/beehive/sandbox/ekoneil/netui/test/webapps/jsf/jsfWeb/onCreate/page1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/beehive/sandbox/ekoneil/netui/test/webapps/jsf/jsfWeb/onCreate/page2.jsfb
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/beehive/sandbox/ekoneil/netui/test/webapps/jsf/jsfWeb/onCreate/page2.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/beehive/sandbox/ekoneil/netui/test/webapps/jsf/testRecorder/config/testRecorder-tests.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/sandbox/ekoneil/netui/test/webapps/jsf/testRecorder/config/testRecorder-tests.xml?rev=193188&r1=193187&r2=193188&view=diff
==============================================================================
--- incubator/beehive/sandbox/ekoneil/netui/test/webapps/jsf/testRecorder/config/testRecorder-tests.xml (original)
+++ incubator/beehive/sandbox/ekoneil/netui/test/webapps/jsf/testRecorder/config/testRecorder-tests.xml Thu Jun 23 10:25:04 2005
@@ -103,6 +103,15 @@
</categories>
</test>
<test>
+ <name>OnCreate</name>
+ <description>Test to ensure that the FacesContext is available during onCreate() in a backing bean, and that the backing bean is still available to the JSF page for databinding.</description>
+ <webapp>jsfWeb</webapp>
+ <categories>
+ <category>drt</category>
+ <category>bvt</category>
+ </categories>
+ </test>
+ <test>
<name>RestorePreviousBackingBean</name>
<description>Test of restoring the backing bean of a JSF page when returning to it through navigateTo=Jpf.NavigateTo.currentPage or navigateTo=Jpf.NavigateTo.previousPage.</description>
<webapp>jsfWeb</webapp>
Propchange: incubator/beehive/sandbox/ekoneil/netui/test/webapps/jsf/testRecorder/tests-jsf-ri/OnCreate.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/beehive/sandbox/ekoneil/netui/test/webapps/jsf/testRecorder/tests-myfaces/OnCreate.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/beehive/sandbox/ekoneil/system-controls/test/src/webservice/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/sandbox/ekoneil/system-controls/test/src/webservice/build.xml?rev=193188&r1=193187&r2=193188&view=diff
==============================================================================
--- incubator/beehive/sandbox/ekoneil/system-controls/test/src/webservice/build.xml (original)
+++ incubator/beehive/sandbox/ekoneil/system-controls/test/src/webservice/build.xml Thu Jun 23 10:25:04 2005
@@ -67,6 +67,28 @@
<path refid="commons-discovery.dependency.path"/>
</path>
+
+ <target name="drt_debug">
+ <antcall target="build-client"/>
+ <junit failureproperty="drtfailed"
+ printsummary="on"
+ tempdir="${client.build}"
+ fork="yes">
+ <classpath>
+ <path refid="client.classpath"/>
+ <pathelement location="${client.classes}"/>
+ </classpath>
+ <formatter type="plain"/>
+ <batchtest filtertrace="off" todir="${log.dir}">
+ <fileset dir="${junit-source.dir}">
+<!-- <include name="**/SanityTest.java"/> -->
+ <include name="**/SoapMarshallingDocLitBareArrayTypesTest.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+
+ </target>
+
<!-- =================================================================== -->
<!-- drt - run the webservice control DRTs -->
<!-- =================================================================== -->