[jboss-cvs] JBossAS SVN: r66056 - projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Oct 11 20:08:17 EDT 2007


Author: scott.stark at jboss.org
Date: 2007-10-11 20:08:17 -0400 (Thu, 11 Oct 2007)
New Revision: 66056

Added:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear13DTDMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear14MetaData.java
Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/EarMetaData.java
Log:
Add legacy ear metadata roots

Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear13DTDMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear13DTDMetaData.java	                        (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear13DTDMetaData.java	2007-10-12 00:08:17 UTC (rev 66056)
@@ -0,0 +1,73 @@
+/*
+ * 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.ear.spec;
+
+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.DescriptionGroupMetaData;
+import org.jboss.metadata.javaee.spec.DisplayNameImpl;
+import org.jboss.metadata.javaee.spec.DisplayNamesImpl;
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * j2ee 1.3 and earlier ear metadata with no namespace
+ * 
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at XmlRootElement(name="application", namespace="")
+ at JBossXmlSchema(
+      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
+      ignoreUnresolvedFieldOrClass=false,
+      namespace="",
+      elementFormDefault=XmlNsForm.UNSET)
+ at XmlType(name="applicationType",
+      namespace="")
+public class Ear13DTDMetaData extends EarMetaData
+{
+   private static final long serialVersionUID = 1;
+
+   public String getDisplayName()
+   {
+      String name = null;
+      DescriptionGroupMetaData group = getDescriptionGroup();
+      if (group != null)
+      {
+         name = group.getDisplayName();
+      }
+      return name;
+   }
+   public void setDisplayName(String name)
+   {
+      DescriptionGroupMetaData group = new DescriptionGroupMetaData();
+      DisplayNameImpl dn = new DisplayNameImpl();
+      dn.setDisplayName(name);
+      DisplayNamesImpl names = new DisplayNamesImpl();
+      names.add(dn);
+      group.setDisplayNames(names);
+      setDescriptionGroup(group);
+   }
+}


Property changes on: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear13DTDMetaData.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + native

Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear14MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear14MetaData.java	                        (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear14MetaData.java	2007-10-12 00:08:17 UTC (rev 66056)
@@ -0,0 +1,56 @@
+/*
+ * 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.ear.spec;
+
+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;
+
+/**
+ * j2ee 1.4 ear metadata
+ * 
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at XmlRootElement(name="application", namespace=JavaEEMetaDataConstants.J2EE_NS)
+ at JBossXmlSchema(
+      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
+      ignoreUnresolvedFieldOrClass=false,
+      namespace=JavaEEMetaDataConstants.J2EE_NS,
+      elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlType(name="applicationType",
+      namespace=JavaEEMetaDataConstants.J2EE_NS)
+public class Ear14MetaData extends EarMetaData
+{
+   private static final long serialVersionUID = 1;
+
+   @Override
+   public boolean isEE14()
+   {
+      return true;
+   }
+
+}


Property changes on: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear14MetaData.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + native

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/EarMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/EarMetaData.java	2007-10-12 00:07:40 UTC (rev 66055)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/EarMetaData.java	2007-10-12 00:08:17 UTC (rev 66056)
@@ -59,6 +59,13 @@
    {
       this.dtdPublicId = publicId;
       this.dtdSystemId = systemId;
+      // Set the version based on
+      if (dtdPublicId != null && dtdPublicId.contains("1.3"))
+         setVersion("1.3");
+      else if (dtdSystemId != null && dtdSystemId.contains("1.3"))
+         setVersion("1.3");
+      else if (dtdSystemId != null && dtdSystemId.contains("1.2"))
+         setVersion("1.2");
    }
    /**
     * Get the DTD public id if one was seen




More information about the jboss-cvs-commits mailing list