Author: rich
Date: Thu Jan 27 23:27:33 2005
New Revision: 148860
URL: http://svn.apache.org/viewcvs?view=rev&rev=148860
Log:
Changed the message bundle-related annotations and the error/errors tags to
have sensible attribute names. Where before we had this:
@Jpf.Controller(
messageResources={
@Jpf.MessageResource(name="foo.bar.Messages",
bundleKey="myMessages"),
@Jpf.MessageResource(name="some/other/Messages",
bundleKey="moreMessages"),
...
}
)
...now we have:
@Jpf.Controller(
messageBundles={
@Jpf.MessageBundle(bundlePath="foo.bar.Messages",
bundleName="myMessages"),
@Jpf.MessageBundle(bundlePath="some/other/Messages",
bundleName="moreMessages"),
...
}
)
In the error tag, where we had this:
<netui:error value="zipCode" bundle="myMessages"/>
...now we have:
<netui:error key="zipCode" bundleName="myMessages"/>
Note that for now, the 'value' and 'bundle' attributes on
netui:error/netui:errors are deprecated, not removed. When the dust settles
from this checkin, I can remove them.
Also, disabled the use of Commons Discovery until it's reenabled in Controls.
DRT/BVT: netui (WinXP)
BB: self (linux)
Added:
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenMessageBundleModel.java
(contents, props changed)
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/MessageBundleGrammar.java
(contents, props changed)
Removed:
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenMessageResourcesModel.java
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/MessageResourcesGrammar.java
Modified:
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerInfo.java
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/JpfLanguageConstants.java
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/MergedControllerAnnotation.java
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenStrutsApp.java
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ControllerGrammar.java
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/StrutsApp.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterManager.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractSimpleTag.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Errors.java
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628/error2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628b/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628b/error2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628b/foo/error.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/error/nullbinding/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/struts/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/i18n/localeOverride/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/jpfScopedForms/test55/Jpf1.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/blankCountryValue/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValid/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValidAnnot/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValidAnnot/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/pageFlowUtilsController.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/validation.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNested/getZip/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNested/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNestedPopup/getZip/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNestedPopup/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/upload/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/validateField/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/validation/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/variantValidation/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug26856/Jpf1.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/exceptions/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/inputPage.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/returnToTestController.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test12/Jpf1.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test12/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test23/Jpf1.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test63/Jpf1.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errors2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errors3.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errors4.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errorsController.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/message/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test54/Jpf1.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test56/Jpf1.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test57/Jpf1.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test57/sub1/SubJpf1.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test58/Jpf1.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test58/Jsp2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/addExpressionMessages/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/addExpressionMessages/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/basicValidation/basicValidationController.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/basicValidation/formPage.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/custom/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/declarativeValidation/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/defaultMessages/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/strutsValidator/formPage.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/strutsValidator/strutsValidatorController.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/validationController.jpf
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtErrorNullBinding.xml
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/login/index.jsp
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/accountFields.tag
incubator/beehive/trunk/samples/petstoreWeb/account/create/Controller.jpf
incubator/beehive/trunk/samples/petstoreWeb/account/create/create.jsp
incubator/beehive/trunk/samples/petstoreWeb/account/edit/Controller.jpf
incubator/beehive/trunk/samples/petstoreWeb/checkout/Controller.jpf
incubator/beehive/trunk/samples/petstoreWeb/checkout/newOrder.jsp
incubator/beehive/trunk/samples/petstoreWeb/shop/cart.jsp
Modified:
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerInfo.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerInfo.java?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerInfo.java&r1=148859&p2=incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerInfo.java&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerInfo.java
(original)
+++
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerInfo.java
Thu Jan 27 23:27:33 2005
@@ -20,7 +20,6 @@
import com.sun.mirror.declaration.TypeDeclaration;
import com.sun.mirror.declaration.ClassDeclaration;
import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.type.ClassType;
import com.sun.mirror.type.TypeMirror;
import com.sun.mirror.type.DeclaredType;
import com.sun.mirror.apt.AnnotationProcessorEnvironment;
@@ -52,7 +51,7 @@
private Map< String, File > _sharedFlowFiles = Collections.emptyMap();
private List< File > _referencedFiles = new ArrayList< File >();
private boolean _isBuilding = false;
- private Map< String, String > _messageResourcesByKey = new HashMap<
String, String >();
+ private Map< String, String > _messageBundlesByName = new HashMap< String,
String >();
private boolean _navigateToActionEnabled = false;
private boolean _navigateToPageEnabled = false;
private boolean _isNested;
@@ -304,14 +303,14 @@
_webappRoot = webappRoot;
}
- public Map< String, String > getMessageResourcesByKey()
+ public Map< String, String > getMessageBundlesByName()
{
- return _messageResourcesByKey;
+ return _messageBundlesByName;
}
- public void addMessageResource( String key, String name )
+ public void addMessageBundle( String bundleName, String bundlePath )
{
- _messageResourcesByKey.put( key, name );
+ _messageBundlesByName.put( bundleName, bundlePath );
}
public String getControllerClassName()
Modified:
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/JpfLanguageConstants.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/JpfLanguageConstants.java?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/JpfLanguageConstants.java&r1=148859&p2=incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/JpfLanguageConstants.java&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/JpfLanguageConstants.java
(original)
+++
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/JpfLanguageConstants.java
Thu Jan 27 23:27:33 2005
@@ -31,7 +31,7 @@
public static final String FORWARD_TAG_NAME = "Forward";
public static final String CATCH_TAG_NAME = "Catch";
public static final String CONTROLLER_TAG_NAME = "Controller";
- public static final String MESSAGE_RESOURCE_TAG_NAME = "MessageResource";
+ public static final String MESSAGE_BUNDLE_TAG_NAME = "MessageBundle";
public static final String VIEW_PROPERTIES_TAG_NAME = "ViewProperties";
public static final String VALIDATION_LOCALE_RULES_TAG_NAME =
"ValidationLocaleRules";
public static final String VALIDATION_BEAN_TAG_NAME = "ValidationBean";
@@ -94,7 +94,7 @@
public static final String ANNOTATION_INTERFACE_PREFIX = "Jpf.";
public static final String NAVIGATE_TO_ENUM = "NavigateTo";
public static final String DEFAULT_VALIDATION_MESSAGE_BUNDLE =
PAGEFLOW_PACKAGE + ".validation.defaultMessages";
- public static final String DEFAULT_VALIDATION_MESSAGE_BUNDLE_KEY =
"_defaultValidationMessages";
+ public static final String DEFAULT_VALIDATION_MESSAGE_BUNDLE_NAME =
"_defaultValidationMessages";
public static final String DEFAULT_SIMPLE_ACTION_FORWARD_NAME =
"_defaultForward";
public static final String NESTED_ATTR = "nested";
@@ -128,7 +128,8 @@
public static final String TYPE_ATTR = "type";
public static final String REDIRECT_ATTR = "redirect";
public static final String EXTERNAL_REDIRECT_ATTR = "externalRedirect";
- public static final String BUNDLE_KEY_ATTR = "bundleKey";
+ public static final String BUNDLE_PATH_ATTR = "bundlePath";
+ public static final String BUNDLE_NAME_ATTR = "bundleName";
public static final String ACTION_OUTPUTS_ATTR = "actionOutputs";
public static final String NULLABLE_ATTR = "nullable";
public static final String REQUIRED_ATTR = "required";
@@ -136,7 +137,7 @@
public static final String READONLY_ATTR = "readOnly";
public static final String RESTORE_QUERY_STRING_ATTR =
"restoreQueryString";
public static final String VALUE_ATTR = "value";
- public static final String MESSAGE_RESOURCES_ATTR = "messageResources";
+ public static final String MESSAGE_BUNDLES_ATTR = "messageBundles";
public static final String FORWARDS_ATTR = "forwards";
public static final String CATCHES_ATTR = "catches";
public static final String VALIDATION_ERROR_FORWARD_ATTR =
"validationErrorForward";
@@ -156,7 +157,7 @@
public static final String VALIDATE_VALID_WHEN_ATTR = "validateValidWhen";
public static final String VALIDATE_CUSTOM_ATTR = "validateCustomRules";
public static final String VALIDATABLE_PROPERTIES_ATTR =
"validatableProperties";
- public static final String DEFAULT_MESSAGE_RESOURCES_ATTR =
"messageBundle";
+ public static final String MESSAGE_BUNDLE_ATTR = "messageBundle";
public static final String APPLY_TO_UNHANDLED_LOCALES_ATTR =
"applyToUnhandledLocales";
public static final String VALIDATION_BEANS_ATTR = "validationBeans";
public static final String ACTION_ATTR = "action";
Modified:
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/MergedControllerAnnotation.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/MergedControllerAnnotation.java?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/MergedControllerAnnotation.java&r1=148859&p2=incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/MergedControllerAnnotation.java&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/MergedControllerAnnotation.java
(original)
+++
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/MergedControllerAnnotation.java
Thu Jan 27 23:27:33 2005
@@ -45,6 +45,7 @@
private LinkedHashMap< String, AnnotationMirror > _simpleActions = new
LinkedHashMap< String, AnnotationMirror >();
private LinkedHashMap< String, AnnotationMirror > _validatableBeans = new
LinkedHashMap< String, AnnotationMirror >();
private LinkedHashMap< String, AnnotationMirror> _messageResources = new
LinkedHashMap< String, AnnotationMirror >();
+ private LinkedHashMap< String, AnnotationMirror> _messageBundles = new
LinkedHashMap< String, AnnotationMirror >();
private String _multipartHandler;
public MergedControllerAnnotation( TypeDeclaration jclass )
@@ -81,7 +82,7 @@
mergeAnnotationArray( _catches, controllerAnnotation, CATCHES_ATTR,
TYPE_ATTR );
mergeAnnotationArray( _simpleActions, controllerAnnotation,
SIMPLE_ACTIONS_ATTR, NAME_ATTR );
mergeAnnotationArray( _validatableBeans, controllerAnnotation,
VALIDATABLE_BEANS_ATTR, TYPE_ATTR );
- mergeAnnotationArray( _messageResources, controllerAnnotation,
MESSAGE_RESOURCES_ATTR, NAME_ATTR );
+ mergeAnnotationArray( _messageBundles, controllerAnnotation,
MESSAGE_BUNDLES_ATTR, BUNDLE_PATH_ATTR );
String multipartHandler = CompilerUtils.getEnumFieldName(
controllerAnnotation, MULTIPART_HANDLER_ATTR, true );
if ( multipartHandler != null ) _multipartHandler = multipartHandler;
@@ -191,6 +192,11 @@
public Collection< AnnotationMirror > getMessageResources()
{
return _messageResources.values();
+ }
+
+ public Collection< AnnotationMirror > getMessageBundles()
+ {
+ return _messageBundles.values();
}
public String getMultipartHandler()
Added:
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenMessageBundleModel.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenMessageBundleModel.java?view=auto&rev=148860
==============================================================================
--- (empty file)
+++
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenMessageBundleModel.java
Thu Jan 27 23:27:33 2005
@@ -0,0 +1,39 @@
+/*
+ * 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:$
+ */
+package org.apache.beehive.netui.compiler.genmodel;
+
+import org.apache.beehive.netui.compiler.model.StrutsApp;
+import org.apache.beehive.netui.compiler.model.MessageResourcesModel;
+import org.apache.beehive.netui.compiler.CompilerUtils;
+import com.sun.mirror.declaration.AnnotationMirror;
+
+import static
org.apache.beehive.netui.compiler.JpfLanguageConstants.BUNDLE_PATH_ATTR;
+import static
org.apache.beehive.netui.compiler.JpfLanguageConstants.BUNDLE_NAME_ATTR;
+
+public class GenMessageBundleModel
+ extends MessageResourcesModel
+{
+ public GenMessageBundleModel( StrutsApp parent, AnnotationMirror
annotation )
+ {
+ super( parent );
+
+ setParameter( CompilerUtils.getString( annotation, BUNDLE_PATH_ATTR,
true ) );
+ setKey( CompilerUtils.getString( annotation, BUNDLE_NAME_ATTR, true )
);
+ setReturnNull( true );
+ }
+}
Deleted:
/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenMessageResourcesModel.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenMessageResourcesModel.java?view=auto&rev=148859
==============================================================================
Modified:
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenStrutsApp.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenStrutsApp.java?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenStrutsApp.java&r1=148859&p2=incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenStrutsApp.java&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenStrutsApp.java
(original)
+++
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenStrutsApp.java
Thu Jan 27 23:27:33 2005
@@ -98,7 +98,8 @@
MergedControllerAnnotation mca =
fcInfo.getMergedControllerAnnotation();
setNestedPageFlow( mca.isNested() );
setLongLivedPageFlow( mca.isLongLived() );
- addMessageResources( mca.getMessageResources() );
+ addMessageResources( mca.getMessageResources() ); //
messageResources is deprecated
+ addMessageBundles( mca.getMessageBundles() ); // messageBundles
is not
addSimpleActions( mca.getSimpleActions() );
setMultipartHandler( mca.getMultipartHandler() );
GenForwardModel.addForwards( mca.getForwards(), this, _jclass,
this, null );
@@ -183,17 +184,19 @@
{
for ( AnnotationMirror ann : messageResources )
{
- addMessageResources( new GenMessageResourcesModel( this, ann )
);
+ addMessageResources( new GenMessageBundleModel( this, ann ) );
}
}
}
- private void addValidationMessages( Collection< AnnotationMirror >
validationMessages )
+ private void addMessageBundles( Collection< AnnotationMirror >
messageBundles )
{
- if ( validationMessages != null )
+ if ( messageBundles != null )
{
- String packagePrefix = _jclass.getPackage().getQualifiedName();
- if ( packagePrefix != null ) packagePrefix += '.';
+ for ( AnnotationMirror ann : messageBundles )
+ {
+ addMessageResources( new GenMessageBundleModel( this, ann ) );
+ }
}
}
@@ -282,7 +285,7 @@
if ( ann != null )
{
- String defaultMessageResources = CompilerUtils.getString( ann,
DEFAULT_MESSAGE_RESOURCES_ATTR, true );
+ String defaultMessageResources = CompilerUtils.getString( ann,
MESSAGE_BUNDLE_ATTR, true );
if ( defaultMessageResources != null )
{
Modified:
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ControllerGrammar.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ControllerGrammar.java?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ControllerGrammar.java&r1=148859&p2=incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ControllerGrammar.java&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ControllerGrammar.java
(original)
+++
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ControllerGrammar.java
Thu Jan 27 23:27:33 2005
@@ -47,7 +47,7 @@
addMemberArrayGrammar( SHARED_FLOW_REFS_ATTR, new
SharedFlowRefGrammar( env, diags, rvc ) );
addMemberArrayGrammar( FORWARDS_ATTR, new ForwardGrammar( env, diags,
null, rvc, fcInfo ) );
addMemberArrayGrammar( CATCHES_ATTR, new CatchGrammar( env, diags,
null, rvc, CONTROLLER_TAG_NAME, fcInfo ) );
- addMemberArrayGrammar( MESSAGE_RESOURCES_ATTR, new
MessageResourcesGrammar( env, diags, null, rvc, fcInfo ) );
+ addMemberArrayGrammar( MESSAGE_BUNDLES_ATTR, new MessageBundleGrammar(
env, diags, null, rvc, fcInfo ) );
addMemberArrayGrammar( VALIDATABLE_BEANS_ATTR, new
ValidatableBeanGrammar( env, diags, rvc ) );
addMemberArrayGrammar( SIMPLE_ACTIONS_ATTR, new SimpleActionGrammar(
env, diags, rvc, fcInfo ) );
}
Added:
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/MessageBundleGrammar.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/MessageBundleGrammar.java?view=auto&rev=148860
==============================================================================
--- (empty file)
+++
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/MessageBundleGrammar.java
Thu Jan 27 23:27:33 2005
@@ -0,0 +1,76 @@
+/*
+ * 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:$
+ */
+package org.apache.beehive.netui.compiler.grammar;
+
+import org.apache.beehive.netui.compiler.RuntimeVersionChecker;
+import org.apache.beehive.netui.compiler.Diagnostics;
+import org.apache.beehive.netui.compiler.CompilerUtils;
+import org.apache.beehive.netui.compiler.FlowControllerInfo;
+import com.sun.mirror.apt.AnnotationProcessorEnvironment;
+import com.sun.mirror.declaration.AnnotationMirror;
+import com.sun.mirror.declaration.MemberDeclaration;
+
+import static
org.apache.beehive.netui.compiler.JpfLanguageConstants.BUNDLE_NAME_ATTR;
+import static
org.apache.beehive.netui.compiler.JpfLanguageConstants.MESSAGE_BUNDLES_ATTR;
+import static
org.apache.beehive.netui.compiler.JpfLanguageConstants.BUNDLE_PATH_ATTR;
+
+import java.util.Map;
+import java.util.List;
+
+
+public class MessageBundleGrammar
+ extends BaseFlowControllerGrammar
+{
+ public MessageBundleGrammar( AnnotationProcessorEnvironment env,
Diagnostics diags,
+ String requiredRuntimeVersion,
RuntimeVersionChecker runtimeVersionChecker,
+ FlowControllerInfo fcInfo )
+ {
+ super( env, diags, requiredRuntimeVersion, runtimeVersionChecker,
fcInfo );
+
+ addMemberType( BUNDLE_PATH_ATTR,
+ new UniqueValueType( MESSAGE_BUNDLES_ATTR, false,
false, null, this ) );
+ addMemberType( BUNDLE_NAME_ATTR, new UniqueValueType(
MESSAGE_BUNDLES_ATTR, true, true, null, this ) );
+ }
+
+ protected Object onEndCheck( AnnotationMirror annotation,
AnnotationMirror[] parentAnnotations,
+ MemberDeclaration classMember, Map
checkResults )
+ {
+ String bundlePath = CompilerUtils.getString( annotation,
BUNDLE_PATH_ATTR, false );
+ String bundleName = CompilerUtils.getString( annotation,
BUNDLE_NAME_ATTR, false );
+
+ if ( bundleName.length() == 0 )
+ {
+ AnnotationMirror immediateParent =
parentAnnotations[parentAnnotations.length - 1];
+ List< AnnotationMirror > peerAnnotations =
+ CompilerUtils.getAnnotationArray( immediateParent,
MESSAGE_BUNDLES_ATTR, false );
+
+ for ( AnnotationMirror peerAnnotation : peerAnnotations )
+ {
+ if ( ! CompilerUtils.annotationsAreEqual( annotation,
peerAnnotation, false, getEnv() )
+ && CompilerUtils.getString( peerAnnotation,
BUNDLE_NAME_ATTR, false ).length() == 0 )
+ {
+ addError( annotation,
"error.multiple-default-message-resources", BUNDLE_NAME_ATTR );
+ }
+ }
+ }
+
+ getFlowControllerInfo().addMessageBundle( bundleName, bundlePath );
+
+ return null;
+ }
+}
Deleted:
/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/MessageResourcesGrammar.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/MessageResourcesGrammar.java?view=auto&rev=148859
==============================================================================
Modified:
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/StrutsApp.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/StrutsApp.java?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/StrutsApp.java&r1=148859&p2=incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/StrutsApp.java&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/StrutsApp.java
(original)
+++
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/StrutsApp.java
Thu Jan 27 23:27:33 2005
@@ -40,7 +40,7 @@
import static
org.apache.beehive.netui.compiler.JpfLanguageConstants.PAGEFLOW_PACKAGE;
import static
org.apache.beehive.netui.compiler.JpfLanguageConstants.STRUTS_PACKAGE;
import static
org.apache.beehive.netui.compiler.JpfLanguageConstants.DEFAULT_VALIDATION_MESSAGE_BUNDLE;
-import static
org.apache.beehive.netui.compiler.JpfLanguageConstants.DEFAULT_VALIDATION_MESSAGE_BUNDLE_KEY;
+import static
org.apache.beehive.netui.compiler.JpfLanguageConstants.DEFAULT_VALIDATION_MESSAGE_BUNDLE_NAME;
public class StrutsApp
@@ -102,7 +102,7 @@
//
MessageResourcesModel mrm = new MessageResourcesModel( this );
mrm.setParameter( DEFAULT_VALIDATION_MESSAGE_BUNDLE );
- mrm.setKey( DEFAULT_VALIDATION_MESSAGE_BUNDLE_KEY );
+ mrm.setKey( DEFAULT_VALIDATION_MESSAGE_BUNDLE_NAME );
mrm.setReturnNull( true );
addMessageResources( mrm );
}
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java&r1=148859&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java
Thu Jan 27 23:27:33 2005
@@ -111,10 +111,7 @@
*/
ValidatableBean[] validatableBeans() default {};
- /**
- * message resources (optional )
- */
- MessageResource[] messageResources() default {};
+ MessageBundle[] messageBundles() default {};
MultipartHandler multipartHandler() default MultipartHandler.disabled;
}
@@ -491,15 +488,12 @@
boolean nullable() default false;
}
- /**
- * Was jpf:message-resources
- */
@Target( ANNOTATION_TYPE )
@Retention( RUNTIME )
- public @interface MessageResource
+ public @interface MessageBundle
{
- String name(); // required - no default
- String bundleKey() default ""; // optional
+ String bundlePath(); // required - no default
+ String bundleName() default ""; // optional
}
public enum NavigateTo
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterManager.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterManager.java?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterManager.java&r1=148859&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterManager.java&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterManager.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterManager.java
Thu Jan 27 23:27:33 2005
@@ -19,17 +19,8 @@
import org.apache.beehive.netui.pageflow.DefaultServletContainerAdapter;
import org.apache.beehive.netui.pageflow.ServletContainerAdapter;
-import org.apache.beehive.netui.util.logging.Logger;
import org.apache.beehive.netui.util.DiscoveryUtils;
-import org.apache.commons.discovery.resource.classes.DiscoverClasses;
-import org.apache.commons.discovery.resource.ClassLoaders;
-import org.apache.commons.discovery.resource.names.DiscoverServiceNames;
-import org.apache.commons.discovery.ResourceClassIterator;
-import org.apache.commons.discovery.ResourceClass;
-import org.apache.commons.discovery.ResourceNameIterator;
-import org.apache.commons.discovery.DiscoveryException;
-import org.apache.commons.discovery.tools.DiscoverClass;
-import org.apache.commons.discovery.tools.SPInterface;
+import org.apache.beehive.netui.util.logging.Logger;
import javax.servlet.ServletContext;
@@ -120,6 +111,7 @@
return null;
}
+ /*
private static Class loadClass( ClassLoaders classLoaders, String
className, Class spiClass )
{
for ( int i = 0; i < classLoaders.size(); ++i )
@@ -137,6 +129,7 @@
_log.error( "Could not load class " + className + " to implement " +
spiClass.getName() );
return null;
}
+ */
private static ServletContainerAdapter createServletContainerAdapter(
ServletContext servletContext )
{
@@ -155,7 +148,7 @@
}
}
-
+ /*
ClassLoaders loaders = ClassLoaders.getAppLoaders(
ServletContainerAdapter.class, AdapterManager.class, true );
DiscoverServiceNames dsn = new DiscoverServiceNames( loaders );
ResourceNameIterator i = dsn.findResourceNames(
ServletContainerAdapter.class.getName() );
@@ -170,6 +163,16 @@
( ServletContainerAdapter ) tryAdapter( adapterClass,
servletContext );
if ( sa != null ) return sa;
}
+ }
+
+ */
+
+ Class[] classes = DiscoveryUtils.getImplementorClasses(
ServletContainerAdapter.class );
+
+ for ( int i = 0; i < classes.length; i++ )
+ {
+ ServletContainerAdapter sa = ( ServletContainerAdapter )
tryAdapter( classes[i], servletContext );
+ if ( sa != null ) return sa;
}
_log.info( "No ServletContainerAdapter specified or discovered; using
" + DefaultServletContainerAdapter.class );
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractSimpleTag.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractSimpleTag.java?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractSimpleTag.java&r1=148859&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractSimpleTag.java&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractSimpleTag.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractSimpleTag.java
Thu Jan 27 23:27:33 2005
@@ -67,8 +67,8 @@
protected final String setRequiredValueAttribute(String attrValue, String
attrName)
throws JspException
{
- assert(attrValue != null) : "parameter 'attrValue' must not be null";
- assert(attrName != null) : "parameter 'attrName' must not be null";
+ assert(attrValue != null) : "parameter '" + attrValue + "' must not be
null";
+ assert(attrName != null) : "parameter '" + attrName + "' must not be
null";
if ("".equals(attrValue)) {
String s = Bundle.getString("Tags_AttrValueRequired", new
Object[]{attrName});
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java&r1=148859&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java
Thu Jan 27 23:27:33 2005
@@ -28,7 +28,7 @@
import java.util.Iterator;
/**
- * Renders an error message with a given error key value if that key can be
found in the
+ * Renders an error message with a given error key if that key can be found in
the
* ActionMessages registered in the <code>pageContext</code> at
* <code>org.apache.struts.action.Action.ERROR_KEY</code>. Error ignores its
body content.
* <p>
@@ -40,7 +40,7 @@
* <li><b>error.suffix</b> - If present, the corresponding message will be
* rendered after each individual error message.</li>
* </ul>
- * @jsptagref.tagdescription Renders an error message with a given error key
value if that key can be found in the
+ * @jsptagref.tagdescription Renders an error message with a given error key
if that key can be found in the
* ActionMessages registered in the <code>PageContext</code> at
* <code>org.apache.struts.action.Action.ERROR_KEY</code>.
*
@@ -56,13 +56,13 @@
* </blockquote>
* @example In this sample, the "InvalidName" message from the errorMessages
bundle will be used to output the error.
* <pre>
- * <netui:error bundle="com.project.errorMessages"
value="InvalidName"/></pre>
- * @netui:tag name="error" body-content="empty" description="Renders an error
message with a given error key value."
+ * <netui:error bundleName="errorMessages" key="InvalidName"/></pre>
+ * @netui:tag name="error" body-content="empty" description="Renders an error
message with a given error key."
* @netui.tldx:tag requiredchild="#nothing"
renderer="workshop.netui.jspdesigner.tldx.ErrorRenderer"
bodycontentpref="empty" whitespace="indent"
*/
public class Error extends ErrorBaseTag
{
- private String _value = null; // error key name, may be an expression
+ private String _key = null; // error key name, may be an expression
/**
* Return the name of the Tag.
@@ -73,19 +73,37 @@
}
/**
- * Set the value of the error key.
- * @param value - the error key value
- * @jsptagref.attributedescription The value for getting the error key
+ * Set the key under which the error was stored (often the name of the
form bean property associated with the error).
+ * @deprecated Use [EMAIL PROTECTED] #setKey} instead.
+ * @param value - the key under which the error was stored
+ * @jsptagref.attributedescription The key under which the error was
stored (often the name of the form bean property associated with the error)
* @jsptagref.databindable Read Only
* @jsptagref.attributesyntaxvalue <i>string_or_expression_value</i>
- * @netui:attribute required="true" rtexprvalue="true"
- * description="The value for getting the error key"
+ * @netui:attribute required="false" rtexprvalue="true"
+ * description="The key under which the error was stored (often the name
of the form bean property associated with the error)"
* @netui.tldx:attribute
*/
public void setValue(String value)
throws JspException
{
- _value = setRequiredValueAttribute(value, "value");
+ setKey(value);
+ }
+
+ /**
+ * Set the key under which the error was stored (often the name of the
form bean property associated with the error).
+ * @param key - the key under which the error was stored
+ * @jsptagref.attributedescription The key under which the error was
stored (often the name of the form bean property associated with the error)
+ * @jsptagref.databindable Read Only
+ * @jsptagref.attributesyntaxvalue <i>string_or_expression_key</i>
+ * @netui:attribute required="false" rtexprvalue="true"
+ * description="The key under which the error was stored (often the name
of the form bean property associated with the error)"
+ * @netui.tldx:attribute
+ */
+ public void setKey(String key)
+ throws JspException
+ {
+ // TODO: make this netui:attribute required="true" when the deprecated
setValue() is removed
+ _key = setRequiredValueAttribute(key, "key");
}
/**
@@ -117,7 +135,7 @@
return;
}
- String qualifiedBundle = getQualifiedBundleName(_bundle);
+ String qualifiedBundle = getQualifiedBundleName(_bundleName);
boolean prefixPresent = false;
boolean suffixPresent = false;
@@ -144,7 +162,7 @@
String message = null;
Iterator reports = null;
- reports = errors.get(_value);
+ reports = errors.get(_key);
while (reports.hasNext()) {
ActionMessage report = (ActionMessage) reports.next();
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java&r1=148859&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java
Thu Jan 27 23:27:33 2005
@@ -49,10 +49,11 @@
protected static Locale defaultLocale = Locale.getDefault();
/**
- * The message bundle where the error messages can be found.
- * This defaults to org.apache.struts.action.Action.MESSAGES_KEY.
+ * The name of the message bundle, as defined in the page flow's
+ * [EMAIL PROTECTED]
org.apache.beehive.netui.pageflow.annotations.Jpf.MessageBundle} annotation,
+ * where the error messages can be found. This defaults to
org.apache.struts.action.Action.MESSAGES_KEY.
*/
- protected String _bundle = null;
+ protected String _bundleName = null;
/**
* The session attribute key for the locale.
@@ -61,15 +62,32 @@
protected String _locale = Globals.LOCALE_KEY;
/**
- * Set the name of the message bundle.
+ * Set the name of the message bundle, as defined in the page flow's
+ * [EMAIL PROTECTED]
org.apache.beehive.netui.pageflow.annotations.Jpf.MessageBundle} annotation,
where the error messages
+ * can be found. If this attribute is not set, the page flow's default
message bundle is used.
+ * @deprecated Use [EMAIL PROTECTED] #setBundleName} instead.
* @param bundle - the bundle name
* @netui:attribute required="false" rtexprvalue="true"
- * description="The name of the message bundle."
+ * description="The name of the message bundle, as defined in the page
flow's Jpf.MessageBundle annotation."
*/
public final void setBundle(String bundle)
throws JspException
{
- _bundle = setRequiredValueAttribute(bundle, "bundle");
+ setBundleName(bundle);
+ }
+
+ /**
+ * Set the name of the message bundle, as defined in the page flow's
+ * [EMAIL PROTECTED]
org.apache.beehive.netui.pageflow.annotations.Jpf.MessageBundle} annotation,
where the error messages
+ * can be found. If this attribute is not set, the page flow's default
message bundle is used.
+ * @param bundleName - the bundle name
+ * @netui:attribute required="false" rtexprvalue="true"
+ * description="The name of the message bundle, as defined in the page
flow's Jpf.MessageBundle annotation."
+ */
+ public final void setBundleName(String bundleName)
+ throws JspException
+ {
+ _bundleName = setRequiredValueAttribute(bundleName, "bundleName");
}
/**
@@ -114,7 +132,7 @@
* @return message
* @throws JspException
*/
- protected String getErrorMessage(ActionMessage report, String bundle)
+ protected String getErrorMessage(ActionMessage report, String bundleName)
throws JspException
{
String message = null;
@@ -170,12 +188,12 @@
}
}
else {
- boolean requestedSpecificBundle = (bundle != null);
+ boolean requestedSpecificBundle = (bundleName != null);
boolean missingUserDefaultMessages =
isMissingUserDefaultMessages(pageContext);
// First look in the default message bundle for the page flow.
if (requestedSpecificBundle || !missingUserDefaultMessages) {
- message = RequestUtils.message(pageContext, bundle, _locale,
key, messageArgs);
+ message = RequestUtils.message(pageContext, bundleName,
_locale, key, messageArgs);
}
// If we didn't find it there, look for it in the validation
messages associated with the form bean.
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Errors.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Errors.java?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Errors.java&r1=148859&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Errors.java&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Errors.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Errors.java
Thu Jan 27 23:27:33 2005
@@ -64,7 +64,7 @@
* @example In this sample, the messages from the <code>errorMessages</code>
bundle will be used to
* output the errors.
* <pre>
- * <netui:errors bundle="com.project.errorMessages" /></pre>
+ * <netui:errors bundleName="errorMessages" /></pre>
* @netui:tag name="errors" body-content="empty" description="Used to report
multiple validation errors."
* @netui.tldx:tag requiredchild="#nothing"
renderer="workshop.netui.jspdesigner.tldx.ErrorsRenderer"
bodycontentpref="empty" whitespace="indent"
*/
@@ -103,7 +103,7 @@
return;
}
- String qualifiedBundle = getQualifiedBundleName(_bundle);
+ String qualifiedBundle = getQualifiedBundleName(_bundleName);
boolean headerPresent = false;
boolean footerPresent = false;
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628/error2.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628/error2.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628/error2.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628/error2.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628/error2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628/error2.jsp
Thu Jan 27 23:27:33 2005
@@ -11,6 +11,6 @@
<netui:body>
<h4>Error Two</h4>
<netui:anchor action="begin">Home</netui:anchor><br>
- <netui:error value="name"/><br/>
+ <netui:error key="name"/><br/>
</netui:body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628b/Controller.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628b/Controller.jpf?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628b/Controller.jpf&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628b/Controller.jpf&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628b/Controller.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628b/Controller.jpf
Thu Jan 27 23:27:33 2005
@@ -130,9 +130,9 @@
method = "handleIt2",
messageKey = "theMessage")
},
- messageResources = {
- @Jpf.MessageResource(
- name = "global.b36628")
+ messageBundles = {
+ @Jpf.MessageBundle(
+ bundlePath = "global.b36628")
})
@Jpf.ViewProperties(
value = {
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628b/error2.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628b/error2.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628b/error2.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628b/error2.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628b/error2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628b/error2.jsp
Thu Jan 27 23:27:33 2005
@@ -11,6 +11,6 @@
<netui:body>
<h4>Error Two</h4>
<netui:anchor action="begin">Home</netui:anchor><br>
- <netui:error value="name"/><br/>
+ <netui:error key="name"/><br/>
</netui:body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628b/foo/error.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628b/foo/error.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628b/foo/error.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628b/foo/error.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628b/foo/error.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b36628b/foo/error.jsp
Thu Jan 27 23:27:33 2005
@@ -12,7 +12,7 @@
<h4>Other Errors</h4>
<netui:anchor href="..\Controller.jpf">Home</netui:anchor><br>
<netui:errors/><br>
- <netui:error value="name"/><br>
+ <netui:error key="name"/><br>
</body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/error/nullbinding/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/error/nullbinding/index.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/error/nullbinding/index.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/error/nullbinding/index.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/error/nullbinding/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/error/nullbinding/index.jsp
Thu Jan 27 23:27:33 2005
@@ -16,13 +16,13 @@
This is a single page test.
</p>
<ul>
- <li><netui:error value="val" bundle="${pageFlow.nullValue}" /> -- error -
bundle</li>
+ <li><netui:error key="val" bundleName="${pageFlow.nullValue}" /> -- error
- bundle</li>
<li><netui:error value="${pageFlow.nullValue}" /> -- error - value</li>
- <li><netui:error value="val" locale="${pageFlow.nullValue}" /> -- error -
locale</li>
+ <li><netui:error key="val" locale="${pageFlow.nullValue}" /> -- error -
locale</li>
<li><netui:errors bundle="${pageFlow.nullValue}" /> -- errors - bundle</li>
<li><netui:errors locale="${pageFlow.nullValue}" /> -- errors - locale</li>
</ul>
</netui:body>
</netui:html>
-
\ No newline at end of file
+
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/struts/Controller.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/struts/Controller.jpf?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/struts/Controller.jpf&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/struts/Controller.jpf&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/struts/Controller.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/struts/Controller.jpf
Thu Jan 27 23:27:33 2005
@@ -31,12 +31,12 @@
forwards = {
@Jpf.Forward(name = "index", path = "index.jsp")
},
- messageResources = {
- @Jpf.MessageResource(
- name = "properties.struts.StrutsMessages"),
- @Jpf.MessageResource(
- bundleKey = "namedStrutsMessages",
- name = "properties.struts.NamedStrutsMessages")
+ messageBundles = {
+ @Jpf.MessageBundle(
+ bundlePath = "properties.struts.StrutsMessages"),
+ @Jpf.MessageBundle(
+ bundleName = "namedStrutsMessages",
+ bundlePath = "properties.struts.NamedStrutsMessages")
})
public class Controller
extends PageFlowController
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/i18n/localeOverride/Controller.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/i18n/localeOverride/Controller.jpf?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/i18n/localeOverride/Controller.jpf&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/i18n/localeOverride/Controller.jpf&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/i18n/localeOverride/Controller.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/i18n/localeOverride/Controller.jpf
Thu Jan 27 23:27:33 2005
@@ -37,9 +37,9 @@
name = "index",
path = "index.jsp")
},
- messageResources = {
- @Jpf.MessageResource(
- name = "properties.bundle1")
+ messageBundles = {
+ @Jpf.MessageBundle(
+ bundlePath = "properties.bundle1")
})
public class Controller
extends PageFlowController
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/jpfScopedForms/test55/Jpf1.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/jpfScopedForms/test55/Jpf1.jpf?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/jpfScopedForms/test55/Jpf1.jpf&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/jpfScopedForms/test55/Jpf1.jpf&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/jpfScopedForms/test55/Jpf1.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/jpfScopedForms/test55/Jpf1.jpf
Thu Jan 27 23:27:33 2005
@@ -35,9 +35,9 @@
* @jpf:forward name="gotoDone" path="/resources/jsp/done.jsp"
*/
@Jpf.Controller(
- messageResources = {
- @Jpf.MessageResource(
- name = "jpfScopedForms.test55.messages")
+ messageBundles = {
+ @Jpf.MessageBundle(
+ bundlePath = "jpfScopedForms.test55.messages")
},
forwards = {
@Jpf.Forward(
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/blankCountryValue/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/blankCountryValue/index.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/blankCountryValue/index.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/blankCountryValue/index.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/blankCountryValue/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/blankCountryValue/index.jsp
Thu Jan 27 23:27:33 2005
@@ -25,7 +25,7 @@
<netui:textBox
dataSource="actionForm.item"></netui:textBox>
</td>
<td>
- <netui:error value = "item"/>
+ <netui:error key="item"/>
</td>
</tr>
</table>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValid/Begin.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValid/Begin.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValid/Begin.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValid/Begin.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValid/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValid/Begin.jsp
Thu Jan 27 23:27:33 2005
@@ -15,7 +15,7 @@
<td align="left"><netui:textBox dataSource="actionForm.name"
size="36" maxlength="36"></netui:textBox></td>
<td style="color:red;">
- <netui:error value="name"></netui:error>
+ <netui:error key="name"></netui:error>
</td>
</tr>
@@ -24,7 +24,7 @@
<td align="left"><netui:textBox dataSource="actionForm.type"
size="36" maxlength="36"></netui:textBox></td>
<td style="color:red;">
- <netui:error value="te"></netui:error>
+ <netui:error key="te"></netui:error>
</td>
</tr>
<tr>
@@ -41,4 +41,4 @@
</netui:form>
</body>
-</netui:html>
\ No newline at end of file
+</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValidAnnot/Begin.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValidAnnot/Begin.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValidAnnot/Begin.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValidAnnot/Begin.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValidAnnot/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValidAnnot/Begin.jsp
Thu Jan 27 23:27:33 2005
@@ -15,7 +15,7 @@
<td align="left"><netui:textBox dataSource="actionForm.name"
size="36" maxlength="36"></netui:textBox></td>
<td style="color:red;">
- <netui:error value="name"></netui:error>
+ <netui:error key="name"></netui:error>
</td>
</tr>
@@ -24,7 +24,7 @@
<td align="left"><netui:textBox dataSource="actionForm.type"
size="36" maxlength="36"></netui:textBox></td>
<td style="color:red;">
- <netui:error value="te"></netui:error>
+ <netui:error key="te"></netui:error>
</td>
</tr>
<tr>
@@ -41,4 +41,4 @@
</netui:form>
</body>
-</netui:html>
\ No newline at end of file
+</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValidAnnot/Controller.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValidAnnot/Controller.jpf?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValidAnnot/Controller.jpf&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValidAnnot/Controller.jpf&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValidAnnot/Controller.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValidAnnot/Controller.jpf
Thu Jan 27 23:27:33 2005
@@ -33,9 +33,9 @@
* @jpf:message-resources resources="error.Errors"
*/
@Jpf.Controller(
- messageResources = {
- @Jpf.MessageResource(
- name = "error.Errors")
+ messageBundles = {
+ @Jpf.MessageBundle(
+ bundlePath = "error.Errors")
})
public class Controller extends
org.apache.beehive.netui.pageflow.PageFlowController
{
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/pageFlowUtilsController.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/pageFlowUtilsController.jpf?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/pageFlowUtilsController.jpf&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/pageFlowUtilsController.jpf&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/pageFlowUtilsController.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/pageFlowUtilsController.jpf
Thu Jan 27 23:27:33 2005
@@ -23,8 +23,8 @@
import org.apache.beehive.netui.pageflow.annotations.Jpf;
@Jpf.Controller(
- messageResources = {
- @Jpf.MessageResource(name = "pageFlowUtils.ValidationMessages")
+ messageBundles = {
+ @Jpf.MessageBundle(bundlePath = "pageFlowUtils.ValidationMessages")
},
sharedFlowRefs={
@Jpf.SharedFlowRef(name="tempSharedFlow", type=TempSharedFlow.class)
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/validation.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/validation.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/validation.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/validation.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/validation.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/validation.jsp
Thu Jan 27 23:27:33 2005
@@ -24,15 +24,15 @@
<code><netui:error></code>:
<blockquote>
- <netui:error value="a"/>
+ <netui:error key="a"/>
<br>
- <netui:error value="b"/>
+ <netui:error key="b"/>
<br>
- <netui:error value="c"/>
+ <netui:error key="c"/>
<br>
- <netui:error value="d"/>
+ <netui:error key="d"/>
<br>
- <netui:error value="e"/>
+ <netui:error key="e"/>
<br>
</blockquote>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNested/getZip/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNested/getZip/index.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNested/getZip/index.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNested/getZip/index.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNested/getZip/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNested/getZip/index.jsp
Thu Jan 27 23:27:33 2005
@@ -15,7 +15,7 @@
<td>Zip:</td>
<td>
<netui:textBox dataSource="actionForm.zip"></netui:textBox>
- <span style="color:red"><netui:error value="zip"/></span>
+ <span style="color:red"><netui:error key="zip"/></span>
</td>
</tr>
</table>
@@ -27,4 +27,4 @@
</netui:body>
</netui:html>
-
\ No newline at end of file
+
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNested/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNested/index.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNested/index.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNested/index.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNested/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNested/index.jsp
Thu Jan 27 23:27:33 2005
@@ -15,14 +15,14 @@
<td>Name:</td>
<td>
<netui:textBox dataSource="actionForm.name"></netui:textBox>
- <span style="color:red"><netui:error value="name"/></span>
+ <span style="color:red"><netui:error key="name"/></span>
</td>
</tr>
<tr valign="top">
<td>Zip:</td>
<td>
<netui:textBox dataSource="actionForm.zip"></netui:textBox>
- <span style="color:red"><netui:error value="zip"/></span>
+ <span style="color:red"><netui:error key="zip"/></span>
</td>
</tr>
</table>
@@ -34,4 +34,4 @@
</netui:body>
</netui:html>
-
\ No newline at end of file
+
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNestedPopup/getZip/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNestedPopup/getZip/index.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNestedPopup/getZip/index.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNestedPopup/getZip/index.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNestedPopup/getZip/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNestedPopup/getZip/index.jsp
Thu Jan 27 23:27:33 2005
@@ -15,7 +15,7 @@
<td>Zip:</td>
<td>
<netui:textBox dataSource="actionForm.zip"></netui:textBox>
- <span style="color:red"><netui:error value="zip"/></span>
+ <span style="color:red"><netui:error key="zip"/></span>
</td>
</tr>
</table>
@@ -27,4 +27,4 @@
</netui:body>
</netui:html>
-
\ No newline at end of file
+
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNestedPopup/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNestedPopup/index.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNestedPopup/index.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNestedPopup/index.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNestedPopup/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNestedPopup/index.jsp
Thu Jan 27 23:27:33 2005
@@ -14,7 +14,7 @@
<td><b>Name:<b></td>
<td>
<netui:textBox dataSource="actionForm.name"/>
- <span style="color:red"><netui:error value="name"/></span>
+ <span style="color:red"><netui:error key="name"/></span>
</td>
</tr>
<tr valign="top">
@@ -33,14 +33,14 @@
<td><b>State:</b></td>
<td>
<netui:textBox tagId="stateField" dataSource="actionForm.state"/>
- <span style="color:red"><netui:error value="state"/></span>
+ <span style="color:red"><netui:error key="state"/></span>
</td>
</tr>
<tr valign="top">
<td><b>Zip:<b></td>
<td>
<netui:textBox tagId="zipField" dataSource="actionForm.zip"/>
- <span style="color:red"><netui:error value="zip"/></span>
+ <span style="color:red"><netui:error key="zip"/></span>
<netui:anchor action="getZip" popup="true">
look up
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/upload/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/upload/index.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/upload/index.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/upload/index.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/upload/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/upload/index.jsp
Thu Jan 27 23:27:33 2005
@@ -13,7 +13,7 @@
<body>
<netui:form action="upload" enctype="multipart/form-data">
File: <netui:fileUpload dataSource="actionForm.file"
readonly="false" size="60"/>
- <netui:error value="file"/>
+ <netui:error key="file"/>
<br>
Label: <netui:textBox dataSource="actionForm.label"/>
<br>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/validateField/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/validateField/index.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/validateField/index.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/validateField/index.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/validateField/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/validateField/index.jsp
Thu Jan 27 23:27:33 2005
@@ -23,7 +23,7 @@
<netui:textBox
dataSource="actionForm.item1"></netui:textBox>
</td>
<td>
- <netui:error value = "item1"/>
+ <netui:error key="item1"/>
</td>
</tr>
<tr valign="top">
@@ -32,7 +32,7 @@
<netui:textBox
dataSource="actionForm.item2"></netui:textBox>
</td>
<td>
- <netui:error value = "item2"/>
+ <netui:error key="item2"/>
</td>
</tr>
</table>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/validation/Controller.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/validation/Controller.jpf?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/validation/Controller.jpf&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/validation/Controller.jpf&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/validation/Controller.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/validation/Controller.jpf
Thu Jan 27 23:27:33 2005
@@ -34,9 +34,9 @@
* @jpf:message-resources resources="resources.application"
*/
@Jpf.Controller(
- messageResources = {
- @Jpf.MessageResource(
- name = "resources.application")
+ messageBundles = {
+ @Jpf.MessageBundle(
+ bundlePath = "resources.application")
})
public class Controller extends PageFlowController
{
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/variantValidation/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/variantValidation/index.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/variantValidation/index.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/variantValidation/index.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/variantValidation/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/variantValidation/index.jsp
Thu Jan 27 23:27:33 2005
@@ -27,7 +27,7 @@
<netui:textBox
dataSource="actionForm.item"></netui:textBox>
</td>
<td>
- <netui:error value = "item"/>
+ <netui:error key="item"/>
</td>
</tr>
</table>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug26856/Jpf1.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug26856/Jpf1.jpf?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug26856/Jpf1.jpf&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug26856/Jpf1.jpf&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug26856/Jpf1.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug26856/Jpf1.jpf
Thu Jan 27 23:27:33 2005
@@ -30,15 +30,15 @@
* resources="miscJpf.bug26856.bundle1"
*/
@Jpf.Controller(
- messageResources = {
- @Jpf.MessageResource(
- name = "miscJpf.bug26856.struts.StrutsMessages"),
- @Jpf.MessageResource(
- bundleKey = "myMessages",
- name = "miscJpf.bug26856.struts.NamedStrutsMessages"),
- @Jpf.MessageResource(
- bundleKey = "myBundle1",
- name = "miscJpf.bug26856.bundle1")
+ messageBundles = {
+ @Jpf.MessageBundle(
+ bundlePath = "miscJpf.bug26856.struts.StrutsMessages"),
+ @Jpf.MessageBundle(
+ bundleName = "myMessages",
+ bundlePath = "miscJpf.bug26856.struts.NamedStrutsMessages"),
+ @Jpf.MessageBundle(
+ bundleName = "myBundle1",
+ bundlePath = "miscJpf.bug26856.bundle1")
})
public class Jpf1 extends PageFlowController
{
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/exceptions/Controller.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/exceptions/Controller.jpf?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/exceptions/Controller.jpf&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/exceptions/Controller.jpf&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/exceptions/Controller.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/exceptions/Controller.jpf
Thu Jan 27 23:27:33 2005
@@ -48,9 +48,9 @@
type =
org.apache.beehive.netui.pageflow.UnfulfilledRolesException.class,
method = "failedRolesHandler")
},
- messageResources = {
- @Jpf.MessageResource(
- name = "exceptions.Messages")
+ messageBundles = {
+ @Jpf.MessageBundle(
+ bundlePath = "exceptions.Messages")
})
public class Controller extends PageFlowController
{
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/inputPage.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/inputPage.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/inputPage.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/inputPage.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/inputPage.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/inputPage.jsp
Thu Jan 27 23:27:33 2005
@@ -24,7 +24,7 @@
<td>foo:</td>
<td>
<netui:textBox dataSource="actionForm.foo"/>
- <netui:error value="foo"/>
+ <netui:error key="foo"/>
</td>
</tr>
<tr class="tablebody">
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/returnToTestController.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/returnToTestController.jpf?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/returnToTestController.jpf&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/returnToTestController.jpf&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/returnToTestController.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/returnToTestController.jpf
Thu Jan 27 23:27:33 2005
@@ -33,9 +33,9 @@
import org.apache.struts.action.ActionMapping;
@Jpf.Controller(
- messageResources = {
- @Jpf.MessageResource(
- name = "returnToTest.Messages")
+ messageBundles = {
+ @Jpf.MessageBundle(
+ bundlePath = "returnToTest.Messages")
})
public class returnToTestController extends PageFlowController
{
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test12/Jpf1.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test12/Jpf1.jpf?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test12/Jpf1.jpf&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test12/Jpf1.jpf&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test12/Jpf1.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test12/Jpf1.jpf
Thu Jan 27 23:27:33 2005
@@ -38,9 +38,9 @@
* @jpf:forward name="gotoDone" path="/resources/jsp/done.jsp"
*/
@Jpf.Controller(
- messageResources = {
- @Jpf.MessageResource(
- name = "pageInput/test12/messages")
+ messageBundles = {
+ @Jpf.MessageBundle(
+ bundlePath = "pageInput/test12/messages")
},
forwards = {
@Jpf.Forward(
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test12/Jsp1.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test12/Jsp1.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test12/Jsp1.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test12/Jsp1.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test12/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test12/Jsp1.jsp
Thu Jan 27 23:27:33 2005
@@ -29,11 +29,11 @@
<netui:form action="action1">
{actionForm.fld1}:
<netui:textBox dataSource="actionForm.fld1"/>
- <netui:error value="field1"/>
+ <netui:error key="field1"/>
<br/>
{actionForm.fld2}:
<netui:textBox dataSource="actionForm.fld2"/>
- <netui:error value="field2"/>
+ <netui:error key="field2"/>
<br/><br/>
<netui:button action="action1" value="Continue..." type="submit"/>
</netui:form>
@@ -56,4 +56,4 @@
</font>
</center>
</body>
-</html>
\ No newline at end of file
+</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test23/Jpf1.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test23/Jpf1.jpf?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test23/Jpf1.jpf&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test23/Jpf1.jpf&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test23/Jpf1.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test23/Jpf1.jpf
Thu Jan 27 23:27:33 2005
@@ -38,9 +38,9 @@
* @jpf:forward name="gotoDone" path="/resources/jsp/done.jsp"
*/
@Jpf.Controller(
- messageResources = {
- @Jpf.MessageResource(
- name = "pageInput/test23/messages")
+ messageBundles = {
+ @Jpf.MessageBundle(
+ bundlePath = "pageInput/test23/messages")
},
forwards = {
@Jpf.Forward(
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test63/Jpf1.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test63/Jpf1.jpf?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test63/Jpf1.jpf&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test63/Jpf1.jpf&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test63/Jpf1.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test63/Jpf1.jpf
Thu Jan 27 23:27:33 2005
@@ -35,9 +35,9 @@
* @jpf:forward name="error" path="/resources/jsp/error.jsp"
*/
@Jpf.Controller(
- messageResources = {
- @Jpf.MessageResource(
- name = "returnTo.test63.messages")
+ messageBundles = {
+ @Jpf.MessageBundle(
+ bundlePath = "returnTo.test63.messages")
},
forwards = {
@Jpf.Forward(
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errors2.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errors2.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errors2.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errors2.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errors2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errors2.jsp
Thu Jan 27 23:27:33 2005
@@ -12,7 +12,7 @@
<body>
<h3>Errors Tag 2-3</h3>
- <netui:errors bundle="anotherBundle"/>
+ <netui:errors bundleName="anotherBundle"/>
<br>
<netui:anchor action="goPrev">go back</netui:anchor>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errors3.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errors3.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errors3.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errors3.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errors3.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errors3.jsp
Thu Jan 27 23:27:33 2005
@@ -12,7 +12,7 @@
<body>
<h3>Errors Tag 2-3</h3>
- <netui:errors bundle="anotherBundle/tags/errors"/>
+ <netui:errors bundleName="anotherBundle/tags/errors"/>
<br>
<netui:anchor action="goPrev">go back</netui:anchor>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errors4.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errors4.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errors4.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errors4.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errors4.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errors4.jsp
Thu Jan 27 23:27:33 2005
@@ -12,7 +12,7 @@
<body>
<h3>Errors Tag 4</h3>
- <netui:errors bundle="rootMessages/" />
+ <netui:errors bundleName="rootMessages/" />
<br>
<netui:anchor action="goPrev">go back</netui:anchor>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errorsController.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errorsController.jpf?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errorsController.jpf&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errorsController.jpf&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errorsController.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/errorsController.jpf
Thu Jan 27 23:27:33 2005
@@ -215,12 +215,12 @@
* ::
*/
@Jpf.Controller(
- messageResources = {
- @Jpf.MessageResource(
- name = "errors.Messages1"),
- @Jpf.MessageResource(
- name = "errors.Messages2",
- bundleKey = "anotherBundle")
+ messageBundles = {
+ @Jpf.MessageBundle(
+ bundlePath = "errors.Messages1"),
+ @Jpf.MessageBundle(
+ bundlePath = "errors.Messages2",
+ bundleName = "anotherBundle")
})
@Jpf.ViewProperties(
value = {
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/index.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/index.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/index.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/errors/index.jsp
Thu Jan 27 23:27:33 2005
@@ -11,10 +11,10 @@
</head>
<body>
<font color="red">
- <netui:error value="defaultProperty"/>
- <netui:error value="bundleProperty1" bundle="anotherBundle"/>
- <netui:error value="bundleProperty2"
bundle="anotherBundle/tags/errors"/>
- <netui:error value="rootProperty" bundle="rootMessages/"/>
+ <netui:error key="defaultProperty"/>
+ <netui:error key="bundleProperty1" bundleName="anotherBundle"/>
+ <netui:error key="bundleProperty2"
bundleName="anotherBundle/tags/errors"/>
+ <netui:error key="rootProperty" bundleName="rootMessages/"/>
</font>
<netui:anchor action="errorAction">succeed</netui:anchor>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/message/Controller.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/message/Controller.jpf?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/message/Controller.jpf&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/message/Controller.jpf&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/message/Controller.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/message/Controller.jpf
Thu Jan 27 23:27:33 2005
@@ -34,9 +34,9 @@
name = "begin",
path = "Begin.jsp")
},
- messageResources = {
- @Jpf.MessageResource(
- name = "error.Text")
+ messageBundles = {
+ @Jpf.MessageBundle(
+ bundlePath = "error.Text")
})
public class Controller extends PageFlowController
{
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test54/Jpf1.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test54/Jpf1.jpf?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test54/Jpf1.jpf&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test54/Jpf1.jpf&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test54/Jpf1.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test54/Jpf1.jpf
Thu Jan 27 23:27:33 2005
@@ -35,9 +35,9 @@
* @jpf:forward name="gotoDone" path="/resources/jsp/done.jsp"
*/
@Jpf.Controller(
- messageResources = {
- @Jpf.MessageResource(
- name = "valFwdErr.test54.messages")
+ messageBundles = {
+ @Jpf.MessageBundle(
+ bundlePath = "valFwdErr.test54.messages")
},
forwards = {
@Jpf.Forward(
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test56/Jpf1.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test56/Jpf1.jpf?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test56/Jpf1.jpf&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test56/Jpf1.jpf&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test56/Jpf1.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test56/Jpf1.jpf
Thu Jan 27 23:27:33 2005
@@ -35,9 +35,9 @@
* @jpf:forward name="gotoDone" path="/resources/jsp/done.jsp"
*/
@Jpf.Controller(
- messageResources = {
- @Jpf.MessageResource(
- name = "valFwdErr.test56.messages")
+ messageBundles = {
+ @Jpf.MessageBundle(
+ bundlePath = "valFwdErr.test56.messages")
},
forwards = {
@Jpf.Forward(
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test57/Jpf1.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test57/Jpf1.jpf?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test57/Jpf1.jpf&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test57/Jpf1.jpf&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test57/Jpf1.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test57/Jpf1.jpf
Thu Jan 27 23:27:33 2005
@@ -35,9 +35,9 @@
* @jpf:forward name="gotoDone" path="/resources/jsp/done.jsp"
*/
@Jpf.Controller(
- messageResources = {
- @Jpf.MessageResource(
- name = "valFwdErr.test56.messages")
+ messageBundles = {
+ @Jpf.MessageBundle(
+ bundlePath = "valFwdErr.test56.messages")
},
forwards = {
@Jpf.Forward(
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test57/sub1/SubJpf1.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test57/sub1/SubJpf1.jpf?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test57/sub1/SubJpf1.jpf&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test57/sub1/SubJpf1.jpf&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test57/sub1/SubJpf1.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test57/sub1/SubJpf1.jpf
Thu Jan 27 23:27:33 2005
@@ -31,9 +31,9 @@
*/
@Jpf.Controller(
nested = true,
- messageResources = {
- @Jpf.MessageResource(
- name = "valFwdErr.test57.messages")
+ messageBundles = {
+ @Jpf.MessageBundle(
+ bundlePath = "valFwdErr.test57.messages")
},
forwards = {
@Jpf.Forward(
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test58/Jpf1.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test58/Jpf1.jpf?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test58/Jpf1.jpf&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test58/Jpf1.jpf&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test58/Jpf1.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test58/Jpf1.jpf
Thu Jan 27 23:27:33 2005
@@ -36,9 +36,9 @@
* @jpf:forward name="gotoDone" path="/resources/jsp/done.jsp"
*/
@Jpf.Controller(
- messageResources = {
- @Jpf.MessageResource(
- name = "valFwdErr.test58.messages")
+ messageBundles = {
+ @Jpf.MessageBundle(
+ bundlePath = "valFwdErr.test58.messages")
},
forwards = {
@Jpf.Forward(
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test58/Jsp2.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test58/Jsp2.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test58/Jsp2.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test58/Jsp2.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test58/Jsp2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/valFwdErr/test58/Jsp2.jsp
Thu Jan 27 23:27:33 2005
@@ -39,11 +39,11 @@
<netui:button type="submit">Continue...</netui:button>
</netui:form>
<br/><br/>
- <netui:error value="changeError"/>
- <netui:error value="addError"/>
+ <netui:error key="changeError"/>
+ <netui:error key="addError"/>
<br/><br/>
<netui:errors/>
<hr width="95%"/>
</center>
</body>
-</html>
\ No newline at end of file
+</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/addExpressionMessages/Controller.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/addExpressionMessages/Controller.jpf?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/addExpressionMessages/Controller.jpf&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/addExpressionMessages/Controller.jpf&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/addExpressionMessages/Controller.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/addExpressionMessages/Controller.jpf
Thu Jan 27 23:27:33 2005
@@ -12,8 +12,8 @@
sharedFlowRefs={
@Jpf.SharedFlowRef(name="sf", type=SharedFlow.class)
},
- messageResources={
- @Jpf.MessageResource(name="validation.addExpressionMessages.Messages")
+ messageBundles={
+
@Jpf.MessageBundle(bundlePath="validation.addExpressionMessages.Messages")
}
)
public class Controller extends PageFlowController
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/addExpressionMessages/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/addExpressionMessages/index.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/addExpressionMessages/index.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/addExpressionMessages/index.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/addExpressionMessages/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/addExpressionMessages/index.jsp
Thu Jan 27 23:27:33 2005
@@ -9,12 +9,12 @@
<netui:base/>
</head>
<netui:body>
- message for prop1: <b><netui:error value="prop1"/></b><br/>
- message for prop2: <b><netui:error value="prop2"/></b><br/>
- message for prop3: <b><netui:error value="prop3"/></b><br/>
- message for prop4: <b><netui:error value="prop4"/></b><br/>
- message for prop5: <b><netui:error value="prop5"/></b><br/>
- message for prop6: <b><netui:error value="prop6"/></b><br/>
+ message for prop1: <b><netui:error key="prop1"/></b><br/>
+ message for prop2: <b><netui:error key="prop2"/></b><br/>
+ message for prop3: <b><netui:error key="prop3"/></b><br/>
+ message for prop4: <b><netui:error key="prop4"/></b><br/>
+ message for prop5: <b><netui:error key="prop5"/></b><br/>
+ message for prop6: <b><netui:error key="prop6"/></b><br/>
<br/>
<netui:anchor action="addMessages">addMessages (prop1, prop2,
prop3)</netui:anchor>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/basicValidation/basicValidationController.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/basicValidation/basicValidationController.jpf?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/basicValidation/basicValidationController.jpf&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/basicValidation/basicValidationController.jpf&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/basicValidation/basicValidationController.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/basicValidation/basicValidationController.jpf
Thu Jan 27 23:27:33 2005
@@ -102,9 +102,9 @@
*/
@Jpf.Controller(
nested = true,
- messageResources = {
- @Jpf.MessageResource(
- name = "validation.basic.Messages")
+ messageBundles = {
+ @Jpf.MessageBundle(
+ bundlePath = "validation.basic.Messages")
})
@Jpf.ViewProperties(
value = {
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/basicValidation/formPage.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/basicValidation/formPage.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/basicValidation/formPage.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/basicValidation/formPage.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/basicValidation/formPage.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/basicValidation/formPage.jsp
Thu Jan 27 23:27:33 2005
@@ -22,7 +22,7 @@
<netui:textBox dataSource="actionForm.email"/>
</td>
<td>
- <netui:error value="email"/>
+ <netui:error key="email"/>
</td>
</tr>
<tr>
@@ -33,7 +33,7 @@
<netui:textBox dataSource="actionForm.zipCode"/>
</td>
<td>
- <netui:error value="zipCode"/>
+ <netui:error key="zipCode"/>
</td>
</tr>
</table>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/custom/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/custom/index.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/custom/index.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/custom/index.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/custom/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/custom/index.jsp
Thu Jan 27 23:27:33 2005
@@ -12,7 +12,7 @@
<h3>${pageFlow.URI}</h3>
<netui:form action="submit">
- val: <netui:textBox dataSource="actionForm.val"/> <netui:error
value="val"/>
+ val: <netui:textBox dataSource="actionForm.val"/> <netui:error
key="val"/>
<br/>
<br/>
<netui:button value="submit"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/declarativeValidation/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/declarativeValidation/index.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/declarativeValidation/index.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/declarativeValidation/index.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/declarativeValidation/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/declarativeValidation/index.jsp
Thu Jan 27 23:27:33 2005
@@ -30,98 +30,98 @@
<td>minlength=2:</td>
<td>
<netui:textBox dataSource="actionForm.minLength"/>
- <netui:error value="minLength"/>
+ <netui:error key="minLength"/>
</td>
</tr>
<tr>
<td>maxlength=2:</td>
<td>
<netui:textBox dataSource="actionForm.maxLength"/>
- <netui:error value="maxLength"/>
+ <netui:error key="maxLength"/>
</td>
</tr>
<tr>
<td>mask=a*b:</td>
<td>
<netui:textBox dataSource="actionForm.mask"/>
- <netui:error value="mask"/>
+ <netui:error key="mask"/>
</td>
</tr>
<tr>
<td>type=int:</td>
<td>
<netui:textBox dataSource="actionForm.typeInt"/>
- <netui:error value="typeInt"/>
+ <netui:error key="typeInt"/>
</td>
</tr>
<tr>
<td>type=short:</td>
<td>
<netui:textBox dataSource="actionForm.typeShort"/>
- <netui:error value="typeShort"/>
+ <netui:error key="typeShort"/>
</td>
</tr>
<tr>
<td>type=long:</td>
<td>
<netui:textBox dataSource="actionForm.typeLong"/>
- <netui:error value="typeLong"/>
+ <netui:error key="typeLong"/>
</td>
</tr>
<tr>
<td>type=double:</td>
<td>
<netui:textBox dataSource="actionForm.typeDouble"/>
- <netui:error value="typeDouble"/>
+ <netui:error key="typeDouble"/>
</td>
</tr>
<tr>
<td>type=float:</td>
<td>
<netui:textBox dataSource="actionForm.typeFloat"/>
- <netui:error value="typeFloat"/>
+ <netui:error key="typeFloat"/>
</td>
</tr>
<tr>
<td>type=byte:</td>
<td>
<netui:textBox dataSource="actionForm.typeByte"/>
- <netui:error value="typeByte"/>
+ <netui:error key="typeByte"/>
</td>
</tr>
<tr>
<td>date=MM-dd-YYYY:</td>
<td>
<netui:textBox dataSource="actionForm.date"/>
- <netui:error value="date"/>
+ <netui:error key="date"/>
</td>
</tr>
<tr>
<td>range 1-10:</td>
<td>
<netui:textBox dataSource="actionForm.range"/>
- <netui:error value="range"/>
+ <netui:error key="range"/>
</td>
</tr>
<tr>
<td>credit card:</td>
<td>
<netui:textBox dataSource="actionForm.creditCard"/>
- <netui:error value="creditCard"/>
+ <netui:error key="creditCard"/>
</td>
</tr>
<tr>
<td>email:</td>
<td>
<netui:textBox dataSource="actionForm.email"/>
- <netui:error value="email"/>
+ <netui:error key="email"/>
</td>
</tr>
<tr>
<td>valid when
pageFlow.str==actionForm.validWhenPageFlowProp:</td>
<td>
<netui:textBox
dataSource="actionForm.validWhenPageFlowProp"/>
- <netui:error value="validWhenPageFlowProp"/>
+ <netui:error key="validWhenPageFlowProp"/>
</td>
</tr>
</table>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/defaultMessages/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/defaultMessages/index.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/defaultMessages/index.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/defaultMessages/index.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/defaultMessages/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/defaultMessages/index.jsp
Thu Jan 27 23:27:33 2005
@@ -19,91 +19,91 @@
<td>required:</td>
<td>
<netui:textBox dataSource="actionForm.required"/>
- <netui:error value="required"/>
+ <netui:error key="required"/>
</td>
</tr>
<tr valign="top">
<td>minlength:</td>
<td>
<netui:textBox dataSource="actionForm.minlength"/>
- <netui:error value="minlength"/>
+ <netui:error key="minlength"/>
</td>
</tr>
<tr valign="top">
<td>maxlength:</td>
<td>
<netui:textBox dataSource="actionForm.maxlength"/>
- <netui:error value="maxlength"/>
+ <netui:error key="maxlength"/>
</td>
</tr>
<tr valign="top">
<td>byte:</td>
<td>
<netui:textBox dataSource="actionForm.byte"/>
- <netui:error value="byte"/>
+ <netui:error key="byte"/>
</td>
</tr>
<tr valign="top">
<td>short:</td>
<td>
<netui:textBox dataSource="actionForm.short"/>
- <netui:error value="short"/>
+ <netui:error key="short"/>
</td>
</tr>
<tr valign="top">
<td>int:</td>
<td>
<netui:textBox dataSource="actionForm.int"/>
- <netui:error value="int"/>
+ <netui:error key="int"/>
</td>
</tr>
<tr valign="top">
<td>float:</td>
<td>
<netui:textBox dataSource="actionForm.float"/>
- <netui:error value="float"/>
+ <netui:error key="float"/>
</td>
</tr>
<tr valign="top">
<td>long:</td>
<td>
<netui:textBox dataSource="actionForm.long"/>
- <netui:error value="long"/>
+ <netui:error key="long"/>
</td>
</tr>
<tr valign="top">
<td>double:</td>
<td>
<netui:textBox dataSource="actionForm.double"/>
- <netui:error value="double"/>
+ <netui:error key="double"/>
</td>
</tr>
<tr valign="top">
<td>date:</td>
<td>
<netui:textBox dataSource="actionForm.date"/>
- <netui:error value="date"/>
+ <netui:error key="date"/>
</td>
</tr>
<tr valign="top">
<td>range:</td>
<td>
<netui:textBox dataSource="actionForm.range"/>
- <netui:error value="range"/>
+ <netui:error key="range"/>
</td>
</tr>
<tr valign="top">
<td>creditcard:</td>
<td>
<netui:textBox dataSource="actionForm.creditcard"/>
- <netui:error value="creditcard"/>
+ <netui:error key="creditcard"/>
</td>
</tr>
<tr valign="top">
<td>email:</td>
<td>
<netui:textBox dataSource="actionForm.email"/>
- <netui:error value="email"/>
+ <netui:error key="email"/>
</td>
</tr>
</table>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/strutsValidator/formPage.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/strutsValidator/formPage.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/strutsValidator/formPage.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/strutsValidator/formPage.jsp&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/strutsValidator/formPage.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/strutsValidator/formPage.jsp
Thu Jan 27 23:27:33 2005
@@ -22,7 +22,7 @@
<netui:textBox dataSource="actionForm.email"/>
</td>
<td>
- <netui:error value="email"/>
+ <netui:error key="email"/>
</td>
</tr>
<tr>
@@ -33,7 +33,7 @@
<netui:textBox dataSource="actionForm.age"/>
</td>
<td>
- <netui:error value="age"/>
+ <netui:error key="age"/>
</td>
</tr>
</table>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/strutsValidator/strutsValidatorController.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/strutsValidator/strutsValidatorController.jpf?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/strutsValidator/strutsValidatorController.jpf&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/strutsValidator/strutsValidatorController.jpf&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/strutsValidator/strutsValidatorController.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/strutsValidator/strutsValidatorController.jpf
Thu Jan 27 23:27:33 2005
@@ -103,9 +103,9 @@
@Jpf.Controller(
nested = true,
strutsMerge = "/WEB-INF/strutsValidator-merge-config.xml",
- messageResources = {
- @Jpf.MessageResource(
- name = "validation.validator.Messages")
+ messageBundles = {
+ @Jpf.MessageBundle(
+ bundlePath = "validation.validator.Messages")
})
@Jpf.ViewProperties(
value = {
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/validationController.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/validationController.jpf?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/validationController.jpf&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/validationController.jpf&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/validationController.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/validationController.jpf
Thu Jan 27 23:27:33 2005
@@ -113,9 +113,9 @@
*
*/
@Jpf.Controller(
- messageResources = {
- @Jpf.MessageResource(
- name = "validation.ValidationMessages")
+ messageBundles = {
+ @Jpf.MessageBundle(
+ bundlePath = "validation.ValidationMessages")
})
@Jpf.ViewProperties(
value = {
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtErrorNullBinding.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtErrorNullBinding.xml?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtErrorNullBinding.xml&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtErrorNullBinding.xml&r2=148860
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtErrorNullBinding.xml
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtErrorNullBinding.xml
Thu Jan 27 23:27:33 2005
@@ -86,9 +86,9 @@
<div> <hr /><table border="1" cellspacing="0"
style="color:red;background-color:white">
<tr><th colspan="6">Page Errors</th></tr>
<tr><th>Error Number</th><th>Tag Type</th><th colspan="4">Error</th></tr>
-<tr><th>1</th><th>Error</th><th>Message</th><td>Attribute 'bundle' is required
to have a value. The value "" is illegal. This is often cause by binding to
an object with a null value.</td></tr>
-<tr><th>2</th><th>Error</th><th>Message</th><td>Attribute 'value' is required
to have a value. The value "" is illegal. This is often cause by binding to
an object with a null value.</td></tr>
-<tr><th>3</th><th>Errors</th><th>Message</th><td>Attribute 'bundle' is
required to have a value. The value "" is illegal. This is often cause by
binding to an object with a null value.</td></tr>
+<tr><th>1</th><th>Error</th><th>Message</th><td>Attribute 'bundleName' is
required to have a value. The value "" is illegal. This is often cause by
binding to an object with a null value.</td></tr>
+<tr><th>2</th><th>Error</th><th>Message</th><td>Attribute 'key' is required to
have a value. The value "" is illegal. This is often cause by binding to an
object with a null value.</td></tr>
+<tr><th>3</th><th>Errors</th><th>Message</th><td>Attribute 'bundleName' is
required to have a value. The value "" is illegal. This is often cause by
binding to an object with a null value.</td></tr>
</table></div>
</body>
@@ -104,4 +104,4 @@
<ses:testCount>1</ses:testCount>
<ses:passedCount>0</ses:passedCount>
<ses:failedCount>1</ses:failedCount>
-</ses:recorderSession>
\ No newline at end of file
+</ses:recorderSession>
Modified:
incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/login/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/login/index.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/login/index.jsp&r1=148859&p2=incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/login/index.jsp&r2=148860
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/login/index.jsp
(original)
+++ incubator/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/login/index.jsp
Thu Jan 27 23:27:33 2005
@@ -21,14 +21,14 @@
<td>username:</td>
<td>
<netui:textBox dataSource="actionForm.username"/>
- <span style="color:red"><netui:error
value="username"/></span>
+ <span style="color:red"><netui:error
key="username"/></span>
</td>
</tr>
<tr>
<td>password:</td>
<td>
<netui:textBox dataSource="actionForm.password"
password="true"/>
- <span style="color:red"><netui:error
value="password"/></span>
+ <span style="color:red"><netui:error
key="password"/></span>
</td>
</tr>
</table>
Modified:
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/accountFields.tag
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/accountFields.tag?view=diff&rev=148860&p1=incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/accountFields.tag&r1=148859&p2=incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/accountFields.tag&r2=148860
==============================================================================
---
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/accountFields.tag
(original)
+++
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/accountFields.tag
Thu Jan 27 23:27:33 2005
@@ -18,7 +18,7 @@
<td class="celldata">
<netui:textBox dataSource="actionForm.firstName"/>
<br/>
- <netui:error value="firstName"/>
+ <netui:error key="firstName"/>
</td>
</tr>
<tr class="rowyellow">
@@ -26,7 +26,7 @@
<td class="celldata">
<netui:textBox dataSource="actionForm.lastName"/>
<br/>
- <netui:error value="lastName"/>
+ <netui:error key="lastName"/>
</td>
</tr>
<tr class="rowyellow">
@@ -34,7 +34,7 @@
<td class="celldata">
<netui:textBox dataSource="actionForm.email" size="40"/>
<br/>
- <netui:error value="email"/>
+ <netui:error key="email"/>
</td>
</tr>
<tr class="rowyellow">
@@ -42,7 +42,7 @@
<td class="celldata">
<netui:textBox dataSource="actionForm.phone"/>
<br/>
- <netui:error value="phone"/>
+ <netui:error key="phone"/>
</td>
</tr>
<tr class="rowyellow">
@@ -50,7 +50,7 @@
<td class="celldata">
<netui:textBox dataSource="actionForm.addr1" size="40"/>
<br/>
- <netui:error value="address1"/>
+ <netui:error key="address1"/>
</td>
</tr>
<tr class="rowyellow">
@@ -58,7 +58,7 @@
<td class="celldata">
<netui:textBox dataSource="actionForm.addr2" size="40"/>
<br/>
- <netui:error value="address2"/>
+ <netui:error key="address2"/>
</td>
</tr>
<tr class="rowyellow">
@@ -66,7 +66,7 @@
<td class="celldata">
<netui:textBox dataSource="actionForm.city"/>
<br/>
- <netui:error value="city"/>
+ <netui:error key="city"/>
</td>
</tr>
<tr class="rowyellow">
@@ -74,7 +74,7 @@
<td class="celldata">
<netui:textBox size="4" dataSource="actionForm.state"/>
<br/>
- <netui:error value="state"/>
+ <netui:error key="state"/>
</td>
</tr>
<tr class="rowyellow">
@@ -82,7 +82,7 @@
<td class="celldata">
<netui:textBox size="10" dataSource="actionForm.zip"/>
<br/>
- <netui:error value="zip"/>
+ <netui:error key="zip"/>
</td>
</tr>
<tr class="rowyellow">
@@ -90,7 +90,7 @@
<td class="celldata">
<netui:textBox size="15" dataSource="actionForm.country"/>
<br/>
- <netui:error value="country"/>
+ <netui:error key="country"/>
</td>
</tr>
</table>
@@ -126,4 +126,4 @@
<netui-data:repeater dataSource="pageInput.categoryNames">
<br/>${container.item}
-</netui-data:repeater>
\ No newline at end of file
+</netui-data:repeater>
Modified:
incubator/beehive/trunk/samples/petstoreWeb/account/create/Controller.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/account/create/Controller.jpf?view=diff&rev=148860&p1=incubator/beehive/trunk/samples/petstoreWeb/account/create/Controller.jpf&r1=148859&p2=incubator/beehive/trunk/samples/petstoreWeb/account/create/Controller.jpf&r2=148860
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/account/create/Controller.jpf
(original)
+++ incubator/beehive/trunk/samples/petstoreWeb/account/create/Controller.jpf
Thu Jan 27 23:27:33 2005
@@ -41,7 +41,7 @@
sharedFlowRefs={
@Jpf.SharedFlowRef(name="rootSharedFlow",
type=webappRoot.SharedFlow.class)
},
- [EMAIL PROTECTED](name =
"org.apache.beehive.samples.petstore.resources.account")}
+ [EMAIL PROTECTED](bundlePath =
"org.apache.beehive.samples.petstore.resources.account")}
)
public class Controller
extends AccountController
Modified: incubator/beehive/trunk/samples/petstoreWeb/account/create/create.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/account/create/create.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/samples/petstoreWeb/account/create/create.jsp&r1=148859&p2=incubator/beehive/trunk/samples/petstoreWeb/account/create/create.jsp&r2=148860
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/account/create/create.jsp
(original)
+++ incubator/beehive/trunk/samples/petstoreWeb/account/create/create.jsp
Thu Jan 27 23:27:33 2005
@@ -31,7 +31,7 @@
</c:if>
<netui:textBox dataSource="actionForm.userId"/>
<br/>
- <netui:error value="userId"/>
+ <netui:error key="userId"/>
</td>
</tr>
<tr class="rowyellow">
@@ -40,7 +40,7 @@
<td>
<netui:textBox password="true"
dataSource="actionForm.password"/>
<br/>
- <netui:error value="password"/>
+ <netui:error key="password"/>
</td>
</tr>
<tr class="rowyellow">
@@ -49,7 +49,7 @@
<td>
<netui:textBox
dataSource="actionForm.repeatedPassword" password="true"/>
<br/>
- <netui:error value="password"/>
+ <netui:error key="password"/>
</td>
</tr>
</table>
Modified:
incubator/beehive/trunk/samples/petstoreWeb/account/edit/Controller.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/account/edit/Controller.jpf?view=diff&rev=148860&p1=incubator/beehive/trunk/samples/petstoreWeb/account/edit/Controller.jpf&r1=148859&p2=incubator/beehive/trunk/samples/petstoreWeb/account/edit/Controller.jpf&r2=148860
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/account/edit/Controller.jpf
(original)
+++ incubator/beehive/trunk/samples/petstoreWeb/account/edit/Controller.jpf
Thu Jan 27 23:27:33 2005
@@ -38,8 +38,8 @@
sharedFlowRefs={
@Jpf.SharedFlowRef(name="rootSharedFlow",
type=webappRoot.SharedFlow.class)
},
- messageResources = {
- @Jpf.MessageResource(name =
"org.apache.beehive.samples.petstore.resources.account")
+ messageBundles = {
+ @Jpf.MessageBundle(bundlePath =
"org.apache.beehive.samples.petstore.resources.account")
},
simpleActions={
@Jpf.SimpleAction(name="begin", path="edit.jsp")
Modified: incubator/beehive/trunk/samples/petstoreWeb/checkout/Controller.jpf
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/checkout/Controller.jpf?view=diff&rev=148860&p1=incubator/beehive/trunk/samples/petstoreWeb/checkout/Controller.jpf&r1=148859&p2=incubator/beehive/trunk/samples/petstoreWeb/checkout/Controller.jpf&r2=148860
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/checkout/Controller.jpf
(original)
+++ incubator/beehive/trunk/samples/petstoreWeb/checkout/Controller.jpf Thu Jan
27 23:27:33 2005
@@ -38,8 +38,8 @@
sharedFlowRefs={
@Jpf.SharedFlowRef(name="rootSharedFlow",
type=webappRoot.SharedFlow.class)
},
- messageResources={
-
@Jpf.MessageResource(name="org.apache.beehive.samples.petstore.resources.order")
+ messageBundles={
+
@Jpf.MessageBundle(bundlePath="org.apache.beehive.samples.petstore.resources.order")
},
simpleActions={
@Jpf.SimpleAction(name="viewItem", path="/shop/viewItem.do")
Modified: incubator/beehive/trunk/samples/petstoreWeb/checkout/newOrder.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/checkout/newOrder.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/samples/petstoreWeb/checkout/newOrder.jsp&r1=148859&p2=incubator/beehive/trunk/samples/petstoreWeb/checkout/newOrder.jsp&r2=148860
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/checkout/newOrder.jsp
(original)
+++ incubator/beehive/trunk/samples/petstoreWeb/checkout/newOrder.jsp Thu Jan
27 23:27:33 2005
@@ -36,7 +36,7 @@
<td>
<netui:textBox dataSource="actionForm.order.creditCard"/>
<br/>
- <netui:error value="creditCard"/>
+ <netui:error key="creditCard"/>
<font color=red size=2>Note, be sure to use an invalid
number.</font></td>
</tr>
<tr bgcolor=#FFFF88>
@@ -55,7 +55,7 @@
<td>
<netui:textBox size="40"
dataSource="actionForm.order.billingAddress.firstName"/>
<br/>
- <netui:error value="billToFirstName"/>
+ <netui:error key="billToFirstName"/>
</td>
</tr>
<tr bgcolor=#FFFF88>
@@ -64,7 +64,7 @@
<td>
<netui:textBox size="40"
dataSource="actionForm.order.billingAddress.lastName"/>
<br/>
- <netui:error value="billToLastName"/>
+ <netui:error key="billToLastName"/>
</td>
</tr>
<tr bgcolor=#FFFF88>
@@ -73,7 +73,7 @@
<td>
<netui:textBox size="40"
dataSource="actionForm.order.billingAddress.addr1"/>
<br/>
- <netui:error value="billToAddress1"/>
+ <netui:error key="billToAddress1"/>
</td>
</tr>
<tr bgcolor=#FFFF88>
@@ -82,7 +82,7 @@
<td>
<netui:textBox size="40"
dataSource="actionForm.order.billingAddress.addr2"/>
<br/>
- <netui:error value="billToAddress2"/>
+ <netui:error key="billToAddress2"/>
</td>
</tr>
<tr bgcolor=#FFFF88>
@@ -91,7 +91,7 @@
<td>
<netui:textBox size="20"
dataSource="actionForm.order.billingAddress.city"/>
<br/>
- <netui:error value="billToCity"/>
+ <netui:error key="billToCity"/>
</td>
</tr>
<tr bgcolor=#FFFF88>
@@ -100,7 +100,7 @@
<td>
<netui:textBox size="4"
dataSource="actionForm.order.billingAddress.state"/>
<br/>
- <netui:error value="billToState"/>
+ <netui:error key="billToState"/>
</td>
</tr>
<tr bgcolor=#FFFF88>
@@ -109,7 +109,7 @@
<td>
<netui:textBox size="10"
dataSource="actionForm.order.billingAddress.zip"/>
<br/>
- <netui:error value="billToZip"/>
+ <netui:error key="billToZip"/>
</td>
</tr>
<tr bgcolor=#FFFF88>
@@ -118,7 +118,7 @@
<td>
<netui:textBox size="15"
dataSource="actionForm.order.billingAddress.country"/>
<br/>
- <netui:error value="billToCountry"/>
+ <netui:error key="billToCountry"/>
</td>
</tr>
<tr bgcolor=#FFFF88>
Modified: incubator/beehive/trunk/samples/petstoreWeb/shop/cart.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/shop/cart.jsp?view=diff&rev=148860&p1=incubator/beehive/trunk/samples/petstoreWeb/shop/cart.jsp&r1=148859&p2=incubator/beehive/trunk/samples/petstoreWeb/shop/cart.jsp&r2=148860
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/shop/cart.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/shop/cart.jsp Thu Jan 27
23:27:33 2005
@@ -71,7 +71,7 @@
<td align="center">
<netui:textBox size="3"
dataSource="container.item.quantity"/>
<br/>
- <netui:error value="invalidQuantity${container.index}"/>
+ <netui:error key="invalidQuantity${container.index}"/>
</td>
<td align="right">
<netui:span value="${container.item.item.listPrice}">
