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

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2007-10-11 20:07:40 -0400 (Thu, 11 Oct 2007)
New Revision: 66055

Added:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBoss50DTDAppMetaData.java
Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java
Log:
Add a 5.0 dtd metadata root with an empty namespace

Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBoss50DTDAppMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBoss50DTDAppMetaData.java	                        (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBoss50DTDAppMetaData.java	2007-10-12 00:07:40 UTC (rev 66055)
@@ -0,0 +1,49 @@
+/*
+ * 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.jboss;
+
+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;
+
+/**
+ * jboss-app metadata without a namespace
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at XmlRootElement(name="jboss-app", namespace="")
+ at JBossXmlSchema(
+      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
+      ignoreUnresolvedFieldOrClass=false,
+      namespace="",
+      elementFormDefault=XmlNsForm.UNSET)
+ at XmlType(name="jboss-appType",
+      namespace="")
+public class JBoss50DTDAppMetaData extends JBossAppMetaData
+{
+   private static final long serialVersionUID = 1;
+
+}


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

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java	2007-10-11 22:26:48 UTC (rev 66054)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java	2007-10-12 00:07:40 UTC (rev 66055)
@@ -46,6 +46,8 @@
 public class JBossAppMetaData extends IdMetaDataImplWithOverride<EarMetaData>
 {
    private static final long serialVersionUID = 1;
+   private String dtdPublicId;
+   private String dtdSystemId;
    /** jboss application version */
    private String version;
    /** The default application security domain */
@@ -61,6 +63,48 @@
    private String libraryDirectory;
    private String jmxName;
 
+   /**
+    * Callback for the DTD information
+    * @param root
+    * @param publicId
+    * @param systemId
+    */
+   @XmlTransient
+   public void setDTD(String root, String publicId, String systemId)
+   {
+      this.dtdPublicId = publicId;
+      this.dtdSystemId = systemId;
+      // Set the version based on
+      if (dtdPublicId != null && dtdPublicId.contains("3.0"))
+         setVersion("3.0");
+      if (dtdPublicId != null && dtdPublicId.contains("3.2"))
+         setVersion("3.2");
+      if (dtdPublicId != null && dtdPublicId.contains("4.0"))
+         setVersion("4.0");
+      if (dtdPublicId != null && dtdPublicId.contains("4.2"))
+         setVersion("4.2");
+      if (dtdPublicId != null && dtdPublicId.contains("5.0"))
+         setVersion("5.0");
+   }
+   /**
+    * Get the DTD public id if one was seen
+    * @return the value of the web.xml dtd public id
+    */
+   @XmlTransient
+   public String getDtdPublicId()
+   {
+      return dtdPublicId;
+   }
+   /**
+    * Get the DTD system id if one was seen
+    * @return the value of the web.xml dtd system id
+    */
+   @XmlTransient
+   public String getDtdSystemId()
+   {
+      return dtdSystemId;
+   }
+
    public LoaderRepositoryMetaData getLoaderRepository()
    {
       return loaderRepository;