[jboss-cvs] JBossAS SVN: r65896 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/ear and 6 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Oct 5 20:30:24 EDT 2007


Author: scott.stark at jboss.org
Date: 2007-10-05 20:30:24 -0400 (Fri, 05 Oct 2007)
New Revision: 65896

Added:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ConnectorModuleMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear50MetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear5xMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/EarMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/EjbModuleMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/JavaModuleMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ModuleMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ModulesMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/WebModuleMetaData.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xEverythingUnitTestCase.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5xEverything_testEverything.xml
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testId.xml
Log:
Checkpoint ear work

Added: 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	                        (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java	2007-10-06 00:30:24 UTC (rev 65896)
@@ -0,0 +1,31 @@
+/*
+ * 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;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class JBossAppMetaData
+{
+
+}


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

Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ConnectorModuleMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ConnectorModuleMetaData.java	                        (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ConnectorModuleMetaData.java	2007-10-06 00:30:24 UTC (rev 65896)
@@ -0,0 +1,34 @@
+/*
+ * 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.XmlType;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at XmlType(name="connectorType")
+public class ConnectorModuleMetaData extends ModuleMetaData
+{
+
+}


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

Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear50MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear50MetaData.java	                        (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear50MetaData.java	2007-10-06 00:30:24 UTC (rev 65896)
@@ -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.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;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at XmlRootElement(name="application", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
+ at JBossXmlSchema(
+      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
+      ignoreUnresolvedFieldOrClass=false,
+      namespace=JavaEEMetaDataConstants.JAVAEE_NS,
+      elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlType(name="applicationType",
+      namespace=JavaEEMetaDataConstants.JAVAEE_NS,
+      propOrder={"descriptionGroup", "modules", "securityRoles", "libraryDirectory"})
+public class Ear50MetaData extends Ear5xMetaData
+{
+   private static final long serialVersionUID = 1;
+
+}


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

Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear5xMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear5xMetaData.java	                        (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear5xMetaData.java	2007-10-06 00:30:24 UTC (rev 65896)
@@ -0,0 +1,46 @@
+/*
+ * 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;
+
+/**
+ * javaee 5.x ear metadata
+ * 
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class Ear5xMetaData extends EarMetaData
+{
+   private static final long serialVersionUID = 1;
+
+   private String libraryDirectory;
+
+   public String getLibraryDirectory()
+   {
+      return libraryDirectory;
+   }
+
+   public void setLibraryDirectory(String libraryDirectory)
+   {
+      this.libraryDirectory = libraryDirectory;
+   }
+
+}


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

Added: 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	                        (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/EarMetaData.java	2007-10-06 00:30:24 UTC (rev 65896)
@@ -0,0 +1,111 @@
+/*
+ * 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 java.util.List;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlElements;
+
+import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
+import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
+
+/**
+ * Common javaee application metadata
+ * 
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class EarMetaData extends IdMetaDataImplWithDescriptionGroup
+{
+   private static final long serialVersionUID = 1;
+   private String version;
+   /** The application modules */
+   private ModulesMetaData modules;
+   /** The security roles */
+   private SecurityRolesMetaData securityRoles;
+
+   /**
+    * 
+    * @return
+    */
+   public boolean isEE5()
+   {
+      return false;
+   }
+   public boolean isEE4()
+   {
+      return false;
+   }
+
+   /**
+    * Get the version.
+    * 
+    * @return the version.
+    */
+   public String getVersion()
+   {
+      return version;
+   }
+
+   /**
+    * Set the version.
+    * 
+    * @param version the version.
+    * @throws IllegalArgumentException for a null version
+    */
+   @XmlAttribute
+   public void setVersion(String version)
+   {
+      if (version == null)
+         throw new IllegalArgumentException("Null version");
+      this.version = version;
+   }
+
+   
+   public List<ModuleMetaData> getModules()
+   {
+      return null;
+   }
+   @XmlElementWrapper(name="module")
+   @XmlElements({
+      @XmlElement(name = "connector", required = false, type = ConnectorModuleMetaData.class),
+      @XmlElement(name = "java", required = false, type = JavaModuleMetaData.class),
+      @XmlElement(name = "ejb", required = false, type = EjbModuleMetaData.class),
+      @XmlElement(name = "web", required = false, type = WebModuleMetaData.class)
+   })
+   public void setModules(List<ModuleMetaData> modules)
+   {
+      //this.modules = modules;
+   }
+   public SecurityRolesMetaData getSecurityRoles()
+   {
+      return securityRoles;
+   }
+   public void setSecurityRoles(SecurityRolesMetaData securityRoles)
+   {
+      this.securityRoles = securityRoles;
+   }
+
+}


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

Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/EjbModuleMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/EjbModuleMetaData.java	                        (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/EjbModuleMetaData.java	2007-10-06 00:30:24 UTC (rev 65896)
@@ -0,0 +1,34 @@
+/*
+ * 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.XmlType;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at XmlType(name="ejbType")
+public class EjbModuleMetaData extends ModuleMetaData
+{
+
+}


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

Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/JavaModuleMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/JavaModuleMetaData.java	                        (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/JavaModuleMetaData.java	2007-10-06 00:30:24 UTC (rev 65896)
@@ -0,0 +1,34 @@
+/*
+ * 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.XmlType;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at XmlType(name="javaType")
+public class JavaModuleMetaData extends ModuleMetaData
+{
+
+}


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

Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ModuleMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ModuleMetaData.java	                        (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ModuleMetaData.java	2007-10-06 00:30:24 UTC (rev 65896)
@@ -0,0 +1,38 @@
+/*
+ * 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.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
+
+import org.jboss.metadata.javaee.support.IdMetaDataImpl;
+import org.jboss.xb.annotations.JBossXmlConstants;
+import org.jboss.xb.annotations.JBossXmlModelGroup;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class ModuleMetaData extends IdMetaDataImpl
+{
+   
+}


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

Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ModulesMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ModulesMetaData.java	                        (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ModulesMetaData.java	2007-10-06 00:30:24 UTC (rev 65896)
@@ -0,0 +1,52 @@
+/*
+ * 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 java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
+
+import org.jboss.metadata.ejb.spec.EntityBeanMetaData;
+import org.jboss.metadata.ejb.spec.MessageDrivenBeanMetaData;
+import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
+import org.jboss.metadata.javaee.support.IdMetaDataImpl;
+import org.jboss.xb.annotations.JBossXmlConstants;
+import org.jboss.xb.annotations.JBossXmlModelGroup;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class ModulesMetaData extends IdMetaDataImpl
+{
+   private ModuleMetaData module;
+
+   public ModuleMetaData getModule()
+   {
+      return module;
+   }
+   public void setModule(ModuleMetaData module)
+   {
+      this.module = module;
+   }
+}


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

Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/WebModuleMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/WebModuleMetaData.java	                        (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/WebModuleMetaData.java	2007-10-06 00:30:24 UTC (rev 65896)
@@ -0,0 +1,31 @@
+/*
+ * 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;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class WebModuleMetaData extends ModuleMetaData
+{
+
+}


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

Added: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xEverythingUnitTestCase.java	                        (rev 0)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xEverythingUnitTestCase.java	2007-10-06 00:30:24 UTC (rev 65896)
@@ -0,0 +1,128 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* 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.test.metadata.ear;
+
+
+import junit.framework.Test;
+
+import org.jboss.annotation.javaee.Description;
+import org.jboss.annotation.javaee.Descriptions;
+import org.jboss.annotation.javaee.DisplayName;
+import org.jboss.annotation.javaee.DisplayNames;
+import org.jboss.annotation.javaee.Icon;
+import org.jboss.annotation.javaee.Icons;
+import org.jboss.metadata.ear.spec.Ear5xMetaData;
+import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
+import org.jboss.metadata.javaee.spec.DescriptionImpl;
+import org.jboss.metadata.javaee.spec.DisplayNameImpl;
+import org.jboss.metadata.javaee.spec.IconImpl;
+import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+
+/**
+ * Ear5x tests
+ * 
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class Ear5xEverythingUnitTestCase extends AbstractJavaEEMetaDataTest
+{
+   public static Test suite()
+   {
+      return suite(Ear5xEverythingUnitTestCase.class);
+   }
+   
+   public static SchemaBindingResolver initResolver()
+   {
+      return schemaResolverForClass(Ear5xMetaData.class);
+   }
+   
+   public Ear5xEverythingUnitTestCase(String name)
+   {
+      super(name);
+   }
+   
+   protected Ear5xMetaData unmarshal() throws Exception
+   {
+      return unmarshal(Ear5xMetaData.class);
+   }
+
+   public void testId() throws Exception
+   {
+      Ear5xMetaData result = unmarshal();
+      assertEquals("application-test-id", result.getId());
+   }
+   
+   public void testVersion() throws Exception
+   {
+      Ear5xMetaData result = unmarshal();
+      assertEquals("5.0", result.getVersion());
+      assertFalse(result.isEE4());
+      assertTrue(result.isEE5());
+   }
+
+   public void testDescriptionDefaultLanguage() throws Exception
+   {
+      Ear5xMetaData result = unmarshal();
+      DescriptionGroupMetaData group = result.getDescriptionGroup();
+      assertNotNull(group);
+      Descriptions descriptions = group.getDescriptions();
+      assertNotNull(descriptions);
+      
+      DescriptionImpl hello = new DescriptionImpl();
+      hello.setDescription("Hello");
+      assertEquals(new Description[] { hello }, descriptions.value());
+   }
+   
+   public void testDisplayNameDefaultLanguage() throws Exception
+   {
+      Ear5xMetaData result = unmarshal();
+      DescriptionGroupMetaData group = result.getDescriptionGroup();
+      assertNotNull(group);
+      DisplayNames displayNames = group.getDisplayNames();
+      assertNotNull(displayNames);
+      
+      DisplayNameImpl hello = new DisplayNameImpl();
+      hello.setDisplayName("Hello");
+      assertEquals(new DisplayName[] { hello }, displayNames.value());
+   }
+   
+   public void testIconDefaultLanguage() throws Exception
+   {
+      Ear5xMetaData result = unmarshal();
+      DescriptionGroupMetaData group = result.getDescriptionGroup();
+      assertNotNull(group);
+      Icons icons = group.getIcons();
+      assertNotNull(icons);
+      
+      IconImpl icon = new IconImpl();
+      icon.setSmallIcon("small");
+      icon.setLargeIcon("large");
+      assertEquals(new Icon[] { icon }, icons.value());
+   }
+   
+   public void testModules() throws Exception
+   {
+      Ear5xMetaData result = unmarshal();
+   }
+
+}


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

Added: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java	                        (rev 0)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java	2007-10-06 00:30:24 UTC (rev 65896)
@@ -0,0 +1,129 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* 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.test.metadata.ear;
+
+
+import junit.framework.Test;
+
+import org.jboss.annotation.javaee.Description;
+import org.jboss.annotation.javaee.Descriptions;
+import org.jboss.annotation.javaee.DisplayName;
+import org.jboss.annotation.javaee.DisplayNames;
+import org.jboss.annotation.javaee.Icon;
+import org.jboss.annotation.javaee.Icons;
+import org.jboss.metadata.ear.spec.Ear50MetaData;
+import org.jboss.metadata.ear.spec.Ear5xMetaData;
+import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
+import org.jboss.metadata.javaee.spec.DescriptionImpl;
+import org.jboss.metadata.javaee.spec.DisplayNameImpl;
+import org.jboss.metadata.javaee.spec.IconImpl;
+import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+
+/**
+ * Ear5x tests
+ * 
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class Ear5xUnitTestCase extends AbstractJavaEEMetaDataTest
+{
+   public static Test suite()
+   {
+      return suite(Ear5xEverythingUnitTestCase.class);
+   }
+   
+   public static SchemaBindingResolver initResolver()
+   {
+      return schemaResolverForClass(Ear50MetaData.class);
+   }
+   
+   public Ear5xUnitTestCase(String name)
+   {
+      super(name);
+   }
+   
+   protected Ear5xMetaData unmarshal() throws Exception
+   {
+      return unmarshal(Ear50MetaData.class);
+   }
+
+   public void testId() throws Exception
+   {
+      Ear5xMetaData result = unmarshal();
+      assertEquals("application-test-id", result.getId());
+   }
+   
+   public void testVersion() throws Exception
+   {
+      Ear5xMetaData result = unmarshal();
+      assertEquals("5.0", result.getVersion());
+      assertFalse(result.isEE4());
+      assertTrue(result.isEE5());
+   }
+
+   public void testDescriptionDefaultLanguage() throws Exception
+   {
+      Ear5xMetaData result = unmarshal();
+      DescriptionGroupMetaData group = result.getDescriptionGroup();
+      assertNotNull(group);
+      Descriptions descriptions = group.getDescriptions();
+      assertNotNull(descriptions);
+      
+      DescriptionImpl hello = new DescriptionImpl();
+      hello.setDescription("Hello");
+      assertEquals(new Description[] { hello }, descriptions.value());
+   }
+   
+   public void testDisplayNameDefaultLanguage() throws Exception
+   {
+      Ear5xMetaData result = unmarshal();
+      DescriptionGroupMetaData group = result.getDescriptionGroup();
+      assertNotNull(group);
+      DisplayNames displayNames = group.getDisplayNames();
+      assertNotNull(displayNames);
+      
+      DisplayNameImpl hello = new DisplayNameImpl();
+      hello.setDisplayName("Hello");
+      assertEquals(new DisplayName[] { hello }, displayNames.value());
+   }
+   
+   public void testIconDefaultLanguage() throws Exception
+   {
+      Ear5xMetaData result = unmarshal();
+      DescriptionGroupMetaData group = result.getDescriptionGroup();
+      assertNotNull(group);
+      Icons icons = group.getIcons();
+      assertNotNull(icons);
+      
+      IconImpl icon = new IconImpl();
+      icon.setSmallIcon("small");
+      icon.setLargeIcon("large");
+      assertEquals(new Icon[] { icon }, icons.value());
+   }
+   
+   public void testModules() throws Exception
+   {
+      Ear5xMetaData result = unmarshal();
+   }
+
+}


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

Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5xEverything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5xEverything_testEverything.xml	                        (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5xEverything_testEverything.xml	2007-10-06 00:30:24 UTC (rev 65896)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+    http://java.sun.com/xml/ns/javaee/application_5.xsd"
+    version="5" id="application-test-id">
+    <module>
+        <java>client.jar</java>
+    </module>
+</application>


Property changes on: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5xEverything_testEverything.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + native

Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testId.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testId.xml	                        (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testId.xml	2007-10-06 00:30:24 UTC (rev 65896)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+    http://java.sun.com/xml/ns/javaee/application_5.xsd"
+    version="5" id="application-test-id">
+
+    <description>en-ear-desc</description>
+    <description xml:lang="fr">fr-ear-desc</description>
+    <description xml:lang="de">de-ear-desc</description>
+    <display-name>en-ear-disp</display-name>
+    <display-name xml:lang="fr">fr-ear-disp</display-name>
+    <display-name xml:lang="de">de-ear-disp</display-name>
+    <icon id="en-ear-icon-id">
+        <small-icon>en-ear-small-icon</small-icon>
+        <large-icon>en-ear-large-icon</large-icon>
+    </icon>
+    <icon xml:lang="fr" id="fr-ear-icon-id">
+        <small-icon>fr-ear-small-icon</small-icon>
+        <large-icon>fr-ear-large-icon</large-icon>
+    </icon>
+    <icon xml:lang="de" id="de-ear-icon-id">
+        <small-icon>de-ear-small-icon</small-icon>
+        <large-icon>de-ear-large-icon</large-icon>
+    </icon>
+
+    <module id="connector0">
+        <connector>rar0.rar</connector>
+    </module>
+    <module id="java0">
+        <java>client0.jar</java>
+    </module>
+    <module id="ejb0">
+        <ejb>ejb-jar0.jar</ejb>
+    </module>
+    <module id="ejb1">
+        <ejb>ejb-jar1.jar</ejb>
+    </module>
+    <module id="web0">
+        <web>
+            <web-uri>web-app0.war</web-uri>
+            <context-root>/web0</context-root>
+        </web>
+    </module>
+    <module id="web1">
+        <web>
+            <web-uri>web-app1.war</web-uri>
+            <context-root>/web1</context-root>
+        </web>
+    </module>
+    <security-role id="security-role0">
+        <role-name>role0</role-name>
+    </security-role>
+    <security-role id="security-role1">
+        <role-name>role1</role-name>
+    </security-role>
+    <library-directory id="library-directory0">lib0</library-directory>
+</application>


Property changes on: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testId.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + native




More information about the jboss-cvs-commits mailing list