[jboss-cvs] JBossAS SVN: r92742 - in projects/metadata/web/trunk/src: test/resources/org/jboss/test/metadata/web and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 24 09:49:11 EDT 2009
Author: remy.maucherat at jboss.com
Date: 2009-08-24 09:49:11 -0400 (Mon, 24 Aug 2009)
New Revision: 92742
Added:
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tag12MetaData.java
Modified:
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/AttributeMetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/TagMetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld11MetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld12MetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld20MetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld21MetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ValidatorMetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/VariableMetaData.java
projects/metadata/web/trunk/src/test/resources/org/jboss/test/metadata/web/Tld11_testEverything.xml
projects/metadata/web/trunk/src/test/resources/org/jboss/test/metadata/web/Tld12_testEverything.xml
Log:
- Attempt to handle all the conflicts between TLD versions in a relatively manageable way.
- I'll add a web.xml 2.2 test case, I'm not sure it works right now.
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/AttributeMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/AttributeMetaData.java 2009-08-24 13:31:15 UTC (rev 92741)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/AttributeMetaData.java 2009-08-24 13:49:11 UTC (rev 92742)
@@ -36,7 +36,7 @@
@XmlType(name="tld-attributeType",
namespace=JavaEEMetaDataConstants.JAVAEE_NS,
propOrder={"descriptions", "name", "required", "rtexprvalue", "type", "deferredValue", "deferredMethod",
- "fragment"})
+ "fragment", "descriptions"})
public class AttributeMetaData extends NamedMetaDataWithDescriptions
{
private static final long serialVersionUID = 1;
Added: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tag12MetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tag12MetaData.java (rev 0)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tag12MetaData.java 2009-08-24 13:49:11 UTC (rev 92742)
@@ -0,0 +1,83 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.web.spec;
+
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+
+/**
+ * taglib/tag metadata
+ *
+ * @author Remy Maucherat
+ * @version $Revision: 75201 $
+ */
+ at XmlType(name="tagType",
+ namespace=JavaEEMetaDataConstants.JAVAEE_NS,
+ propOrder={"name", "tagClass", "teiClass", "bodyContent", "displayName", "smallIcon", "largeIcon",
+ "description", "variables", "attributes", "examples"})
+public class Tag12MetaData extends TagMetaData
+{
+ private static final long serialVersionUID = 1;
+
+ private String displayName;
+ private String smallIcon;
+ private String largeIcon;
+ private String description;
+
+ public String getDisplayName()
+ {
+ return displayName;
+ }
+ public void setDisplayName(String displayName)
+ {
+ this.displayName = displayName;
+ }
+
+ public String getSmallIcon()
+ {
+ return smallIcon;
+ }
+ public void setSmallIcon(String smallIcon)
+ {
+ this.smallIcon = smallIcon;
+ }
+
+ public String getLargeIcon()
+ {
+ return largeIcon;
+ }
+ public void setLargeIcon(String largeIcon)
+ {
+ this.largeIcon = largeIcon;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+ public void setDescription(String description)
+ {
+ this.description = description;
+ }
+
+}
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/TagMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/TagMetaData.java 2009-08-24 13:31:15 UTC (rev 92741)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/TagMetaData.java 2009-08-24 13:49:11 UTC (rev 92742)
@@ -37,7 +37,7 @@
*/
@XmlType(name="tagType",
namespace=JavaEEMetaDataConstants.JAVAEE_NS,
- propOrder={"descriptionGroup", "name", "tagClass", "teiClass", "bodyContent", "variables", "attributes",
+ propOrder={"descriptionGroup", "name", "tagClass", "teiClass", "bodyContent", "descriptionGroup", "variables", "attributes",
"dynamicAttributes", "examples", "tagExtensions"})
public class TagMetaData extends NamedMetaDataWithDescriptionGroup
{
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld11MetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld11MetaData.java 2009-08-24 13:31:15 UTC (rev 92741)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld11MetaData.java 2009-08-24 13:49:11 UTC (rev 92742)
@@ -1,15 +1,14 @@
package org.jboss.metadata.web.spec;
+import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
import org.jboss.xb.annotations.JBossXmlSchema;
/**
@@ -32,7 +31,6 @@
private static final long serialVersionUID = 1;
private String info;
- private List<Tag11MetaData> tags;
@Override
public String getVersion()
@@ -67,10 +65,10 @@
this.info = info;
}
- @XmlElement(name="tag")
- public void setTags0(List<Tag11MetaData> tags)
+ @XmlElement(name="tag", type=Tag11MetaData.class)
+ public void setTags(List<TagMetaData> tags)
{
- this.tags = tags;
+ super.setTags(tags);
}
}
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld12MetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld12MetaData.java 2009-08-24 13:31:15 UTC (rev 92741)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld12MetaData.java 2009-08-24 13:49:11 UTC (rev 92742)
@@ -1,6 +1,9 @@
package org.jboss.metadata.web.spec;
+import java.util.List;
+
import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
@@ -23,15 +26,63 @@
elementFormDefault=XmlNsForm.QUALIFIED,
normalizeSpace=true)
@XmlType(name="tldTaglibType",
- propOrder={"tlibVersion", "jspVersion", "shortName", "uri", "descriptionGroup", "validator", "listeners", "tags"})
+ propOrder={"tlibVersion", "jspVersion", "shortName", "uri", "displayName", "smallIcon", "largeIcon",
+ "description", "validator", "listeners", "tags"})
public class Tld12MetaData extends TldMetaData
{
private static final long serialVersionUID = 1;
+ private String displayName;
+ private String smallIcon;
+ private String largeIcon;
+ private String description;
+
@Override
public String getVersion()
{
return "1.2";
}
+ @XmlElement(name="tag", type=Tag12MetaData.class)
+ public void setTags(List<TagMetaData> tags)
+ {
+ super.setTags(tags);
+ }
+
+ public String getDisplayName()
+ {
+ return displayName;
+ }
+ public void setDisplayName(String displayName)
+ {
+ this.displayName = displayName;
+ }
+
+ public String getSmallIcon()
+ {
+ return smallIcon;
+ }
+ public void setSmallIcon(String smallIcon)
+ {
+ this.smallIcon = smallIcon;
+ }
+
+ public String getLargeIcon()
+ {
+ return largeIcon;
+ }
+ public void setLargeIcon(String largeIcon)
+ {
+ this.largeIcon = largeIcon;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+ public void setDescription(String description)
+ {
+ this.description = description;
+ }
+
}
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld20MetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld20MetaData.java 2009-08-24 13:31:15 UTC (rev 92741)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld20MetaData.java 2009-08-24 13:49:11 UTC (rev 92742)
@@ -1,6 +1,9 @@
package org.jboss.metadata.web.spec;
+import java.util.List;
+
import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld21MetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld21MetaData.java 2009-08-24 13:31:15 UTC (rev 92741)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld21MetaData.java 2009-08-24 13:49:11 UTC (rev 92742)
@@ -1,6 +1,9 @@
package org.jboss.metadata.web.spec;
+import java.util.List;
+
import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ValidatorMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ValidatorMetaData.java 2009-08-24 13:31:15 UTC (rev 92741)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ValidatorMetaData.java 2009-08-24 13:49:11 UTC (rev 92742)
@@ -38,7 +38,7 @@
*/
@XmlType(name="validatorType",
namespace=JavaEEMetaDataConstants.JAVAEE_NS,
- propOrder={"descriptions", "validatorClass", "initParams"})
+ propOrder={"descriptions", "validatorClass", "initParams", "descriptions"})
public class ValidatorMetaData extends IdMetaDataImplWithDescriptions
{
private static final long serialVersionUID = 1;
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/VariableMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/VariableMetaData.java 2009-08-24 13:31:15 UTC (rev 92741)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/VariableMetaData.java 2009-08-24 13:49:11 UTC (rev 92742)
@@ -34,7 +34,7 @@
*/
@XmlType(name="variableType",
namespace=JavaEEMetaDataConstants.JAVAEE_NS,
- propOrder={"descriptions", "nameGiven", "nameFromAttribute", "variableClass", "declare", "scope"})
+ propOrder={"descriptions", "nameGiven", "nameFromAttribute", "variableClass", "declare", "scope", "descriptions"})
public class VariableMetaData extends IdMetaDataImplWithDescriptions
{
private static final long serialVersionUID = 1;
Modified: projects/metadata/web/trunk/src/test/resources/org/jboss/test/metadata/web/Tld11_testEverything.xml
===================================================================
--- projects/metadata/web/trunk/src/test/resources/org/jboss/test/metadata/web/Tld11_testEverything.xml 2009-08-24 13:31:15 UTC (rev 92741)
+++ projects/metadata/web/trunk/src/test/resources/org/jboss/test/metadata/web/Tld11_testEverything.xml 2009-08-24 13:49:11 UTC (rev 92742)
@@ -71,7 +71,7 @@
<tag>
<name>log</name>
<tagclass>examples.LogTag</tagclass>
- <bodycontent>TAGDEPENDENT</bodycontent>
+ <bodycontent>tagdependent</bodycontent>
<info>
Perform a server side action; Log the message.
</info>
Modified: projects/metadata/web/trunk/src/test/resources/org/jboss/test/metadata/web/Tld12_testEverything.xml
===================================================================
--- projects/metadata/web/trunk/src/test/resources/org/jboss/test/metadata/web/Tld12_testEverything.xml 2009-08-24 13:31:15 UTC (rev 92741)
+++ projects/metadata/web/trunk/src/test/resources/org/jboss/test/metadata/web/Tld12_testEverything.xml 2009-08-24 13:49:11 UTC (rev 92742)
@@ -25,6 +25,9 @@
<jsp-version>1.2</jsp-version>
<short-name>simple</short-name>
<uri>http://jakarta.apache.org/tomcat/example-taglib</uri>
+ <display-name>Foo</display-name>
+ <small-icon>small.ico</small-icon>
+ <large-icon>large.ico</large-icon>
<description>
A simple tab library for the examples
</description>
@@ -32,6 +35,9 @@
<tag>
<name>ShowSource</name>
<tag-class>examples.ShowSource</tag-class>
+ <display-name>tag0</display-name>
+ <small-icon>small-tag0.ico</small-icon>
+ <large-icon>large-tag0.ico</large-icon>
<description> Display JSP sources </description>
<attribute>
<name>jspFile</name>
@@ -70,7 +76,7 @@
<tag>
<name>log</name>
<tag-class>examples.LogTag</tag-class>
- <body-content>TAGDEPENDENT</body-content>
+ <body-content>tagdependent</body-content>
<description>
Perform a server side action; Log the message.
</description>
More information about the jboss-cvs-commits
mailing list