Author: gvanmatre
Date: Wed Feb 8 19:04:43 2006
New Revision: 376163
URL: http://svn.apache.org/viewcvs?rev=376163&view=rev
Log:
Fix for Bug# 38566 reported by Hermod Opstvedt.
Modified:
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/Bundle.properties
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/parser/builder/Builder.java
Modified:
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/Bundle.properties
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/Bundle.properties?rev=376163&r1=376162&r2=376163&view=diff
==============================================================================
---
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/Bundle.properties
(original)
+++
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/Bundle.properties
Wed Feb 8 19:04:43 2006
@@ -125,7 +125,7 @@
circular.child.extends.same.parent.exception=Circular composition detected;
contained element ({0}) cannot inherit from owning parent component ({1}).
jsfid.notfound=The component identified by jsfid {0} could not be found.
config.notloaded=ConfigBean is not loaded to handle a component identified by
jsfid {0}.
-file.notfound=Unable to find file {0}. If this is a full HTML or XML view,
check your navigation rules.
+file.notfound=Unable to find file {0}.
check.tree=Checking for duplicate component ids within a naming container
({0}) #:-<
#org.apache.shale.clay.config.beans.TemplateConfigBean
@@ -135,6 +135,8 @@
#org.apache.shale.clay.parser.builder.Builder
encode.begin=Begin encoding node: {0}
encode.end=End encoding node: {0}
+parser.unresolved=Unable to resolve a JSF component using document token:
{0}\n{1}
+
#org.apache.shale.clay.utils.ClayAmalgam
missing.attribute=The "{0}" attribute is required when using the
ClayAmalgam.{1}() validator method binding event.
Modified:
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/parser/builder/Builder.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/parser/builder/Builder.java?rev=376163&r1=376162&r2=376163&view=diff
==============================================================================
---
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/parser/builder/Builder.java
(original)
+++
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/parser/builder/Builder.java
Wed Feb 8 19:04:43 2006
@@ -257,10 +257,18 @@
// disconnect component type
target.setComponentType(null);
- //assign the parent
- config.assignParent(target);
- // resolve inheritance
- config.realizingInheritance(target);
+
+ try {
+ //assign the parent
+ config.assignParent(target);
+ // resolve inheritance
+ config.realizingInheritance(target);
+ } catch (RuntimeException e) {
+ log.error(e);
+ throw new RuntimeException(
+ messages.getMessage("parser.unresolved",
+ new Object[] {node.getToken(),
node.getToken().getRawText()}));
+ }
// if the inheritance is broken, toggle back to the default
if (target.getComponentType() == null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
