[jboss-cvs] JBossAS SVN: r84065 - projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 10 11:14:15 EST 2009
Author: remy.maucherat at jboss.com
Date: 2009-02-10 11:14:15 -0500 (Tue, 10 Feb 2009)
New Revision: 84065
Added:
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Tld11MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Tld12MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Tld20MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Tld21MetaData.java
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/AttributeMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/DeferredMethodMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/DeferredValueMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/TagMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/TldMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ValidatorMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/VariableMetaData.java
Log:
- Some improvements to the .tld metadata.
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/AttributeMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/AttributeMetaData.java 2009-02-10 16:11:46 UTC (rev 84064)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/AttributeMetaData.java 2009-02-10 16:14:15 UTC (rev 84065)
@@ -21,15 +21,16 @@
*/
package org.jboss.metadata.web.spec;
-import org.jboss.metadata.javaee.support.NamedMetaDataWithDescriptionGroup;
+import org.jboss.metadata.javaee.support.NamedMetaDataWithDescriptions;
+
/**
* taglib/tag-file metadata
*
* @author Remy Maucherat
* @version $Revision: 75201 $
*/
-public class AttributeMetaData extends NamedMetaDataWithDescriptionGroup
+public class AttributeMetaData extends NamedMetaDataWithDescriptions
{
private static final long serialVersionUID = 1;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/DeferredMethodMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/DeferredMethodMetaData.java 2009-02-10 16:11:46 UTC (rev 84064)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/DeferredMethodMetaData.java 2009-02-10 16:14:15 UTC (rev 84065)
@@ -44,4 +44,14 @@
this.type = type;
}
+ public String toString()
+ {
+ StringBuilder tmp = new StringBuilder("DeferredMethodMetaData(id=");
+ tmp.append(getId());
+ tmp.append(",type=");
+ tmp.append(type);
+ tmp.append(')');
+ return tmp.toString();
+ }
+
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/DeferredValueMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/DeferredValueMetaData.java 2009-02-10 16:11:46 UTC (rev 84064)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/DeferredValueMetaData.java 2009-02-10 16:14:15 UTC (rev 84065)
@@ -44,4 +44,14 @@
this.methodSignature = methodSignature;
}
+ public String toString()
+ {
+ StringBuilder tmp = new StringBuilder("DeferredValueMetaData(id=");
+ tmp.append(getId());
+ tmp.append(",methodSignature=");
+ tmp.append(methodSignature);
+ tmp.append(')');
+ return tmp.toString();
+ }
+
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/TagMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/TagMetaData.java 2009-02-10 16:11:46 UTC (rev 84064)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/TagMetaData.java 2009-02-10 16:14:15 UTC (rev 84065)
@@ -52,6 +52,11 @@
{
this.tagClass = tagClass;
}
+ @XmlElement(name="tagclass")
+ public void setTagClass0(String tagClass)
+ {
+ setTagClass(tagClass);
+ }
public String getTeiClass()
{
@@ -61,6 +66,11 @@
{
this.teiClass = teiClass;
}
+ @XmlElement(name="teiclass")
+ public void setTeiClass0(String teiClass)
+ {
+ setTeiClass(teiClass);
+ }
public BodyContentType getBodyContent()
{
@@ -70,6 +80,11 @@
{
this.bodyContent = bodyContent;
}
+ @XmlElement(name="bodycontent")
+ public void setBodyContent0(BodyContentType bodyContent)
+ {
+ setBodyContent(bodyContent);
+ }
public boolean getDynamicAttributes()
{
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Tld11MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Tld11MetaData.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Tld11MetaData.java 2009-02-10 16:14:15 UTC (rev 84065)
@@ -0,0 +1,48 @@
+package org.jboss.metadata.web.spec;
+
+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 org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+
+/**
+ * TLD spec metadata.
+ *
+ * @author Remy Maucherat
+ * @version $Revision: 81860 $
+ */
+ at XmlRootElement(name="taglib", namespace="")
+ at JBossXmlSchema(
+ xmlns={@XmlNs(namespaceURI = "", prefix="jee")},
+ ignoreUnresolvedFieldOrClass=false,
+ namespace="",
+ elementFormDefault=XmlNsForm.UNSET,
+ normalizeSpace=true)
+public class Tld11MetaData extends TldMetaData
+{
+ private static final long serialVersionUID = 1;
+
+ @Override
+ public String getVersion()
+ {
+ return "1.1";
+ }
+
+ @Override
+ @XmlElement(name="tlibversion")
+ public void setTlibVersion(String tlibVersion)
+ {
+ super.setTlibVersion(tlibVersion);
+ }
+
+ @Override
+ @XmlElement(name="jspversion")
+ public void setJspVersion(String jspVersion)
+ {
+ super.setJspVersion(jspVersion);
+ }
+
+}
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Tld12MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Tld12MetaData.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Tld12MetaData.java 2009-02-10 16:14:15 UTC (rev 84065)
@@ -0,0 +1,33 @@
+package org.jboss.metadata.web.spec;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+
+/**
+ * TLD spec metadata.
+ *
+ * @author Remy Maucherat
+ * @version $Revision: 81860 $
+ */
+ at XmlRootElement(name="taglib", namespace="")
+ at JBossXmlSchema(
+ xmlns={@XmlNs(namespaceURI = "", prefix="jee")},
+ ignoreUnresolvedFieldOrClass=false,
+ namespace="",
+ elementFormDefault=XmlNsForm.UNSET,
+ normalizeSpace=true)
+public class Tld12MetaData extends TldMetaData
+{
+ private static final long serialVersionUID = 1;
+
+ @Override
+ public String getVersion()
+ {
+ return "1.2";
+ }
+
+}
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Tld20MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Tld20MetaData.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Tld20MetaData.java 2009-02-10 16:14:15 UTC (rev 84065)
@@ -0,0 +1,27 @@
+package org.jboss.metadata.web.spec;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+
+/**
+ * TLD spec metadata.
+ *
+ * @author Remy Maucherat
+ * @version $Revision: 81860 $
+ */
+ at XmlRootElement(name="taglib", namespace=JavaEEMetaDataConstants.J2EE_NS)
+ at JBossXmlSchema(
+ xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
+ ignoreUnresolvedFieldOrClass=false,
+ namespace=JavaEEMetaDataConstants.J2EE_NS,
+ elementFormDefault=XmlNsForm.QUALIFIED,
+ normalizeSpace=true)
+public class Tld20MetaData extends TldMetaData
+{
+ private static final long serialVersionUID = 1;
+
+}
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Tld21MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Tld21MetaData.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Tld21MetaData.java 2009-02-10 16:14:15 UTC (rev 84065)
@@ -0,0 +1,27 @@
+package org.jboss.metadata.web.spec;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+
+/**
+ * TLD spec metadata.
+ *
+ * @author Remy Maucherat
+ * @version $Revision: 81860 $
+ */
+ at XmlRootElement(name="taglib", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
+ at JBossXmlSchema(
+ xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
+ ignoreUnresolvedFieldOrClass=false,
+ namespace=JavaEEMetaDataConstants.JAVAEE_NS,
+ elementFormDefault=XmlNsForm.QUALIFIED,
+ normalizeSpace=true)
+public class Tld21MetaData extends TldMetaData
+{
+ private static final long serialVersionUID = 1;
+
+}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/TldMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/TldMetaData.java 2009-02-10 16:11:46 UTC (rev 84064)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/TldMetaData.java 2009-02-10 16:14:15 UTC (rev 84065)
@@ -41,8 +41,6 @@
{
private static final long serialVersionUID = 1;
- // FIXME: Should separate things over the various versions like is done for web.xml
- // FIXME: Won't support .tld 1.1 DTD
private String dtdPublicId;
private String dtdSystemId;
private String version;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ValidatorMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ValidatorMetaData.java 2009-02-10 16:11:46 UTC (rev 84064)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ValidatorMetaData.java 2009-02-10 16:14:15 UTC (rev 84065)
@@ -26,7 +26,7 @@
import javax.xml.bind.annotation.XmlElement;
import org.jboss.metadata.javaee.spec.ParamValueMetaData;
-import org.jboss.metadata.javaee.support.IdMetaDataImpl;
+import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptions;
/**
* The tag/validator metadata
@@ -34,7 +34,7 @@
* @author Remy Maucherat
* @version $Revision: 81768 $
*/
-public class ValidatorMetaData extends IdMetaDataImpl
+public class ValidatorMetaData extends IdMetaDataImplWithDescriptions
{
private static final long serialVersionUID = 1;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/VariableMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/VariableMetaData.java 2009-02-10 16:11:46 UTC (rev 84064)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/VariableMetaData.java 2009-02-10 16:14:15 UTC (rev 84065)
@@ -21,7 +21,7 @@
*/
package org.jboss.metadata.web.spec;
-import org.jboss.metadata.javaee.support.IdMetaDataImpl;
+import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptions;
/**
* The tag/variable metadata
@@ -29,7 +29,7 @@
* @author Remy Maucherat
* @version $Revision: 81768 $
*/
-public class VariableMetaData extends IdMetaDataImpl
+public class VariableMetaData extends IdMetaDataImplWithDescriptions
{
private static final long serialVersionUID = 1;
More information about the jboss-cvs-commits
mailing list