Return-Path: Delivered-To: apmail-jakarta-hivemind-cvs-archive@www.apache.org Received: (qmail 70167 invoked from network); 31 Jan 2005 10:38:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 31 Jan 2005 10:38:29 -0000 Received: (qmail 84436 invoked by uid 500); 31 Jan 2005 10:38:29 -0000 Delivered-To: apmail-jakarta-hivemind-cvs-archive@jakarta.apache.org Received: (qmail 84417 invoked by uid 500); 31 Jan 2005 10:38:29 -0000 Mailing-List: contact hivemind-cvs-help@jakarta.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: hivemind-dev@jakarta.apache.org Delivered-To: mailing list hivemind-cvs@jakarta.apache.org Received: (qmail 84399 invoked by uid 99); 31 Jan 2005 10:38:29 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Mon, 31 Jan 2005 02:38:29 -0800 Received: (qmail 70157 invoked by uid 1870); 31 Jan 2005 10:38:28 -0000 Date: 31 Jan 2005 10:38:28 -0000 Message-ID: <20050131103828.70156.qmail@minotaur.apache.org> From: knut@apache.org To: jakarta-hivemind-cvs@apache.org Subject: cvs commit: jakarta-hivemind/framework/src/test/org/apache/hivemind/impl TestSchemaProcessor.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N knut 2005/01/31 02:38:27 Modified: framework/src/java/org/apache/hivemind/impl SchemaProcessorImpl.java framework/src/test/org/apache/hivemind/impl TestSchemaProcessor.java Log: Make sure key attribute value is symbol expanded prior to translation Revision Changes Path 1.14 +9 -3 jakarta-hivemind/framework/src/java/org/apache/hivemind/impl/SchemaProcessorImpl.java Index: SchemaProcessorImpl.java =================================================================== RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/impl/SchemaProcessorImpl.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- SchemaProcessorImpl.java 31 Jan 2005 10:10:54 -0000 1.13 +++ SchemaProcessorImpl.java 31 Jan 2005 10:38:27 -0000 1.14 @@ -95,13 +95,19 @@ if (_canElementsBeMapped) { Element currentElement = peekElement(); - String keyAttribute = _activeElement.getKeyAttribute(); + String expandedKey = getContributingModule().expandSymbols( + currentElement.getAttributeValue(keyAttribute), + currentElement.getLocation()); + Translator t = getAttributeTranslator(keyAttribute); - Object finalValue = t.translate(getContributingModule(), Object.class, currentElement - .getAttributeValue(keyAttribute), currentElement.getLocation()); + Object finalValue = t.translate( + getContributingModule(), + Object.class, + expandedKey, + currentElement.getLocation()); _mappedElements.put(finalValue, element); } 1.11 +6 -3 jakarta-hivemind/framework/src/test/org/apache/hivemind/impl/TestSchemaProcessor.java Index: TestSchemaProcessor.java =================================================================== RCS file: /home/cvs/jakarta-hivemind/framework/src/test/org/apache/hivemind/impl/TestSchemaProcessor.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- TestSchemaProcessor.java 31 Jan 2005 10:10:54 -0000 1.10 +++ TestSchemaProcessor.java 31 Jan 2005 10:38:27 -0000 1.11 @@ -266,8 +266,8 @@ ElementImpl element = new ElementImpl(); element.setElementName("cartoon"); - element.setContent("fred"); - element.addAttribute(new AttributeImpl("name", "flintstone")); + element.setContent("${fred}"); + element.addAttribute(new AttributeImpl("name", "${flintstone}")); List elements = Collections.singletonList(element); @@ -277,9 +277,12 @@ m.getClassResolver(); control.setReturnValue(new DefaultClassResolver()); - m.expandSymbols("fred", null); + m.expandSymbols("${fred}", null); control.setReturnValue("fred"); + m.expandSymbols("${flintstone}", null); + control.setReturnValue("flintstone"); + MockControl tControl = newControl(Translator.class); Translator t = (Translator) tControl.getMock(); --------------------------------------------------------------------- To unsubscribe, e-mail: hivemind-cvs-unsubscribe@jakarta.apache.org For additional commands, e-mail: hivemind-cvs-help@jakarta.apache.org