Author: markt
Date: Thu Nov 14 16:24:37 2013
New Revision: 1541952
URL: http://svn.apache.org/r1541952
Log:
Rename descriptor representations to avoid name clashes with
implementations.
Added:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TagFileXml.java
- copied, changed from r1541951,
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TagFile.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TagXml.java
- copied, changed from r1541951,
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/Tag.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/ValidatorXml.java
- copied, changed from r1541951,
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/Validator.java
Removed:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/Tag.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TagFile.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/Validator.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TaglibXml.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java
tomcat/trunk/test/org/apache/tomcat/util/descriptor/tld/TestTldParser.java
Copied: tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TagFileXml.java
(from r1541951,
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TagFile.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TagFileXml.java?p2=tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TagFileXml.java&p1=tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TagFile.java&r1=1541951&r2=1541952&rev=1541952&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TagFile.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TagFileXml.java Thu
Nov 14 16:24:37 2013
@@ -21,7 +21,7 @@ package org.apache.tomcat.util.descripto
* This does not contain the tag-specific attributes that requiring parsing
* the actual tag file to derive.
*/
-public class TagFile {
+public class TagFileXml {
private String name;
private String path;
private String displayName;
Copied: tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TagXml.java
(from r1541951,
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/Tag.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TagXml.java?p2=tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TagXml.java&p1=tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/Tag.java&r1=1541951&r2=1541952&rev=1541952&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/Tag.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TagXml.java Thu Nov
14 16:24:37 2013
@@ -29,7 +29,7 @@ import javax.servlet.jsp.tagext.TagVaria
* TagInfo in that is does not provide a link back to the tag library that
* defined it.
*/
-public class Tag {
+public class TagXml {
private String name;
private String tagClass;
private String teiClass;
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TaglibXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TaglibXml.java?rev=1541952&r1=1541951&r2=1541952&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TaglibXml.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TaglibXml.java Thu
Nov 14 16:24:37 2013
@@ -36,9 +36,9 @@ public class TaglibXml {
private String shortName;
private String uri;
private String info;
- private Validator validator;
- private List<Tag> tags;
- private List<TagFile> tagFiles;
+ private ValidatorXml validator;
+ private List<TagXml> tags;
+ private List<TagFileXml> tagFiles;
private List<String> listeners;
private List<FunctionInfo> functions;
@@ -82,33 +82,33 @@ public class TaglibXml {
this.info = info;
}
- public Validator getValidator() {
+ public ValidatorXml getValidator() {
return validator;
}
- public void setValidator(Validator validator) {
+ public void setValidator(ValidatorXml validator) {
this.validator = validator;
}
- public void addTag(Tag tag) {
+ public void addTag(TagXml tag) {
if (tags == null) {
tags = new ArrayList<>();
}
tags.add(tag);
}
- public List<Tag> getTags() {
+ public List<TagXml> getTags() {
return tags;
}
- public void addTagFile(TagFile tag) {
+ public void addTagFile(TagFileXml tag) {
if (tagFiles == null) {
tagFiles = new ArrayList<>();
}
tagFiles.add(tag);
}
- public List<TagFile> getTagFiles() {
+ public List<TagFileXml> getTagFiles() {
return tagFiles;
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java?rev=1541952&r1=1541951&r2=1541952&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java Thu
Nov 14 16:24:37 2013
@@ -62,16 +62,16 @@ public class TldRuleSet extends RuleSetB
digester.addCallMethod(PREFIX + "/listener/listener-class",
"addListener", 0);
// validator
- digester.addObjectCreate(VALIDATOR_PREFIX, Validator.class.getName());
+ digester.addObjectCreate(VALIDATOR_PREFIX,
ValidatorXml.class.getName());
digester.addCallMethod(VALIDATOR_PREFIX + "/validator-class",
"setValidatorClass", 0);
digester.addCallMethod(VALIDATOR_PREFIX + "/init-param",
"addInitParam", 2);
digester.addCallParam(VALIDATOR_PREFIX + "/init-param/param-name", 0);
digester.addCallParam(VALIDATOR_PREFIX + "/init-param/param-value", 1);
- digester.addSetNext(VALIDATOR_PREFIX, "setValidator",
Validator.class.getName());
+ digester.addSetNext(VALIDATOR_PREFIX, "setValidator",
ValidatorXml.class.getName());
// tag
- digester.addObjectCreate(TAG_PREFIX, Tag.class.getName());
+ digester.addObjectCreate(TAG_PREFIX, TagXml.class.getName());
addDescriptionGroup(digester, TAG_PREFIX);
digester.addCallMethod(TAG_PREFIX + "/name", "setName", 0);
digester.addCallMethod(TAG_PREFIX + "/tagclass", "setTagClass", 0);
@@ -108,15 +108,15 @@ public class TldRuleSet extends RuleSetB
new GenericBooleanRule(Attribute.class, "setFragment"));
digester.addRule(TAG_PREFIX + "/dynamic-attributes",
- new GenericBooleanRule(Tag.class, "setDynamicAttributes"));
- digester.addSetNext(TAG_PREFIX, "addTag", Tag.class.getName());
+ new GenericBooleanRule(TagXml.class, "setDynamicAttributes"));
+ digester.addSetNext(TAG_PREFIX, "addTag", TagXml.class.getName());
// tag-file
- digester.addObjectCreate(TAGFILE_PREFIX, TagFile.class.getName());
+ digester.addObjectCreate(TAGFILE_PREFIX, TagFileXml.class.getName());
addDescriptionGroup(digester, TAGFILE_PREFIX);
digester.addCallMethod(TAGFILE_PREFIX + "/name", "setName", 0);
digester.addCallMethod(TAGFILE_PREFIX + "/path", "setPath", 0);
- digester.addSetNext(TAGFILE_PREFIX, "addTagFile",
TagFile.class.getName());
+ digester.addSetNext(TAGFILE_PREFIX, "addTagFile",
TagFileXml.class.getName());
// function
digester.addCallMethod(FUNCTION_PREFIX, "addFunction", 3);
@@ -146,7 +146,7 @@ public class TldRuleSet extends RuleSetB
@Override
public void end(String namespace, String name) throws Exception {
Attribute attribute = (Attribute) digester.pop();
- Tag tag = (Tag) digester.peek();
+ TagXml tag = (TagXml) digester.peek();
tag.getAttributes().add(attribute.toTagAttributeInfo());
}
}
@@ -292,7 +292,7 @@ public class TldRuleSet extends RuleSetB
@Override
public void end(String namespace, String name) throws Exception {
Variable variable = (Variable) digester.pop();
- Tag tag = (Tag) digester.peek();
+ TagXml tag = (TagXml) digester.peek();
tag.getVariables().add(variable.toTagVariableInfo());
}
}
Copied:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/ValidatorXml.java (from
r1541951,
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/Validator.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/ValidatorXml.java?p2=tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/ValidatorXml.java&p1=tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/Validator.java&r1=1541951&r2=1541952&rev=1541952&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/Validator.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/ValidatorXml.java
Thu Nov 14 16:24:37 2013
@@ -22,7 +22,7 @@ import java.util.Map;
/**
* Model of a Tag Library Validator from the XML descriptor.
*/
-public class Validator {
+public class ValidatorXml {
private String validatorClass;
private Map<String, String> initParams;
Modified:
tomcat/trunk/test/org/apache/tomcat/util/descriptor/tld/TestTldParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/descriptor/tld/TestTldParser.java?rev=1541952&r1=1541951&r2=1541952&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/descriptor/tld/TestTldParser.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/descriptor/tld/TestTldParser.java
Thu Nov 14 16:24:37 2013
@@ -48,13 +48,13 @@ public class TestTldParser {
Assert.assertEquals("http://tomcat.apache.org/TldTests";, xml.getUri());
Assert.assertEquals(1, xml.getFunctions().size());
- Validator validator = xml.getValidator();
+ ValidatorXml validator = xml.getValidator();
Assert.assertEquals("com.example.Validator",
validator.getValidatorClass());
Assert.assertEquals(1, validator.getInitParams().size());
Assert.assertEquals("value", validator.getInitParams().get("name"));
Assert.assertEquals(1, xml.getTags().size());
- Tag tag = xml.getTags().get(0);
+ TagXml tag = xml.getTags().get(0);
Assert.assertEquals("org.apache.jasper.compiler.TestValidator$Echo",
tag.getTagClass());
Assert.assertEquals("empty", tag.getBodyContent());
Assert.assertTrue(tag.hasDynamicAttributes());
@@ -93,7 +93,7 @@ public class TestTldParser {
Assert.assertEquals("java.util.Date getDate()",
attributeInfo.getMethodSignature());
Assert.assertEquals(1, xml.getTagFiles().size());
- TagFile tagFile = xml.getTagFiles().get(0);
+ TagFileXml tagFile = xml.getTagFiles().get(0);
Assert.assertEquals("Echo", tag.getDisplayName());
Assert.assertEquals("small", tag.getSmallIcon());
Assert.assertEquals("large", tag.getLargeIcon());
@@ -147,9 +147,9 @@ public class TestTldParser {
verifyTags(xml.getTags());
}
- private void verifyTags(List<Tag> tags) {
+ private void verifyTags(List<TagXml> tags) {
Assert.assertEquals(1, tags.size());
- Tag tag = tags.get(0);
+ TagXml tag = tags.get(0);
Assert.assertEquals("Echo", tag.getName());
Assert.assertEquals("org.apache.jasper.compiler.TestValidator$Echo",
tag.getTagClass());
Assert.assertEquals("empty", tag.getBodyContent());
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
