[jboss-cvs] JBossAS SVN: r65486 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/client and 7 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Sep 20 05:11:26 EDT 2007


Author: wolfc
Date: 2007-09-20 05:11:25 -0400 (Thu, 20 Sep 2007)
New Revision: 65486

Added:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/client/
   projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/
   projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient5MetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironment.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironmentRefsGroupMetaData.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5EverythingUnitTestCase.java
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient5Everything_testEverything.xml
Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/Environment.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentRefsGroupMetaData.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java
Log:
Application client 5 new style

Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient5MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient5MetaData.java	                        (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient5MetaData.java	2007-09-20 09:11:25 UTC (rev 65486)
@@ -0,0 +1,156 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, 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.metadata.client.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.EJBReferenceMetaData;
+import org.jboss.metadata.javaee.spec.EJBReferencesMetaData;
+import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData;
+import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
+import org.jboss.metadata.javaee.spec.RemoteEnvironmentRefsGroupMetaData;
+import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferencesMetaData;
+import org.jboss.metadata.javaee.spec.ResourceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ResourceReferencesMetaData;
+import org.jboss.metadata.javaee.support.AbstractMappedMetaData;
+import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * Application client meta data for Java EE 5 clients. See JavaEE 5 chapter 9.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+ at XmlRootElement(name="application-client", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
+ at JBossXmlSchema(
+      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
+      ignoreUnresolvedFieldOrClass=false,
+      namespace=JavaEEMetaDataConstants.JAVAEE_NS,
+      elementFormDefault=XmlNsForm.QUALIFIED)
+// TODO: how to set propOrder?
+//@XmlType(name="application-clientType",
+//      namespace=JavaEEMetaDataConstants.JAVAEE_NS,
+//      propOrder={"descriptionGroup", "environmentEntries", "ejbReferences", "resourceReferences", "resourceEnvironmentReferences", "messageDestinationReferences", "postConstructs", "preDestroys"})
+ at XmlType(name="application-clientType",
+        namespace=JavaEEMetaDataConstants.JAVAEE_NS)
+public class ApplicationClient5MetaData extends IdMetaDataImplWithDescriptionGroup
+{
+   private static final long serialVersionUID = 1L;
+   
+   /** The environment */
+   private RemoteEnvironmentRefsGroupMetaData jndiEnvironmentRefsGroup;
+
+   public EJBReferenceMetaData getEjbReferenceByName(String name)
+   {
+      return AbstractMappedMetaData.getByName(name, getEjbReferences());
+   }
+
+   public EJBReferencesMetaData getEjbReferences()
+   {
+      if (jndiEnvironmentRefsGroup != null)
+         return jndiEnvironmentRefsGroup.getEjbReferences();
+      return null;
+   }
+
+   public EnvironmentEntriesMetaData getEnvironmentEntries()
+   {
+      if (jndiEnvironmentRefsGroup != null)
+         return jndiEnvironmentRefsGroup.getEnvironmentEntries();
+      return null;
+   }
+
+   public EnvironmentEntryMetaData getEnvironmentEntryByName(String name)
+   {
+      return AbstractMappedMetaData.getByName(name, getEnvironmentEntries());
+   }
+
+   public RemoteEnvironmentRefsGroupMetaData getJndiEnvironmentRefsGroup()
+   {
+      return jndiEnvironmentRefsGroup;
+   }
+
+   public MessageDestinationReferenceMetaData getMessageDestinationReferenceByName(String name)
+   {
+      return AbstractMappedMetaData.getByName(name, getMessageDestinationReferences());
+   }
+
+   public MessageDestinationReferencesMetaData getMessageDestinationReferences()
+   {
+      if (jndiEnvironmentRefsGroup != null)
+         return jndiEnvironmentRefsGroup.getMessageDestinationReferences();
+      return null;
+   }
+
+   public LifecycleCallbacksMetaData getPostConstructs()
+   {
+      if (jndiEnvironmentRefsGroup != null)
+         return jndiEnvironmentRefsGroup.getPostConstructs();
+      return null;
+   }
+
+   public LifecycleCallbacksMetaData getPreDestroys()
+   {
+      if (jndiEnvironmentRefsGroup != null)
+         return jndiEnvironmentRefsGroup.getPreDestroys();
+      return null;
+   }
+
+   public ResourceEnvironmentReferenceMetaData getResourceEnvironmentReferenceByName(String name)
+   {
+      return AbstractMappedMetaData.getByName(name, getResourceEnvironmentReferences());
+   }
+
+   public ResourceEnvironmentReferencesMetaData getResourceEnvironmentReferences()
+   {
+      if (jndiEnvironmentRefsGroup != null)
+         return jndiEnvironmentRefsGroup.getResourceEnvironmentReferences();
+      return null;
+   }
+
+   public ResourceReferenceMetaData getResourceReferenceByName(String name)
+   {
+      return AbstractMappedMetaData.getByName(name, getResourceReferences());
+   }
+
+   public ResourceReferencesMetaData getResourceReferences()
+   {
+      if (jndiEnvironmentRefsGroup != null)
+         return jndiEnvironmentRefsGroup.getResourceReferences();
+      return null;
+   }
+
+   public void setJndiEnvironmentRefsGroup(RemoteEnvironmentRefsGroupMetaData jndiEnvironmentRefsGroup)
+   {
+      if (jndiEnvironmentRefsGroup == null)
+         throw new IllegalArgumentException("Null jndiEnvironmentRefsGroup");
+      this.jndiEnvironmentRefsGroup = jndiEnvironmentRefsGroup;
+   }
+}


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

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/Environment.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/Environment.java	2007-09-20 05:37:19 UTC (rev 65485)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/Environment.java	2007-09-20 09:11:25 UTC (rev 65486)
@@ -27,25 +27,9 @@
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @version $Revision: 1.1 $
  */
-public interface Environment
+public interface Environment extends RemoteEnvironment
 {
    /**
-    * Get the environmentEntries.
-    * 
-    * @return the environmentEntries.
-    */
-   EnvironmentEntriesMetaData getEnvironmentEntries();
-
-   /**
-    * Get by name
-    * 
-    * @param name the name
-    * @return the result or null if not found
-    * @throws IllegalArgumentException for a null name
-    */
-   EnvironmentEntryMetaData getEnvironmentEntryByName(String name);
-
-   /**
     * Get the ejbLocalReferences.
     * 
     * @return the ejbLocalReferences.
@@ -62,84 +46,6 @@
    EJBLocalReferenceMetaData getEjbLocalReferenceByName(String name);
 
    /**
-    * Get the ejbReferences.
-    * 
-    * @return the ejbReferences.
-    */
-   EJBReferencesMetaData getEjbReferences();
-
-   /**
-    * Get by name
-    * 
-    * @param name the name
-    * @return the result or null if not found
-    * @throws IllegalArgumentException for a null name
-    */
-   EJBReferenceMetaData getEjbReferenceByName(String name);
-
-   /**
-    * Get the resourceReferences.
-    * 
-    * @return the resourceReferences.
-    */
-   ResourceReferencesMetaData getResourceReferences();
-
-   /**
-    * Get by name
-    * 
-    * @param name the name
-    * @return the result or null if not found
-    * @throws IllegalArgumentException for a null name
-    */
-   ResourceReferenceMetaData getResourceReferenceByName(String name);
-
-   /**
-    * Get the resourceEnvironmentReferences.
-    * 
-    * @return the resourceEnvironmentReferences.
-    */
-   ResourceEnvironmentReferencesMetaData getResourceEnvironmentReferences();
-
-   /**
-    * Get by name
-    * 
-    * @param name the name
-    * @return the result or null if not found
-    * @throws IllegalArgumentException for a null name
-    */
-   ResourceEnvironmentReferenceMetaData getResourceEnvironmentReferenceByName(String name);
-
-   /**
-    * Get the messageDestinationReferences.
-    * 
-    * @return the messageDestinationReferences.
-    */
-   MessageDestinationReferencesMetaData getMessageDestinationReferences();
-
-   /**
-    * Get by name
-    * 
-    * @param name the name
-    * @return the result or null if not found
-    * @throws IllegalArgumentException for a null name
-    */
-   MessageDestinationReferenceMetaData getMessageDestinationReferenceByName(String name);
-
-   /**
-    * Get the postConstructs.
-    * 
-    * @return the postConstructs.
-    */
-   LifecycleCallbacksMetaData getPostConstructs();
-
-   /**
-    * Get the preDestroys.
-    * 
-    * @return the preDestroys.
-    */
-   LifecycleCallbacksMetaData getPreDestroys();
-
-   /**
     * Get the persistenceContextRefs.
     * 
     * @return the persistenceContextRefs.
@@ -156,22 +62,6 @@
    PersistenceContextReferenceMetaData getPersistenceContextReferenceByName(String name);
 
    /**
-    * Get the persistenceUnitRefs.
-    * 
-    * @return the persistenceUnitRefs.
-    */
-   PersistenceUnitReferencesMetaData getPersistenceUnitRefs();
-
-   /**
-    * Get by name
-    * 
-    * @param name the name
-    * @return the result or null if not found
-    * @throws IllegalArgumentException for a null name
-    */
-   PersistenceUnitReferenceMetaData getPersistenceUnitReferenceByName(String name);
-
-   /**
     * Get the serviceReferences.
     * 
     * @return the serviceReferences.

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentRefsGroupMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentRefsGroupMetaData.java	2007-09-20 05:37:19 UTC (rev 65485)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentRefsGroupMetaData.java	2007-09-20 09:11:25 UTC (rev 65486)
@@ -39,44 +39,20 @@
       "serviceReferences", "resourceReferences", "resourceEnvironmentReferences",
       "messageDestinationReferences", "persistenceContextRefs", "persistenceUnitRefs",
       "postConstructs", "preDestroys"})
-public class EnvironmentRefsGroupMetaData implements Serializable, Environment
+public class EnvironmentRefsGroupMetaData extends RemoteEnvironmentRefsGroupMetaData implements Serializable, Environment
 {
    /** The serialVersionUID */
    private static final long serialVersionUID = 1337095770028220349L;
 
-   /** The environment entries */
-   private EnvironmentEntriesMetaData environmentEntries;
-
-   /** The ejb references */
-   private EJBReferencesMetaData ejbReferences;
-
    /** The ejb local references */
    private EJBLocalReferencesMetaData ejbLocalReferences;
  
    /** The service references */
    private ServiceReferencesMetaData serviceReferences;
    
-   /** The resource references */
-   private ResourceReferencesMetaData resourceReferences;
-   
-   /** The resource environment references */
-   private ResourceEnvironmentReferencesMetaData resourceEnvironmentReferences;
-   
-   /** The message destination references */
-   private MessageDestinationReferencesMetaData messageDestinationReferences;
-   
    /** The persistence context reference */
    private PersistenceContextReferencesMetaData persistenceContextRefs;
 
-   /** The persistence unit  reference */
-   private PersistenceUnitReferencesMetaData persistenceUnitRefs;
-
-   /** The post construct methods */
-   private LifecycleCallbacksMetaData postConstructs;
-   
-   /** The pre destroy methods */
-   private LifecycleCallbacksMetaData preDestroys;
-   
    /**
     * Create a new EnvironmentRefsGroupMetaData.
     */
@@ -86,30 +62,6 @@
    }
 
    /**
-    * Get the environmentEntries.
-    * 
-    * @return the environmentEntries.
-    */
-   public EnvironmentEntriesMetaData getEnvironmentEntries()
-   {
-      return environmentEntries;
-   }
-
-   /**
-    * Set the environmentEntries.
-    * 
-    * @param environmentEntries the environmentEntries.
-    * @throws IllegalArgumentException for a null environmentEntries
-    */
-   @XmlElement(name="env-entry")
-   public void setEnvironmentEntries(EnvironmentEntriesMetaData environmentEntries)
-   {
-      if (environmentEntries == null)
-         throw new IllegalArgumentException("Null environmentEntries");
-      this.environmentEntries = environmentEntries;
-   }
-
-   /**
     * Get the ejbLocalReferences.
     * 
     * @return the ejbLocalReferences.
@@ -134,152 +86,6 @@
    }
 
    /**
-    * Get the ejbReferences.
-    * 
-    * @return the ejbReferences.
-    */
-   public EJBReferencesMetaData getEjbReferences()
-   {
-      return ejbReferences;
-   }
-
-   /**
-    * Set the ejbReferences.
-    * 
-    * @param ejbReferences the ejbReferences.
-    * @throws IllegalArgumentException for a null ejbReferences
-    */
-   @XmlElement(name="ejb-ref")
-   public void setEjbReferences(EJBReferencesMetaData ejbReferences)
-   {
-      if (ejbReferences == null)
-         throw new IllegalArgumentException("Null ejbReferences");
-      this.ejbReferences = ejbReferences;
-   }
-
-   /**
-    * Get the resourceReferences.
-    * 
-    * @return the resourceReferences.
-    */
-   public ResourceReferencesMetaData getResourceReferences()
-   {
-      return resourceReferences;
-   }
-
-   /**
-    * Set the resourceReferences.
-    * 
-    * @param resourceReferences the resourceReferences.
-    * @throws IllegalArgumentException for a null resourceReferences
-    */
-   @XmlElement(name="resource-ref")
-   public void setResourceReferences(ResourceReferencesMetaData resourceReferences)
-   {
-      if (resourceReferences == null)
-         throw new IllegalArgumentException("Null resourceReferences");
-      this.resourceReferences = resourceReferences;
-   }
-
-   /**
-    * Get the resourceEnvironmentReferences.
-    * 
-    * @return the resourceEnvironmentReferences.
-    */
-   public ResourceEnvironmentReferencesMetaData getResourceEnvironmentReferences()
-   {
-      return resourceEnvironmentReferences;
-   }
-
-   /**
-    * Set the resourceEnvironmentReferences.
-    * 
-    * @param resourceEnvironmentReferences the resourceEnvironmentReferences.
-    * @throws IllegalArgumentException for a null resourceEnvironmentReferences
-    */
-   @XmlElement(name="resource-env-ref")
-   public void setResourceEnvironmentReferences(ResourceEnvironmentReferencesMetaData resourceEnvironmentReferences)
-   {
-      if (resourceEnvironmentReferences == null)
-         throw new IllegalArgumentException("Null resourceEnvironmentReferences");
-      this.resourceEnvironmentReferences = resourceEnvironmentReferences;
-   }
-
-   /**
-    * Get the messageDestinationReferences.
-    * 
-    * @return the messageDestinationReferences.
-    */
-   public MessageDestinationReferencesMetaData getMessageDestinationReferences()
-   {
-      return messageDestinationReferences;
-   }
-
-   /**
-    * Set the messageDestinationReferences.
-    * 
-    * @param messageDestinationReferences the messageDestinationReferences.
-    * @throws IllegalArgumentException for a null messageDestinationReferences
-    */
-   @XmlElement(name="message-destination-ref")
-   public void setMessageDestinationReferences(MessageDestinationReferencesMetaData messageDestinationReferences)
-   {
-      if (messageDestinationReferences == null)
-         throw new IllegalArgumentException("Null messageDestinationReferences");
-      this.messageDestinationReferences = messageDestinationReferences;
-   }
-
-   /**
-    * Get the postConstructs.
-    * 
-    * @return the postConstructs.
-    */
-   public LifecycleCallbacksMetaData getPostConstructs()
-   {
-      return postConstructs;
-   }
-
-   /**
-    * Set the postConstructs.
-    * 
-    * @param postConstructs the postConstructs.
-    * @throws IllegalArgumentException for a null postConstructs
-    */
-   //@SchemaProperty(name="post-construct", noInterceptor=true)
-   @XmlElement(name="post-construct")
-   public void setPostConstructs(LifecycleCallbacksMetaData postConstructs)
-   {
-      if (postConstructs == null)
-         throw new IllegalArgumentException("Null postConstructs");
-      this.postConstructs = postConstructs;
-   }
-
-   /**
-    * Get the preDestroys.
-    * 
-    * @return the preDestroys.
-    */
-   public LifecycleCallbacksMetaData getPreDestroys()
-   {
-      return preDestroys;
-   }
-
-   /**
-    * Set the preDestroys.
-    * 
-    * @param preDestroys the preDestroys.
-    * @throws IllegalArgumentException for a null preDestroys
-    */
-   //@SchemaProperty(name="pre-destroy", noInterceptor=true)
-   @XmlElement(name="pre-destroy")
-   public void setPreDestroys(LifecycleCallbacksMetaData preDestroys)
-   {
-      if (preDestroys == null)
-         throw new IllegalArgumentException("Null preDestroys");
-      this.preDestroys = preDestroys;
-   }
-
-   /**
     * Get the persistenceContextRefs.
     * 
     * @return the persistenceContextRefs.
@@ -304,30 +110,6 @@
    }
 
    /**
-    * Get the persistenceUnitRefs.
-    * 
-    * @return the persistenceUnitRefs.
-    */
-   public PersistenceUnitReferencesMetaData getPersistenceUnitRefs()
-   {
-      return persistenceUnitRefs;
-   }
-
-   /**
-    * Set the persistenceUnitRefs.
-    * 
-    * @param persistenceUnitRefs the persistenceUnitRefs.
-    * @throws IllegalArgumentException for a null persistenceUnitRefs
-    */
-   @XmlElement(name="persistence-unit-ref")
-   public void setPersistenceUnitRefs(PersistenceUnitReferencesMetaData persistenceUnitRefs)
-   {
-      if (persistenceUnitRefs == null)
-         throw new IllegalArgumentException("Null persistenceUnitRefs");
-      this.persistenceUnitRefs = persistenceUnitRefs;
-   }
-
-   /**
     * Get the serviceReferences.
     * 
     * @return the serviceReferences.
@@ -355,41 +137,11 @@
       return AbstractMappedMetaData.getByName(name, ejbLocalReferences);
    }
 
-   public EJBReferenceMetaData getEjbReferenceByName(String name)
-   {
-      return AbstractMappedMetaData.getByName(name, ejbReferences);
-   }
-
-   public EnvironmentEntryMetaData getEnvironmentEntryByName(String name)
-   {
-      return AbstractMappedMetaData.getByName(name, environmentEntries);
-   }
-
-   public MessageDestinationReferenceMetaData getMessageDestinationReferenceByName(String name)
-   {
-      return AbstractMappedMetaData.getByName(name, messageDestinationReferences);
-   }
-
    public PersistenceContextReferenceMetaData getPersistenceContextReferenceByName(String name)
    {
       return AbstractMappedMetaData.getByName(name, persistenceContextRefs);
    }
 
-   public PersistenceUnitReferenceMetaData getPersistenceUnitReferenceByName(String name)
-   {
-      return AbstractMappedMetaData.getByName(name, persistenceUnitRefs);
-   }
-
-   public ResourceEnvironmentReferenceMetaData getResourceEnvironmentReferenceByName(String name)
-   {
-      return AbstractMappedMetaData.getByName(name, resourceEnvironmentReferences);
-   }
-
-   public ResourceReferenceMetaData getResourceReferenceByName(String name)
-   {
-      return AbstractMappedMetaData.getByName(name, resourceReferences);
-   }
-
    public ServiceReferenceMetaData getServiceReferenceByName(String name)
    {
       return AbstractMappedMetaData.getByName(name, serviceReferences);

Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironment.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironment.java	                        (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironment.java	2007-09-20 09:11:25 UTC (rev 65486)
@@ -0,0 +1,142 @@
+/*
+ * 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.metadata.javaee.spec;
+
+/**
+ * Environment.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+public interface RemoteEnvironment
+{
+   /**
+    * Get the environmentEntries.
+    * 
+    * @return the environmentEntries.
+    */
+   EnvironmentEntriesMetaData getEnvironmentEntries();
+
+   /**
+    * Get by name
+    * 
+    * @param name the name
+    * @return the result or null if not found
+    * @throws IllegalArgumentException for a null name
+    */
+   EnvironmentEntryMetaData getEnvironmentEntryByName(String name);
+
+   /**
+    * Get the ejbReferences.
+    * 
+    * @return the ejbReferences.
+    */
+   EJBReferencesMetaData getEjbReferences();
+
+   /**
+    * Get by name
+    * 
+    * @param name the name
+    * @return the result or null if not found
+    * @throws IllegalArgumentException for a null name
+    */
+   EJBReferenceMetaData getEjbReferenceByName(String name);
+
+   /**
+    * Get the resourceReferences.
+    * 
+    * @return the resourceReferences.
+    */
+   ResourceReferencesMetaData getResourceReferences();
+
+   /**
+    * Get by name
+    * 
+    * @param name the name
+    * @return the result or null if not found
+    * @throws IllegalArgumentException for a null name
+    */
+   ResourceReferenceMetaData getResourceReferenceByName(String name);
+
+   /**
+    * Get the resourceEnvironmentReferences.
+    * 
+    * @return the resourceEnvironmentReferences.
+    */
+   ResourceEnvironmentReferencesMetaData getResourceEnvironmentReferences();
+
+   /**
+    * Get by name
+    * 
+    * @param name the name
+    * @return the result or null if not found
+    * @throws IllegalArgumentException for a null name
+    */
+   ResourceEnvironmentReferenceMetaData getResourceEnvironmentReferenceByName(String name);
+
+   /**
+    * Get the messageDestinationReferences.
+    * 
+    * @return the messageDestinationReferences.
+    */
+   MessageDestinationReferencesMetaData getMessageDestinationReferences();
+
+   /**
+    * Get by name
+    * 
+    * @param name the name
+    * @return the result or null if not found
+    * @throws IllegalArgumentException for a null name
+    */
+   MessageDestinationReferenceMetaData getMessageDestinationReferenceByName(String name);
+
+   /**
+    * Get the postConstructs.
+    * 
+    * @return the postConstructs.
+    */
+   LifecycleCallbacksMetaData getPostConstructs();
+
+   /**
+    * Get the preDestroys.
+    * 
+    * @return the preDestroys.
+    */
+   LifecycleCallbacksMetaData getPreDestroys();
+
+   /**
+    * Get the persistenceUnitRefs.
+    * 
+    * @return the persistenceUnitRefs.
+    */
+   PersistenceUnitReferencesMetaData getPersistenceUnitRefs();
+
+   /**
+    * Get by name
+    * 
+    * @param name the name
+    * @return the result or null if not found
+    * @throws IllegalArgumentException for a null name
+    */
+   PersistenceUnitReferenceMetaData getPersistenceUnitReferenceByName(String name);
+}
\ No newline at end of file


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

Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironmentRefsGroupMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironmentRefsGroupMetaData.java	                        (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironmentRefsGroupMetaData.java	2007-09-20 09:11:25 UTC (rev 65486)
@@ -0,0 +1,308 @@
+/*
+* 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.metadata.javaee.spec;
+
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlElement;
+
+import org.jboss.metadata.javaee.support.AbstractMappedMetaData;
+import org.jboss.xb.annotations.JBossXmlModelGroup;
+
+/**
+ * References which are only available remote (for application clients).
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+ at JBossXmlModelGroup(name="jndiEnvironmentRefsGroup",
+      propOrder={
+         "environmentEntries", 
+         "ejbReferences",
+         "resourceReferences", 
+         "resourceEnvironmentReferences",
+         "messageDestinationReferences",
+         "persistenceUnitRefs",
+         "postConstructs",
+         "preDestroys"})
+public class RemoteEnvironmentRefsGroupMetaData implements Serializable, RemoteEnvironment
+{
+   /** The serialVersionUID */
+   private static final long serialVersionUID = 1L;
+
+   /** The environment entries */
+   private EnvironmentEntriesMetaData environmentEntries;
+
+   /** The ejb references */
+   private EJBReferencesMetaData ejbReferences;
+
+   /** The resource references */
+   private ResourceReferencesMetaData resourceReferences;
+   
+   /** The resource environment references */
+   private ResourceEnvironmentReferencesMetaData resourceEnvironmentReferences;
+   
+   /** The message destination references */
+   private MessageDestinationReferencesMetaData messageDestinationReferences;
+   
+   /** The persistence unit  reference */
+   private PersistenceUnitReferencesMetaData persistenceUnitRefs;
+
+   /** The post construct methods */
+   private LifecycleCallbacksMetaData postConstructs;
+   
+   /** The pre destroy methods */
+   private LifecycleCallbacksMetaData preDestroys;
+   
+   /**
+    * Create a new EnvironmentRefsGroupMetaData.
+    */
+   public RemoteEnvironmentRefsGroupMetaData()
+   {
+      // For serialization
+   }
+
+   /**
+    * Get the environmentEntries.
+    * 
+    * @return the environmentEntries.
+    */
+   public EnvironmentEntriesMetaData getEnvironmentEntries()
+   {
+      return environmentEntries;
+   }
+
+   /**
+    * Set the environmentEntries.
+    * 
+    * @param environmentEntries the environmentEntries.
+    * @throws IllegalArgumentException for a null environmentEntries
+    */
+   @XmlElement(name="env-entry")
+   public void setEnvironmentEntries(EnvironmentEntriesMetaData environmentEntries)
+   {
+      if (environmentEntries == null)
+         throw new IllegalArgumentException("Null environmentEntries");
+      this.environmentEntries = environmentEntries;
+   }
+
+   /**
+    * Get the ejbReferences.
+    * 
+    * @return the ejbReferences.
+    */
+   public EJBReferencesMetaData getEjbReferences()
+   {
+      return ejbReferences;
+   }
+
+   /**
+    * Set the ejbReferences.
+    * 
+    * @param ejbReferences the ejbReferences.
+    * @throws IllegalArgumentException for a null ejbReferences
+    */
+   @XmlElement(name="ejb-ref")
+   public void setEjbReferences(EJBReferencesMetaData ejbReferences)
+   {
+      if (ejbReferences == null)
+         throw new IllegalArgumentException("Null ejbReferences");
+      this.ejbReferences = ejbReferences;
+   }
+
+   /**
+    * Get the resourceReferences.
+    * 
+    * @return the resourceReferences.
+    */
+   public ResourceReferencesMetaData getResourceReferences()
+   {
+      return resourceReferences;
+   }
+
+   /**
+    * Set the resourceReferences.
+    * 
+    * @param resourceReferences the resourceReferences.
+    * @throws IllegalArgumentException for a null resourceReferences
+    */
+   @XmlElement(name="resource-ref")
+   public void setResourceReferences(ResourceReferencesMetaData resourceReferences)
+   {
+      if (resourceReferences == null)
+         throw new IllegalArgumentException("Null resourceReferences");
+      this.resourceReferences = resourceReferences;
+   }
+
+   /**
+    * Get the resourceEnvironmentReferences.
+    * 
+    * @return the resourceEnvironmentReferences.
+    */
+   public ResourceEnvironmentReferencesMetaData getResourceEnvironmentReferences()
+   {
+      return resourceEnvironmentReferences;
+   }
+
+   /**
+    * Set the resourceEnvironmentReferences.
+    * 
+    * @param resourceEnvironmentReferences the resourceEnvironmentReferences.
+    * @throws IllegalArgumentException for a null resourceEnvironmentReferences
+    */
+   @XmlElement(name="resource-env-ref")
+   public void setResourceEnvironmentReferences(ResourceEnvironmentReferencesMetaData resourceEnvironmentReferences)
+   {
+      if (resourceEnvironmentReferences == null)
+         throw new IllegalArgumentException("Null resourceEnvironmentReferences");
+      this.resourceEnvironmentReferences = resourceEnvironmentReferences;
+   }
+
+   /**
+    * Get the messageDestinationReferences.
+    * 
+    * @return the messageDestinationReferences.
+    */
+   public MessageDestinationReferencesMetaData getMessageDestinationReferences()
+   {
+      return messageDestinationReferences;
+   }
+
+   /**
+    * Set the messageDestinationReferences.
+    * 
+    * @param messageDestinationReferences the messageDestinationReferences.
+    * @throws IllegalArgumentException for a null messageDestinationReferences
+    */
+   @XmlElement(name="message-destination-ref")
+   public void setMessageDestinationReferences(MessageDestinationReferencesMetaData messageDestinationReferences)
+   {
+      if (messageDestinationReferences == null)
+         throw new IllegalArgumentException("Null messageDestinationReferences");
+      this.messageDestinationReferences = messageDestinationReferences;
+   }
+
+   /**
+    * Get the postConstructs.
+    * 
+    * @return the postConstructs.
+    */
+   public LifecycleCallbacksMetaData getPostConstructs()
+   {
+      return postConstructs;
+   }
+
+   /**
+    * Set the postConstructs.
+    * 
+    * @param postConstructs the postConstructs.
+    * @throws IllegalArgumentException for a null postConstructs
+    */
+   //@SchemaProperty(name="post-construct", noInterceptor=true)
+   @XmlElement(name="post-construct")
+   public void setPostConstructs(LifecycleCallbacksMetaData postConstructs)
+   {
+      if (postConstructs == null)
+         throw new IllegalArgumentException("Null postConstructs");
+      this.postConstructs = postConstructs;
+   }
+
+   /**
+    * Get the preDestroys.
+    * 
+    * @return the preDestroys.
+    */
+   public LifecycleCallbacksMetaData getPreDestroys()
+   {
+      return preDestroys;
+   }
+
+   /**
+    * Set the preDestroys.
+    * 
+    * @param preDestroys the preDestroys.
+    * @throws IllegalArgumentException for a null preDestroys
+    */
+   //@SchemaProperty(name="pre-destroy", noInterceptor=true)
+   @XmlElement(name="pre-destroy")
+   public void setPreDestroys(LifecycleCallbacksMetaData preDestroys)
+   {
+      if (preDestroys == null)
+         throw new IllegalArgumentException("Null preDestroys");
+      this.preDestroys = preDestroys;
+   }
+
+   /**
+    * Get the persistenceUnitRefs.
+    * 
+    * @return the persistenceUnitRefs.
+    */
+   public PersistenceUnitReferencesMetaData getPersistenceUnitRefs()
+   {
+      return persistenceUnitRefs;
+   }
+
+   /**
+    * Set the persistenceUnitRefs.
+    * 
+    * @param persistenceUnitRefs the persistenceUnitRefs.
+    * @throws IllegalArgumentException for a null persistenceUnitRefs
+    */
+   @XmlElement(name="persistence-unit-ref")
+   public void setPersistenceUnitRefs(PersistenceUnitReferencesMetaData persistenceUnitRefs)
+   {
+      if (persistenceUnitRefs == null)
+         throw new IllegalArgumentException("Null persistenceUnitRefs");
+      this.persistenceUnitRefs = persistenceUnitRefs;
+   }
+
+   public EJBReferenceMetaData getEjbReferenceByName(String name)
+   {
+      return AbstractMappedMetaData.getByName(name, ejbReferences);
+   }
+
+   public EnvironmentEntryMetaData getEnvironmentEntryByName(String name)
+   {
+      return AbstractMappedMetaData.getByName(name, environmentEntries);
+   }
+
+   public MessageDestinationReferenceMetaData getMessageDestinationReferenceByName(String name)
+   {
+      return AbstractMappedMetaData.getByName(name, messageDestinationReferences);
+   }
+
+   public PersistenceUnitReferenceMetaData getPersistenceUnitReferenceByName(String name)
+   {
+      return AbstractMappedMetaData.getByName(name, persistenceUnitRefs);
+   }
+
+   public ResourceEnvironmentReferenceMetaData getResourceEnvironmentReferenceByName(String name)
+   {
+      return AbstractMappedMetaData.getByName(name, resourceEnvironmentReferences);
+   }
+
+   public ResourceReferenceMetaData getResourceReferenceByName(String name)
+   {
+      return AbstractMappedMetaData.getByName(name, resourceReferences);
+   }
+}


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

Added: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5EverythingUnitTestCase.java	                        (rev 0)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5EverythingUnitTestCase.java	2007-09-20 09:11:25 UTC (rev 65486)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, 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.client;
+
+import org.jboss.metadata.client.spec.ApplicationClient5MetaData;
+import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+
+/**
+ * Test all entries of an application client 5 descriptor.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class ApplicationClient5EverythingUnitTestCase extends AbstractJavaEEEverythingTest
+{
+
+   public ApplicationClient5EverythingUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static SchemaBindingResolver initResolver()
+   {
+      return schemaResolverForClass(ApplicationClient5MetaData.class);
+   }
+   
+   public void testEverything() throws Exception
+   {
+      ApplicationClient5MetaData appClientMetaData = unmarshal();
+      //assertEverythingWithAppMetaData(appClientMetaData);
+      assertDescriptionGroup("application-client", appClientMetaData.getDescriptionGroup());
+      assertRemoteEnvironment("appClient", appClientMetaData.getJndiEnvironmentRefsGroup(), true);
+   }
+   
+   protected ApplicationClient5MetaData unmarshal() throws Exception
+   {
+      return unmarshal(ApplicationClient5MetaData.class);
+   }
+}


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

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java	2007-09-20 05:37:19 UTC (rev 65485)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java	2007-09-20 09:11:25 UTC (rev 65486)
@@ -70,6 +70,7 @@
 import org.jboss.metadata.javaee.spec.PersistenceUnitReferencesMetaData;
 import org.jboss.metadata.javaee.spec.PropertiesMetaData;
 import org.jboss.metadata.javaee.spec.PropertyMetaData;
+import org.jboss.metadata.javaee.spec.RemoteEnvironmentRefsGroupMetaData;
 import org.jboss.metadata.javaee.spec.ResourceAuthorityType;
 import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferenceMetaData;
 import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferencesMetaData;
@@ -89,6 +90,7 @@
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @version $Revision: 1.1 $
  */
+ at SuppressWarnings("deprecation")
 public abstract class AbstractJavaEEEverythingTest extends AbstractJavaEEMetaDataTest
 {
    public AbstractJavaEEEverythingTest(String name)
@@ -158,7 +160,7 @@
    
    protected void assertIcons(String suffix, Icons icons)
    {
-      assertNotNull(icons);
+      assertNotNull("no icons are set", icons);
       assertTrue(icons instanceof IconsImpl);
       IconsImpl impl = (IconsImpl) icons;
       assertEquals(3, impl.size());
@@ -299,7 +301,7 @@
 
    protected void assertLifecycleCallbacks(String ejbName, String type, int size, LifecycleCallbacksMetaData lifecycleCallbacksMetaData)
    {
-      assertNotNull(lifecycleCallbacksMetaData);
+      assertNotNull("no " + type + " lifecycle callbacks are set", lifecycleCallbacksMetaData);
       assertEquals(size, lifecycleCallbacksMetaData.size());
       int count = 1;
       for (LifecycleCallbackMetaData lifecycleCallback : lifecycleCallbacksMetaData)
@@ -312,21 +314,12 @@
 
    protected void assertEnvironment(String prefix, EnvironmentRefsGroupMetaData environment, boolean full)
    {
-      assertNotNull(environment);
-      if (full)
-         assertEnvEntries(prefix, 2, environment.getEnvironmentEntries(), full);
-      assertEjbRefs(prefix, 2, environment.getEjbReferences(), full);
+      assertRemoteEnvironment(prefix, environment, full);
       assertEjbLocalRefs(prefix, 2, environment.getEjbLocalReferences(), full);
       // TODO service-refGroup 
-      assertResourceRefs(prefix, 2, environment.getResourceReferences(), full);
-      assertResourceEnvRefs(prefix, 2, environment.getResourceEnvironmentReferences(), full);
-      assertMessageDestinationRefs(prefix, 3, environment.getMessageDestinationReferences(), full);
       if (full)
       {
          assertPersistenceContextRefs(prefix, 2, environment.getPersistenceContextRefs());
-         assertPersistenceUnitRefs(prefix, 2, environment.getPersistenceUnitRefs());
-         assertLifecycleCallbacks(prefix, "PostConstruct", 2, environment.getPostConstructs());
-         assertLifecycleCallbacks(prefix, "PreDestroy", 2, environment.getPreDestroys());
       }
    }
 
@@ -381,6 +374,24 @@
       assertEquals(size + 1, count);
    }
 
+   protected void assertRemoteEnvironment(String prefix, RemoteEnvironmentRefsGroupMetaData environment, boolean full)
+   {
+      assertNotNull(environment);
+      if (full)
+         assertEnvEntries(prefix, 2, environment.getEnvironmentEntries(), full);
+      assertEjbRefs(prefix, 2, environment.getEjbReferences(), full);
+      // TODO service-refGroup 
+      assertResourceRefs(prefix, 2, environment.getResourceReferences(), full);
+      assertResourceEnvRefs(prefix, 2, environment.getResourceEnvironmentReferences(), full);
+      assertMessageDestinationRefs(prefix, 3, environment.getMessageDestinationReferences(), full);
+      if (full)
+      {
+         assertPersistenceUnitRefs(prefix, 2, environment.getPersistenceUnitRefs());
+         assertLifecycleCallbacks(prefix, "PostConstruct", 2, environment.getPostConstructs());
+         assertLifecycleCallbacks(prefix, "PreDestroy", 2, environment.getPreDestroys());
+      }
+   }
+
    protected EJBReferencesMetaData fixUpEjbRefs(EJBReferencesMetaData overriden, EJBReferencesMetaData override)
    {
       if (override == null || override.isEmpty())
@@ -405,7 +416,7 @@
    
    private void assertEjbRefs(String prefix, int size, EJBReferencesMetaData ejbReferencesMetaData, boolean full)
    {
-      assertNotNull(ejbReferencesMetaData);
+      assertNotNull("no ejb-refs are set", ejbReferencesMetaData);
       assertEquals(size, ejbReferencesMetaData.size());
       int count = 1;
       for (EJBReferenceMetaData ejbReferenceMetaData : ejbReferencesMetaData)
@@ -477,7 +488,7 @@
 
    private void assertEjbLocalRefs(String prefix, int size, EJBLocalReferencesMetaData ejbReferencesMetaData, boolean full)
    {
-      assertNotNull(ejbReferencesMetaData);
+      assertNotNull("no ejb local refs are set", ejbReferencesMetaData);
       assertEquals(size, ejbReferencesMetaData.size());
       int count = 1;
       for (EJBLocalReferenceMetaData ejbReferenceMetaData : ejbReferencesMetaData)
@@ -549,7 +560,7 @@
 
    private void assertResourceRefs(String prefix, int size, ResourceReferencesMetaData resourceReferencesMetaData, boolean full)
    {
-      assertNotNull(resourceReferencesMetaData);
+      assertNotNull("no resource refs are set", resourceReferencesMetaData);
       assertEquals(size, resourceReferencesMetaData.size());
       int count = 1;
       for (ResourceReferenceMetaData resourceReferenceMetaData : resourceReferencesMetaData)
@@ -629,7 +640,7 @@
 
    private void assertResourceEnvRefs(String prefix, int size, ResourceEnvironmentReferencesMetaData resourceEnvReferencesMetaData, boolean full)
    {
-      assertNotNull(resourceEnvReferencesMetaData);
+      assertNotNull("no resource env refs are set", resourceEnvReferencesMetaData);
       assertEquals(size, resourceEnvReferencesMetaData.size());
       int count = 1;
       for (ResourceEnvironmentReferenceMetaData resourceEnvReferenceMetaData : resourceEnvReferencesMetaData)
@@ -687,7 +698,7 @@
 
    private void assertMessageDestinationRefs(String prefix, int size, MessageDestinationReferencesMetaData messageDestinationReferencesMetaData, boolean full)
    {
-      assertNotNull(messageDestinationReferencesMetaData);
+      assertNotNull("no message destination refs are set", messageDestinationReferencesMetaData);
       assertEquals(size, messageDestinationReferencesMetaData.size());
       int count = 1;
       for (MessageDestinationReferenceMetaData messageDestinationReferenceMetaData : messageDestinationReferencesMetaData)
@@ -759,7 +770,7 @@
 
    protected void assertPersistenceUnitRefs(String prefix, int size, PersistenceUnitReferencesMetaData persistenceUnitReferencesMetaData)
    {
-      assertNotNull(persistenceUnitReferencesMetaData);
+      assertNotNull("no persistence unit refs are set", persistenceUnitReferencesMetaData);
       assertEquals(size, persistenceUnitReferencesMetaData.size());
       int count = 1;
       for (PersistenceUnitReferenceMetaData persistenceUnitReferenceMetaData : persistenceUnitReferencesMetaData)

Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient5Everything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient5Everything_testEverything.xml	                        (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient5Everything_testEverything.xml	2007-09-20 09:11:25 UTC (rev 65486)
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application-client 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-client_5.xsd"
+                    version="5"
+                    metadata-complete="true"
+                    id="appclient-test">
+   <!-- description group -->
+   <description>en-application-client-desc</description>
+   <description xml:lang="fr">fr-application-client-desc</description>
+   <description xml:lang="de">de-application-client-desc</description>
+   <display-name>en-application-client-disp</display-name>
+   <display-name xml:lang="fr">fr-application-client-disp</display-name>
+   <display-name xml:lang="de">de-application-client-disp</display-name>
+   <icon id="en-application-client-icon-id">
+      <small-icon>en-application-client-small-icon</small-icon>
+      <large-icon>en-application-client-large-icon</large-icon>
+   </icon>
+   <icon xml:lang="fr" id="fr-application-client-icon-id">
+      <small-icon>fr-application-client-small-icon</small-icon>
+      <large-icon>fr-application-client-large-icon</large-icon>
+   </icon>
+   <icon xml:lang="de" id="de-application-client-icon-id">
+      <small-icon>de-application-client-small-icon</small-icon>
+      <large-icon>de-application-client-large-icon</large-icon>
+   </icon>
+   
+   <!-- env entry -->
+   <env-entry id="appClientEnvEntry1-id">
+      <description>en-appClientEnvEntry1-desc</description>
+      <description xml:lang="fr">fr-appClientEnvEntry1-desc</description>
+      <description xml:lang="de">de-appClientEnvEntry1-desc</description>
+      <env-entry-name>appClientEnvEntry1Name</env-entry-name>
+      <env-entry-type>appClientEnvEntry1Type</env-entry-type>
+      <env-entry-value>appClientEnvEntry1Value</env-entry-value>
+      <mapped-name>appClientEnvEntry1MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>appClientEnvEntry1Injection1Class</injection-target-class>
+         <injection-target-name>appClientEnvEntry1Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>appClientEnvEntry1Injection2Class</injection-target-class>
+         <injection-target-name>appClientEnvEntry1Injection2Name</injection-target-name>
+      </injection-target>
+   </env-entry>
+   <env-entry id="appClientEnvEntry2-id">
+      <description>en-appClientEnvEntry2-desc</description>
+      <description xml:lang="fr">fr-appClientEnvEntry2-desc</description>
+      <description xml:lang="de">de-appClientEnvEntry2-desc</description>
+      <env-entry-name>appClientEnvEntry2Name</env-entry-name>
+      <env-entry-type>appClientEnvEntry2Type</env-entry-type>
+      <env-entry-value>appClientEnvEntry2Value</env-entry-value>
+      <mapped-name>appClientEnvEntry2MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>appClientEnvEntry2Injection1Class</injection-target-class>
+         <injection-target-name>appClientEnvEntry2Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>appClientEnvEntry2Injection2Class</injection-target-class>
+         <injection-target-name>appClientEnvEntry2Injection2Name</injection-target-name>
+      </injection-target>
+   </env-entry>
+   
+   <!-- ejb ref -->
+   <ejb-ref id="appClientEjbRef1-id">
+      <description>en-appClientEjbRef1-desc</description>
+      <description xml:lang="fr">fr-appClientEjbRef1-desc</description>
+      <description xml:lang="de">de-appClientEjbRef1-desc</description>
+      <ejb-ref-name>appClientEjbRef1Name</ejb-ref-name>
+      <ejb-ref-type>Session</ejb-ref-type>
+      <home>appClientEjbRef1Home</home>
+      <remote>appClientEjbRef1Remote</remote>
+      <ejb-link>appClientEjbRef1EjbLink</ejb-link>
+      <mapped-name>appClientEjbRef1MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>appClientEjbRef1Injection1Class</injection-target-class>
+         <injection-target-name>appClientEjbRef1Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>appClientEjbRef1Injection2Class</injection-target-class>
+         <injection-target-name>appClientEjbRef1Injection2Name</injection-target-name>
+      </injection-target>
+   </ejb-ref>
+   <ejb-ref id="appClientEjbRef2-id">
+      <description>en-appClientEjbRef2-desc</description>
+      <description xml:lang="fr">fr-appClientEjbRef2-desc</description>
+      <description xml:lang="de">de-appClientEjbRef2-desc</description>
+      <ejb-ref-name>appClientEjbRef2Name</ejb-ref-name>
+      <ejb-ref-type>Entity</ejb-ref-type>
+      <home>appClientEjbRef2Home</home>
+      <remote>appClientEjbRef2Remote</remote>
+      <ejb-link>appClientEjbRef2EjbLink</ejb-link>
+      <mapped-name>appClientEjbRef2MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>appClientEjbRef2Injection1Class</injection-target-class>
+         <injection-target-name>appClientEjbRef2Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>appClientEjbRef2Injection2Class</injection-target-class>
+         <injection-target-name>appClientEjbRef2Injection2Name</injection-target-name>
+      </injection-target>
+   </ejb-ref>
+   
+   <!-- resource ref -->
+   <resource-ref id="appClientResourceRef1-id">
+      <description>en-appClientResourceRef1-desc</description>
+      <description xml:lang="fr">fr-appClientResourceRef1-desc</description>
+      <description xml:lang="de">de-appClientResourceRef1-desc</description>
+      <res-ref-name>appClientResourceRef1Name</res-ref-name>
+      <res-type>appClientResourceRef1Type</res-type>
+      <res-auth>Application</res-auth>
+      <res-sharing-scope>Shareable</res-sharing-scope>
+      <mapped-name>appClientResourceRef1MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>appClientResourceRef1Injection1Class</injection-target-class>
+         <injection-target-name>appClientResourceRef1Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>appClientResourceRef1Injection2Class</injection-target-class>
+         <injection-target-name>appClientResourceRef1Injection2Name</injection-target-name>
+      </injection-target>
+   </resource-ref>
+   <resource-ref id="appClientResourceRef2-id">
+      <description>en-appClientResourceRef2-desc</description>
+      <description xml:lang="fr">fr-appClientResourceRef2-desc</description>
+      <description xml:lang="de">de-appClientResourceRef2-desc</description>
+      <res-ref-name>appClientResourceRef2Name</res-ref-name>
+      <res-type>appClientResourceRef2Type</res-type>
+      <res-auth>Container</res-auth>
+      <res-sharing-scope>Unshareable</res-sharing-scope>
+      <mapped-name>appClientResourceRef2MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>appClientResourceRef2Injection1Class</injection-target-class>
+         <injection-target-name>appClientResourceRef2Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>appClientResourceRef2Injection2Class</injection-target-class>
+         <injection-target-name>appClientResourceRef2Injection2Name</injection-target-name>
+      </injection-target>
+   </resource-ref>
+   
+   <!-- resource env ref -->
+   <resource-env-ref id="appClientResourceEnvRef1-id">
+      <description>en-appClientResourceEnvRef1-desc</description>
+      <description xml:lang="fr">fr-appClientResourceEnvRef1-desc</description>
+      <description xml:lang="de">de-appClientResourceEnvRef1-desc</description>
+      <resource-env-ref-name>appClientResourceEnvRef1Name</resource-env-ref-name>
+      <resource-env-ref-type>appClientResourceEnvRef1Type</resource-env-ref-type>
+      <mapped-name>appClientResourceEnvRef1MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>appClientResourceEnvRef1Injection1Class</injection-target-class>
+         <injection-target-name>appClientResourceEnvRef1Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>appClientResourceEnvRef1Injection2Class</injection-target-class>
+         <injection-target-name>appClientResourceEnvRef1Injection2Name</injection-target-name>
+      </injection-target>
+   </resource-env-ref>
+   <resource-env-ref id="appClientResourceEnvRef2-id">
+      <description>en-appClientResourceEnvRef2-desc</description>
+      <description xml:lang="fr">fr-appClientResourceEnvRef2-desc</description>
+      <description xml:lang="de">de-appClientResourceEnvRef2-desc</description>
+      <resource-env-ref-name>appClientResourceEnvRef2Name</resource-env-ref-name>
+      <resource-env-ref-type>appClientResourceEnvRef2Type</resource-env-ref-type>
+      <mapped-name>appClientResourceEnvRef2MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>appClientResourceEnvRef2Injection1Class</injection-target-class>
+         <injection-target-name>appClientResourceEnvRef2Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>appClientResourceEnvRef2Injection2Class</injection-target-class>
+         <injection-target-name>appClientResourceEnvRef2Injection2Name</injection-target-name>
+      </injection-target>
+   </resource-env-ref>
+   
+   <!-- message destination ref -->
+   <message-destination-ref id="appClientMessageDestinationRef1-id">
+      <description>en-appClientMessageDestinationRef1-desc</description>
+      <description xml:lang="fr">fr-appClientMessageDestinationRef1-desc</description>
+      <description xml:lang="de">de-appClientMessageDestinationRef1-desc</description>
+      <message-destination-ref-name>appClientMessageDestinationRef1Name</message-destination-ref-name>
+      <message-destination-type>appClientMessageDestinationRef1Type</message-destination-type>
+      <message-destination-usage>Consumes</message-destination-usage>
+      <message-destination-link>appClientMessageDestinationRef1Link</message-destination-link>
+      <mapped-name>appClientMessageDestinationRef1MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>appClientMessageDestinationRef1Injection1Class</injection-target-class>
+         <injection-target-name>appClientMessageDestinationRef1Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>appClientMessageDestinationRef1Injection2Class</injection-target-class>
+         <injection-target-name>appClientMessageDestinationRef1Injection2Name</injection-target-name>
+      </injection-target>
+   </message-destination-ref>
+   <message-destination-ref id="appClientMessageDestinationRef2-id">
+      <description>en-appClientMessageDestinationRef2-desc</description>
+      <description xml:lang="fr">fr-appClientMessageDestinationRef2-desc</description>
+      <description xml:lang="de">de-appClientMessageDestinationRef2-desc</description>
+      <message-destination-ref-name>appClientMessageDestinationRef2Name</message-destination-ref-name>
+      <message-destination-type>appClientMessageDestinationRef2Type</message-destination-type>
+      <message-destination-usage>Produces</message-destination-usage>
+      <message-destination-link>appClientMessageDestinationRef2Link</message-destination-link>
+      <mapped-name>appClientMessageDestinationRef2MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>appClientMessageDestinationRef2Injection1Class</injection-target-class>
+         <injection-target-name>appClientMessageDestinationRef2Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>appClientMessageDestinationRef2Injection2Class</injection-target-class>
+         <injection-target-name>appClientMessageDestinationRef2Injection2Name</injection-target-name>
+      </injection-target>
+   </message-destination-ref>
+   <message-destination-ref id="appClientMessageDestinationRef3-id">
+      <description>en-appClientMessageDestinationRef3-desc</description>
+      <description xml:lang="fr">fr-appClientMessageDestinationRef3-desc</description>
+      <description xml:lang="de">de-appClientMessageDestinationRef3-desc</description>
+      <message-destination-ref-name>appClientMessageDestinationRef3Name</message-destination-ref-name>
+      <message-destination-type>appClientMessageDestinationRef3Type</message-destination-type>
+      <message-destination-usage>ConsumesProduces</message-destination-usage>
+      <message-destination-link>appClientMessageDestinationRef3Link</message-destination-link>
+      <mapped-name>appClientMessageDestinationRef3MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>appClientMessageDestinationRef3Injection1Class</injection-target-class>
+         <injection-target-name>appClientMessageDestinationRef3Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>appClientMessageDestinationRef3Injection2Class</injection-target-class>
+         <injection-target-name>appClientMessageDestinationRef3Injection2Name</injection-target-name>
+      </injection-target>
+   </message-destination-ref>
+   
+   <!-- persistence unit ref -->
+   <persistence-unit-ref id="appClientPersistenceUnitRef1-id">
+      <description>en-appClientPersistenceUnitRef1-desc</description>
+      <description xml:lang="fr">fr-appClientPersistenceUnitRef1-desc</description>
+      <description xml:lang="de">de-appClientPersistenceUnitRef1-desc</description>
+      <persistence-unit-ref-name>appClientPersistenceUnitRef1Name</persistence-unit-ref-name>
+      <persistence-unit-name>appClientPersistenceUnitRef1Unit</persistence-unit-name>
+      <mapped-name>appClientPersistenceUnitRef1MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>appClientPersistenceUnitRef1Injection1Class</injection-target-class>
+         <injection-target-name>appClientPersistenceUnitRef1Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>appClientPersistenceUnitRef1Injection2Class</injection-target-class>
+         <injection-target-name>appClientPersistenceUnitRef1Injection2Name</injection-target-name>
+      </injection-target>
+   </persistence-unit-ref>
+   <persistence-unit-ref id="appClientPersistenceUnitRef2-id">
+      <description>en-appClientPersistenceUnitRef2-desc</description>
+      <description xml:lang="fr">fr-appClientPersistenceUnitRef2-desc</description>
+      <description xml:lang="de">de-appClientPersistenceUnitRef2-desc</description>
+      <persistence-unit-ref-name>appClientPersistenceUnitRef2Name</persistence-unit-ref-name>
+      <persistence-unit-name>appClientPersistenceUnitRef2Unit</persistence-unit-name>
+      <mapped-name>appClientPersistenceUnitRef2MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>appClientPersistenceUnitRef2Injection1Class</injection-target-class>
+         <injection-target-name>appClientPersistenceUnitRef2Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>appClientPersistenceUnitRef2Injection2Class</injection-target-class>
+         <injection-target-name>appClientPersistenceUnitRef2Injection2Name</injection-target-name>
+      </injection-target>
+   </persistence-unit-ref>
+   
+   <!-- post-construct -->
+   <post-construct>
+      <lifecycle-callback-class>appClientPostConstruct1Class</lifecycle-callback-class>
+      <lifecycle-callback-method>appClientPostConstruct1Method</lifecycle-callback-method>
+   </post-construct>
+   <post-construct>
+      <lifecycle-callback-class>appClientPostConstruct2Class</lifecycle-callback-class>
+      <lifecycle-callback-method>appClientPostConstruct2Method</lifecycle-callback-method>
+   </post-construct>
+   
+   <!-- pre-destroy -->
+   <pre-destroy>
+      <lifecycle-callback-class>appClientPreDestroy1Class</lifecycle-callback-class>
+      <lifecycle-callback-method>appClientPreDestroy1Method</lifecycle-callback-method>
+   </pre-destroy>
+   <pre-destroy>
+      <lifecycle-callback-class>appClientPreDestroy2Class</lifecycle-callback-class>
+      <lifecycle-callback-method>appClientPreDestroy2Method</lifecycle-callback-method>
+   </pre-destroy>
+</application-client>
\ No newline at end of file


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




More information about the jboss-cvs-commits mailing list