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

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Jul 20 09:09:01 EDT 2010


Author: maeste
Date: 2010-07-20 09:09:00 -0400 (Tue, 20 Jul 2010)
New Revision: 106915

Added:
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/Adminobject.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/AuthenticationMechanism.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConfigProperty.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConnectionDefinition.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/Connector.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/CredentialInterfaceEnum.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/IdDecoratedMetadata.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/InboundResourceAdapter.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/LicenseType.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/LocalizedMetadata.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/LocalizedXsdString.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/MessageAdapter.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/MessageListener.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/OutboundResourceAdapter.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ResourceAdapter.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/SecurityPermission.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/TransactionSupportEnum.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/XsdString.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/package.html
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/Connector10.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/ResourceAdapter10.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/package.html
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Activationspec15.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Connector15.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/package.html
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Activationspec16.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/ConfigProperty16.java
Removed:
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/Connector.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Activationspec.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Adminobject.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/AuthenticationMechanism.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/ConfigProperty.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/ConnectionDefinition.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/CredentialInterfaceEnum.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/IdDecoratedMetadata.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/InboundResourceAdapter.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/LicenseType.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/LocalizedMetadata.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/LocalizedXsdString.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/MessageAdapter.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/MessageListener.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/OutboundResourceAdapter.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/ResourceAdapter.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/SecurityPermission.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/TransactionSupportEnum.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/XsdString.java
Modified:
   projects/jboss-jca/trunk/.gitignore
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataFactory.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/JbossRaParser.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/RaParser.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Connector16.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Icon.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/RequiredConfigProperty.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/package.html
Log:
JBJCA-385: refactoring to support connector 1.0 1.5 and 1.6

Modified: projects/jboss-jca/trunk/.gitignore
===================================================================
--- projects/jboss-jca/trunk/.gitignore	2010-07-20 11:49:54 UTC (rev 106914)
+++ projects/jboss-jca/trunk/.gitignore	2010-07-20 13:09:00 UTC (rev 106915)
@@ -29,3 +29,5 @@
 /lib/common
 /lib/embedded
 /lib/jetty
+
+common/src/main/resources/schema/connector_1_0.xsd

Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataFactory.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataFactory.java	2010-07-20 11:49:54 UTC (rev 106914)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataFactory.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -24,8 +24,8 @@
 
 import org.jboss.jca.common.metadata.jbossra.JbossRa;
 import org.jboss.jca.common.metadata.jbossra.JbossRaParser;
-import org.jboss.jca.common.metadata.ra.Connector;
 import org.jboss.jca.common.metadata.ra.RaParser;
+import org.jboss.jca.common.metadata.ra.common.Connector;
 
 import java.io.File;
 import java.io.FileInputStream;

Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/JbossRaParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/JbossRaParser.java	2010-07-20 11:49:54 UTC (rev 106914)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/JbossRaParser.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -52,7 +52,7 @@
 
    /**
     * Parse the xml file and return the {@link JbossRa} metadata
-    * @param xmlFile The xml file to parse
+    * @param xmlInputStream The stream on xml file to parse
     * @return The {@link JbossRa} metadata
     * @exception Exception Thrown if an error occurs
     */

Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/Connector.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/Connector.java	2010-07-20 11:49:54 UTC (rev 106914)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/Connector.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra;
-
-import org.jboss.jca.common.metadata.JCAMetadata;
-
-/**
- *
- * A Connector.
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
- */
-public interface Connector extends JCAMetadata
-{
-
-}

Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/RaParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/RaParser.java	2010-07-20 11:49:54 UTC (rev 106914)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/RaParser.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -22,6 +22,7 @@
 package org.jboss.jca.common.metadata.ra;
 
 import org.jboss.jca.common.metadata.MetadataParser;
+import org.jboss.jca.common.metadata.ra.common.Connector;
 
 import java.io.InputStream;
 

Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/Adminobject.java (from rev 106884, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Adminobject.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/Adminobject.java	                        (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/Adminobject.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -0,0 +1,194 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.common;
+
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
+ *
+ */
+public class Adminobject implements IdDecoratedMetadata
+{
+   /**
+     */
+   private static final long serialVersionUID = -7653991400977178783L;
+
+   private final String adminobjectInterface;
+
+   private final String adminobjectClass;
+
+   private final List<? extends ConfigProperty> configProperty;
+
+   private final String id;
+
+   /**
+    * @param adminobjectInterface full qualified name of the interface
+    * @param adminobjectClass full qualified name of the implementation class
+    * @param configProperty List of config propeties
+    * @param id xmlid
+    */
+   public Adminobject(final String adminobjectInterface, final String adminobjectClass,
+         final List<? extends ConfigProperty> configProperty, final String id)
+   {
+      super();
+      this.adminobjectInterface = adminobjectInterface;
+      this.adminobjectClass = adminobjectClass;
+      this.configProperty = configProperty;
+      this.id = id;
+   }
+
+   /**
+    * @return adminobjectInterface
+    */
+   public String getAdminobjectInterface()
+   {
+      return adminobjectInterface;
+   }
+
+   /**
+    * @return adminobjectClass
+    */
+   public String getAdminobjectClass()
+   {
+      return adminobjectClass;
+   }
+
+   /**
+    * @return configProperty
+    */
+   public List<? extends ConfigProperty> getConfigProperty()
+   {
+      return Collections.unmodifiableList(configProperty);
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see IdDecoratedMetadata#getId()
+    */
+   @Override
+   public String getId()
+   {
+      return id;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#hashCode()
+    */
+   @Override
+   public int hashCode()
+   {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + ((adminobjectClass == null) ? 0 : adminobjectClass.hashCode());
+      result = prime * result + ((adminobjectInterface == null) ? 0 : adminobjectInterface.hashCode());
+      result = prime * result + ((configProperty == null) ? 0 : configProperty.hashCode());
+      result = prime * result + ((id == null) ? 0 : id.hashCode());
+      return result;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#equals(java.lang.Object)
+    */
+   @Override
+   public boolean equals(final Object obj)
+   {
+      if (this == obj)
+      {
+         return true;
+      }
+      if (obj == null)
+      {
+         return false;
+      }
+      if (!(obj instanceof Adminobject))
+      {
+         return false;
+      }
+      final Adminobject other = (Adminobject) obj;
+      if (adminobjectClass == null)
+      {
+         if (other.adminobjectClass != null)
+         {
+            return false;
+         }
+      }
+      else if (!adminobjectClass.equals(other.adminobjectClass))
+      {
+         return false;
+      }
+      if (adminobjectInterface == null)
+      {
+         if (other.adminobjectInterface != null)
+         {
+            return false;
+         }
+      }
+      else if (!adminobjectInterface.equals(other.adminobjectInterface))
+      {
+         return false;
+      }
+      if (configProperty == null)
+      {
+         if (other.configProperty != null)
+         {
+            return false;
+         }
+      }
+      else if (!configProperty.equals(other.configProperty))
+      {
+         return false;
+      }
+      if (id == null)
+      {
+         if (other.id != null)
+         {
+            return false;
+         }
+      }
+      else if (!id.equals(other.id))
+      {
+         return false;
+      }
+      return true;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#toString()
+    */
+   @Override
+   public String toString()
+   {
+      return "Adminobject [adminobjectInterface=" + adminobjectInterface + ", adminobjectClass=" + adminobjectClass
+            + ", configProperty=" + configProperty + ", id=" + id + "]";
+   }
+
+}

Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/AuthenticationMechanism.java (from rev 106884, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/AuthenticationMechanism.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/AuthenticationMechanism.java	                        (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/AuthenticationMechanism.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -0,0 +1,196 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.common;
+
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
+ *
+ */
+public class AuthenticationMechanism implements IdDecoratedMetadata
+{
+   /**
+    */
+   private static final long serialVersionUID = -1448136517857827148L;
+
+   private final List<LocalizedXsdString> description;
+
+   private final XsdString authenticationMechanismType;
+
+   private final CredentialInterfaceEnum credentialInterface;
+
+   private final String id;
+
+   /**
+    * @param description description attribute in xml
+    * @param authenticationMechanismType specifies type of an authentication mechanism.
+            The example values are:
+
+            <authentication-mechanism-type>BasicPassword
+            </authentication-mechanism-type>
+
+            <authentication-mechanism-type>Kerbv5
+            </authentication-mechanism-type>
+
+            Any additional security mechanisms are outside the
+            scope of the Connector architecture specification.
+    * @param credentialInterface enumeration representing credentialInterface.
+    * @param id xml ID
+    */
+   public AuthenticationMechanism(List<LocalizedXsdString> description, XsdString authenticationMechanismType,
+         CredentialInterfaceEnum credentialInterface, String id)
+   {
+      super();
+      this.description = description;
+      this.authenticationMechanismType = authenticationMechanismType;
+      this.credentialInterface = credentialInterface;
+      this.id = id;
+   }
+
+   /**
+    * @return description
+    */
+   public List<LocalizedXsdString> getDescription()
+   {
+      return Collections.unmodifiableList(description);
+   }
+
+   /**
+    * @return authenticationMechanismType
+    */
+   public XsdString getAuthenticationMechanismType()
+   {
+      return authenticationMechanismType;
+   }
+
+   /**
+    * @return credentialInterface
+    */
+   public CredentialInterfaceEnum getCredentialInterface()
+   {
+      return credentialInterface;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see IdDecoratedMetadata#getId()
+    */
+   @Override
+   public String getId()
+   {
+      return id;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#hashCode()
+    */
+   @Override
+   public int hashCode()
+   {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + ((authenticationMechanismType == null) ? 0 : authenticationMechanismType.hashCode());
+      result = prime * result + ((credentialInterface == null) ? 0 : credentialInterface.hashCode());
+      result = prime * result + ((description == null) ? 0 : description.hashCode());
+      result = prime * result + ((id == null) ? 0 : id.hashCode());
+      return result;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#equals(java.lang.Object)
+    */
+   @Override
+   public boolean equals(Object obj)
+   {
+      if (this == obj)
+      {
+         return true;
+      }
+      if (obj == null)
+      {
+         return false;
+      }
+      if (!(obj instanceof AuthenticationMechanism))
+      {
+         return false;
+      }
+      AuthenticationMechanism other = (AuthenticationMechanism) obj;
+      if (authenticationMechanismType == null)
+      {
+         if (other.authenticationMechanismType != null)
+         {
+            return false;
+         }
+      }
+      else if (!authenticationMechanismType.equals(other.authenticationMechanismType))
+      {
+         return false;
+      }
+      if (credentialInterface != other.credentialInterface)
+      {
+         return false;
+      }
+      if (description == null)
+      {
+         if (other.description != null)
+         {
+            return false;
+         }
+      }
+      else if (!description.equals(other.description))
+      {
+         return false;
+      }
+      if (id == null)
+      {
+         if (other.id != null)
+         {
+            return false;
+         }
+      }
+      else if (!id.equals(other.id))
+      {
+         return false;
+      }
+      return true;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#toString()
+    */
+   @Override
+   public String toString()
+   {
+      return "AuthenticationMechanism [description=" + description + ", authenticationMechanismType="
+            + authenticationMechanismType + ", credentialInterface=" + credentialInterface + ", id=" + id + "]";
+   }
+}

Added: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConfigProperty.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConfigProperty.java	                        (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConfigProperty.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -0,0 +1,129 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.common;
+
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ *
+ * A ConfigProperty.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+public class ConfigProperty implements IdDecoratedMetadata
+{
+
+   /** The serialVersionUID */
+   private static final long serialVersionUID = 4840388990647778928L;
+
+   /**
+    * description
+    */
+   protected final List<LocalizedXsdString> description;
+
+   /**
+    * configPropertyName
+    */
+   protected final XsdString configPropertyName;
+
+   /**
+    * configPropertyType
+    */
+   protected final XsdString configPropertyType;
+
+   /**
+    * configPropertyValue
+    */
+   protected final XsdString configPropertyValue;
+
+   /**
+    * id
+    */
+   protected final String id;
+
+   /**
+    * Create a new ConfigProperty15.
+    *
+    * @param description the description
+    * @param configPropertyName name of config-property
+    * @param configPropertyType type of config-property
+    * @param configPropertyValue value of config-property
+    * @param id id attribute in xml file
+    */
+   public ConfigProperty(List<LocalizedXsdString> description, XsdString configPropertyName,
+         XsdString configPropertyType, XsdString configPropertyValue, String id)
+   {
+      super();
+      this.description = description;
+      this.configPropertyName = configPropertyName;
+      this.configPropertyType = configPropertyType;
+      this.configPropertyValue = configPropertyValue;
+      this.id = id;
+   }
+
+   /**
+    * @return description
+    */
+   public List<LocalizedXsdString> getDescription()
+   {
+      return Collections.unmodifiableList(description);
+   }
+
+   /**
+    * @return configPropertyName
+    */
+   public XsdString getConfigPropertyName()
+   {
+      return configPropertyName;
+   }
+
+   /**
+    * @return configPropertyType
+    */
+   public XsdString getConfigPropertyType()
+   {
+      return configPropertyType;
+   }
+
+   /**
+    * @return configPropertyValue
+    */
+   public XsdString getConfigPropertyValue()
+   {
+      return configPropertyValue;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see IdDecoratedMetadata#getId()
+    */
+   @Override
+   public String getId()
+   {
+      return id;
+   }
+
+}

Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConnectionDefinition.java (from rev 106884, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/ConnectionDefinition.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConnectionDefinition.java	                        (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConnectionDefinition.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -0,0 +1,269 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.common;
+
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
+ *
+ */
+public class ConnectionDefinition implements IdDecoratedMetadata
+{
+   /**
+    */
+   private static final long serialVersionUID = 197264648585424765L;
+
+   private final String managedconnectionfactoryClass;
+
+   private final List<? extends ConfigProperty> configProperty;
+
+   private final String connectionfactoryInterface;
+
+   private final String connectionfactoryImplClass;
+
+   private final String connectionInterface;
+
+   private final String connectionImplClass;
+
+   private final String id;
+
+   /**
+    * @param managedconnectionfactoryClass full qualified name of the class
+    * @param configProperty List of configproperties
+    * @param connectionfactoryInterface full qualified name of the factory interface
+    * @param connectionfactoryImplClass full qualified name of the factory implementation class
+    * @param connectionInterface full qualified name of the connection interface
+    * @param connectionImplClass full qualified name of the connection implementation class
+    * @param id XML ID
+    */
+   public ConnectionDefinition(String managedconnectionfactoryClass, List<? extends ConfigProperty> configProperty,
+         String connectionfactoryInterface, String connectionfactoryImplClass, String connectionInterface,
+         String connectionImplClass, String id)
+   {
+      super();
+      this.managedconnectionfactoryClass = managedconnectionfactoryClass;
+      this.configProperty = configProperty;
+      this.connectionfactoryInterface = connectionfactoryInterface;
+      this.connectionfactoryImplClass = connectionfactoryImplClass;
+      this.connectionInterface = connectionInterface;
+      this.connectionImplClass = connectionImplClass;
+      this.id = id;
+   }
+
+   /**
+    * @return managedconnectionfactoryClass
+    */
+   public String getManagedconnectionfactoryClass()
+   {
+      return managedconnectionfactoryClass;
+   }
+
+   /**
+    * @return configProperty
+    */
+   public List<? extends ConfigProperty> getConfigProperty()
+   {
+      return Collections.unmodifiableList(configProperty);
+   }
+
+   /**
+    * @return connectionfactoryInterface
+    */
+   public String getConnectionfactoryInterface()
+   {
+      return connectionfactoryInterface;
+   }
+
+   /**
+    * @return connectionfactoryImplClass
+    */
+   public String getConnectionfactoryImplClass()
+   {
+      return connectionfactoryImplClass;
+   }
+
+   /**
+    * @return connectionInterface
+    */
+   public String getConnectionInterface()
+   {
+      return connectionInterface;
+   }
+
+   /**
+    * @return connectionImplClass
+    */
+   public String getConnectionImplClass()
+   {
+      return connectionImplClass;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see IdDecoratedMetadata#getId()
+    */
+   @Override
+   public String getId()
+   {
+      return id;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#hashCode()
+    */
+   @Override
+   public int hashCode()
+   {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + ((configProperty == null) ? 0 : configProperty.hashCode());
+      result = prime * result + ((connectionImplClass == null) ? 0 : connectionImplClass.hashCode());
+      result = prime * result + ((connectionInterface == null) ? 0 : connectionInterface.hashCode());
+      result = prime * result + ((connectionfactoryImplClass == null) ? 0 : connectionfactoryImplClass.hashCode());
+      result = prime * result + ((connectionfactoryInterface == null) ? 0 : connectionfactoryInterface.hashCode());
+      result = prime * result + ((id == null) ? 0 : id.hashCode());
+      result = prime * result
+            + ((managedconnectionfactoryClass == null) ? 0 : managedconnectionfactoryClass.hashCode());
+      return result;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#equals(java.lang.Object)
+    */
+   @Override
+   public boolean equals(Object obj)
+   {
+      if (this == obj)
+      {
+         return true;
+      }
+      if (obj == null)
+      {
+         return false;
+      }
+      if (!(obj instanceof ConnectionDefinition))
+      {
+         return false;
+      }
+      ConnectionDefinition other = (ConnectionDefinition) obj;
+      if (configProperty == null)
+      {
+         if (other.configProperty != null)
+         {
+            return false;
+         }
+      }
+      else if (!configProperty.equals(other.configProperty))
+      {
+         return false;
+      }
+      if (connectionImplClass == null)
+      {
+         if (other.connectionImplClass != null)
+         {
+            return false;
+         }
+      }
+      else if (!connectionImplClass.equals(other.connectionImplClass))
+      {
+         return false;
+      }
+      if (connectionInterface == null)
+      {
+         if (other.connectionInterface != null)
+         {
+            return false;
+         }
+      }
+      else if (!connectionInterface.equals(other.connectionInterface))
+      {
+         return false;
+      }
+      if (connectionfactoryImplClass == null)
+      {
+         if (other.connectionfactoryImplClass != null)
+         {
+            return false;
+         }
+      }
+      else if (!connectionfactoryImplClass.equals(other.connectionfactoryImplClass))
+      {
+         return false;
+      }
+      if (connectionfactoryInterface == null)
+      {
+         if (other.connectionfactoryInterface != null)
+         {
+            return false;
+         }
+      }
+      else if (!connectionfactoryInterface.equals(other.connectionfactoryInterface))
+      {
+         return false;
+      }
+      if (id == null)
+      {
+         if (other.id != null)
+         {
+            return false;
+         }
+      }
+      else if (!id.equals(other.id))
+      {
+         return false;
+      }
+      if (managedconnectionfactoryClass == null)
+      {
+         if (other.managedconnectionfactoryClass != null)
+         {
+            return false;
+         }
+      }
+      else if (!managedconnectionfactoryClass.equals(other.managedconnectionfactoryClass))
+      {
+         return false;
+      }
+      return true;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#toString()
+    */
+   @Override
+   public String toString()
+   {
+      return "ConnectionDefinition [managedconnectionfactoryClass=" + managedconnectionfactoryClass
+            + ", configProperty=" + configProperty + ", connectionfactoryInterface=" + connectionfactoryInterface
+            + ", connectionfactoryImplClass=" + connectionfactoryImplClass + ", connectionInterface="
+            + connectionInterface + ", connectionImplClass=" + connectionImplClass + ", id=" + id + "]";
+   }
+}

Added: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/Connector.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/Connector.java	                        (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/Connector.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -0,0 +1,208 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.common;
+
+/**
+ *
+ * A Connector.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+public abstract class Connector implements IdDecoratedMetadata
+{
+
+   /** The serialVersionUID */
+   private static final long serialVersionUID = -2054156739973617322L;
+
+   /**
+    * vendor name
+    */
+   protected final XsdString vendorName;
+
+   /**
+    * EIS type
+    */
+   protected final XsdString eisType;
+
+   /**
+    * license information
+    */
+   protected final LicenseType license;
+
+   /**
+    * resource adapter
+    */
+   protected final ResourceAdapter resourceadapter;
+
+   /**
+    * id attribute
+    */
+   protected final String id;
+
+   /**
+    * Create a new Connector.
+    *
+    * @param vendorName vandor name
+    * @param eisType tyeo of EIS
+    * @param license license information
+    * @param resourceadapter resource adapter instance
+    * @param id id attribute in xml file
+    */
+   protected Connector(XsdString vendorName, XsdString eisType, LicenseType license, ResourceAdapter resourceadapter,
+         String id)
+   {
+      super();
+      this.vendorName = vendorName;
+      this.eisType = eisType;
+      this.license = license;
+      this.resourceadapter = resourceadapter;
+      this.id = id;
+   }
+
+   /**
+    * Get the vendorName.
+    *
+    * @return the vendorName.
+    */
+   public XsdString getVendorName()
+   {
+      return vendorName;
+   }
+
+   /**
+    * Get the eisType.
+    *
+    * @return the eisType.
+    */
+   public XsdString getEisType()
+   {
+      return eisType;
+   }
+
+   /**
+    * Get the license.
+    *
+    * @return the license.
+    */
+   public LicenseType getLicense()
+   {
+      return license;
+   }
+
+   /**
+    * Get the resourceadapter.
+    *
+    * @return the resourceadapter.
+    */
+   public ResourceAdapter getResourceadapter()
+   {
+      return resourceadapter;
+   }
+
+   /**
+    * Get the version.
+    *
+    * @return the version.
+    */
+   public abstract String getVersion();
+
+   /**
+    * Get the id.
+    *
+    * @return the id.
+    */
+   @Override
+   public String getId()
+   {
+      return id;
+   }
+
+   @Override
+   public int hashCode()
+   {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + ((eisType == null) ? 0 : eisType.hashCode());
+      result = prime * result + ((id == null) ? 0 : id.hashCode());
+      result = prime * result + ((license == null) ? 0 : license.hashCode());
+      result = prime * result + ((resourceadapter == null) ? 0 : resourceadapter.hashCode());
+      result = prime * result + ((vendorName == null) ? 0 : vendorName.hashCode());
+      return result;
+   }
+
+   @Override
+   public boolean equals(Object obj)
+   {
+      if (this == obj)
+         return true;
+      if (obj == null)
+         return false;
+      if (!(obj instanceof Connector))
+         return false;
+      Connector other = (Connector) obj;
+      if (eisType == null)
+      {
+         if (other.eisType != null)
+            return false;
+      }
+      else if (!eisType.equals(other.eisType))
+         return false;
+      if (id == null)
+      {
+         if (other.id != null)
+            return false;
+      }
+      else if (!id.equals(other.id))
+         return false;
+      if (license == null)
+      {
+         if (other.license != null)
+            return false;
+      }
+      else if (!license.equals(other.license))
+         return false;
+      if (resourceadapter == null)
+      {
+         if (other.resourceadapter != null)
+            return false;
+      }
+      else if (!resourceadapter.equals(other.resourceadapter))
+         return false;
+      if (vendorName == null)
+      {
+         if (other.vendorName != null)
+            return false;
+      }
+      else if (!vendorName.equals(other.vendorName))
+         return false;
+      return true;
+   }
+
+   @Override
+   public String toString()
+   {
+      return "Connector [vendorName=" + vendorName + ", eisType=" + eisType + ", license=" + license
+            + ", resourceadapter=" + resourceadapter + ", id=" + id + "]";
+   }
+
+}

Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/CredentialInterfaceEnum.java (from rev 106884, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/CredentialInterfaceEnum.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/CredentialInterfaceEnum.java	                        (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/CredentialInterfaceEnum.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -0,0 +1,102 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.common;
+
+/**
+ * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
+ *The credential-interfaceType specifies the
+ *        interface that the resource adapter implementation
+ *        supports for the representation of the
+ *        credentials. This element(s) that use this type,
+ *        i.e. credential-interface,  should be used by
+ *        application server to find out the Credential
+ *        interface it should use as part of the security
+ *        contract.
+ *        The possible values are:
+ *
+ *        javax.resource.spi.security.PasswordCredential
+ *        org.ietf.jgss.GSSCredential
+ *        javax.resource.spi.security.GenericCredential
+ */
+public enum CredentialInterfaceEnum
+{
+   /**
+    * enum instance representing javax.resource.spi.security.PasswordCredential
+    */
+   PASSWORD("javax.resource.spi.security.PasswordCredential"),
+   /**
+    * enum instance representing org.ietf.jgss.GSSCredentia
+    */
+   GSS("org.ietf.jgss.GSSCredential"),
+   /**
+    * enum instance representing javax.resource.spi.security.GenericCredential
+    */
+   GENERIC("javax.resource.spi.security.GenericCredential");
+
+   private final String fullQualifiedName;
+
+   private CredentialInterfaceEnum(String name)
+   {
+      this.fullQualifiedName = name;
+   }
+
+   /**
+    *
+    * Conveninet method to get enum instance giving full qualified name
+    *
+    * @param fullQualifiedName the full qualified name of supported Credential interface
+    * @return the corresponding enum instance
+    * @throws IllegalArgumentException in case the fullQualifiedName isn't one of the supported interfaces:
+    *        javax.resource.spi.security.PasswordCredential
+    *        org.ietf.jgss.GSSCredential
+    *        javax.resource.spi.security.GenericCredential
+    */
+   public static CredentialInterfaceEnum build(String fullQualifiedName) throws IllegalArgumentException
+   {
+      if ("javax.resource.spi.security.PasswordCredential".equals(fullQualifiedName))
+      {
+         return PASSWORD;
+      }
+      else if ("org.ietf.jgss.GSSCredential".equals(fullQualifiedName))
+      {
+         return GSS;
+      }
+      else if ("javax.resource.spi.security.GenericCredential".equals(fullQualifiedName))
+      {
+         return GENERIC;
+      }
+      else
+      {
+         throw new IllegalArgumentException("fullQualifiedName should be one of "
+               + "javax.resource.spi.security.PasswordCredential;" + " org.ietf.jgss.GSSCredential;"
+               + "javax.resource.spi.security.GenericCredential");
+      }
+   }
+
+   /**
+    * @return fullQualifiedName
+    */
+   public String getFullQualifiedName()
+   {
+      return fullQualifiedName;
+   }
+}

Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/IdDecoratedMetadata.java (from rev 106884, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/IdDecoratedMetadata.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/IdDecoratedMetadata.java	                        (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/IdDecoratedMetadata.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.common;
+
+import org.jboss.jca.common.metadata.JCAMetadata;
+
+/**
+ * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
+ *
+ */
+public interface IdDecoratedMetadata extends JCAMetadata
+{
+
+   /**
+    *
+    * Return the String representing xml ID
+    *
+    * @return the XML ID
+    */
+   public String getId();
+
+}

Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/InboundResourceAdapter.java (from rev 106884, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/InboundResourceAdapter.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/InboundResourceAdapter.java	                        (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/InboundResourceAdapter.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -0,0 +1,144 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.common;
+
+
+/**
+ * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
+ *
+ */
+public class InboundResourceAdapter implements IdDecoratedMetadata
+{
+   /**
+    */
+   private static final long serialVersionUID = -2854927981408307535L;
+
+   private final MessageAdapter messageadapter;
+
+   private final String id;
+
+   /**
+    * @param messageadapter The messageadapterType specifies information about the
+    * messaging capabilities of the resource adapter. This
+    * contains information specific to the implementation of the
+    * resource adapter library as specified through the
+    * messagelistener element.
+    * @param id XML ID
+    */
+   public InboundResourceAdapter(MessageAdapter messageadapter, String id)
+   {
+      super();
+      this.messageadapter = messageadapter;
+      this.id = id;
+   }
+
+   /**
+    * @return messageadapter
+    */
+   public MessageAdapter getMessageadapter()
+   {
+      return messageadapter;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see IdDecoratedMetadata#getId()
+    */
+   @Override
+   public String getId()
+   {
+      return id;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#hashCode()
+    */
+   @Override
+   public int hashCode()
+   {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + ((id == null) ? 0 : id.hashCode());
+      result = prime * result + ((messageadapter == null) ? 0 : messageadapter.hashCode());
+      return result;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#equals(java.lang.Object)
+    */
+   @Override
+   public boolean equals(Object obj)
+   {
+      if (this == obj)
+      {
+         return true;
+      }
+      if (obj == null)
+      {
+         return false;
+      }
+      if (!(obj instanceof InboundResourceAdapter))
+      {
+         return false;
+      }
+      InboundResourceAdapter other = (InboundResourceAdapter) obj;
+      if (id == null)
+      {
+         if (other.id != null)
+         {
+            return false;
+         }
+      }
+      else if (!id.equals(other.id))
+      {
+         return false;
+      }
+      if (messageadapter == null)
+      {
+         if (other.messageadapter != null)
+         {
+            return false;
+         }
+      }
+      else if (!messageadapter.equals(other.messageadapter))
+      {
+         return false;
+      }
+      return true;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#toString()
+    */
+   @Override
+   public String toString()
+   {
+      return "InboundResourceAdapter [messageadapter=" + messageadapter + ", id=" + id + "]";
+   }
+}

Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/LicenseType.java (from rev 106884, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/LicenseType.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/LicenseType.java	                        (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/LicenseType.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -0,0 +1,162 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.common;
+
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
+ *
+ */
+public class LicenseType implements IdDecoratedMetadata
+{
+
+   /**
+    */
+   private static final long serialVersionUID = 1590514246054447090L;
+
+   private final List<LocalizedXsdString> description;
+
+   private final boolean licenseRequired;
+
+   private final String id;
+
+   /**
+    * @param description description of the license
+    * @param licenseRequired mandatory boolena value
+    * @param id XML ID
+    */
+   public LicenseType(List<LocalizedXsdString> description, boolean licenseRequired, String id)
+   {
+      super();
+      this.description = description;
+      this.licenseRequired = licenseRequired;
+      this.id = id;
+   }
+
+   /**
+    * @return description
+    */
+   public List<LocalizedXsdString> getDescription()
+   {
+      return Collections.unmodifiableList(description);
+   }
+
+   /**
+    * @return licenseRequired
+    */
+   public boolean isLicenseRequired()
+   {
+      return licenseRequired;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see IdDecoratedMetadata#getId()
+    */
+   @Override
+   public String getId()
+   {
+      return id;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#hashCode()
+    */
+   @Override
+   public int hashCode()
+   {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + ((description == null) ? 0 : description.hashCode());
+      result = prime * result + ((id == null) ? 0 : id.hashCode());
+      result = prime * result + (licenseRequired ? 1231 : 1237);
+      return result;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#equals(java.lang.Object)
+    */
+   @Override
+   public boolean equals(Object obj)
+   {
+      if (this == obj)
+      {
+         return true;
+      }
+      if (obj == null)
+      {
+         return false;
+      }
+      if (!(obj instanceof LicenseType))
+      {
+         return false;
+      }
+      LicenseType other = (LicenseType) obj;
+      if (description == null)
+      {
+         if (other.description != null)
+         {
+            return false;
+         }
+      }
+      else if (!description.equals(other.description))
+      {
+         return false;
+      }
+      if (id == null)
+      {
+         if (other.id != null)
+         {
+            return false;
+         }
+      }
+      else if (!id.equals(other.id))
+      {
+         return false;
+      }
+      if (licenseRequired != other.licenseRequired)
+      {
+         return false;
+      }
+      return true;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#toString()
+    */
+   @Override
+   public String toString()
+   {
+      return "LicenseType [description=" + description + ", licenseRequired=" + licenseRequired + ", id=" + id + "]";
+   }
+
+}

Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/LocalizedMetadata.java (from rev 106884, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/LocalizedMetadata.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/LocalizedMetadata.java	                        (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/LocalizedMetadata.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.common;
+
+import org.jboss.jca.common.metadata.JCAMetadata;
+
+/**
+ * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
+ *
+ */
+public interface LocalizedMetadata extends JCAMetadata
+{
+
+   /**
+    *
+    * Language used for this string at xml level. Value are like "en", "it", "fr" and so on
+    *
+    * @return the lang used for this string
+    */
+   public String getLang();
+
+}

Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/LocalizedXsdString.java (from rev 106884, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/LocalizedXsdString.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/LocalizedXsdString.java	                        (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/LocalizedXsdString.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -0,0 +1,128 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.common;
+
+/**
+ * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
+ *
+ */
+public class LocalizedXsdString extends XsdString implements LocalizedMetadata
+{
+   /**
+    */
+   private static final long serialVersionUID = -7778684576336929347L;
+
+   private final String lang;
+
+   /**
+    * @param value value of the String
+    * @param id XML ID
+    * @param lang language
+    */
+   public LocalizedXsdString(String value, String id, String lang)
+   {
+      super(value, id);
+      this.lang = lang;
+   }
+
+   /**
+    * Constructor for default language "en"
+    *
+    * @param value value of the String
+    * @param id XML ID
+    */
+   public LocalizedXsdString(String value, String id)
+   {
+      super(value, id);
+      this.lang = "en";
+   }
+
+   /**
+    * @return lang
+    */
+   @Override
+   public String getLang()
+   {
+      return lang;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#hashCode()
+    */
+   @Override
+   public int hashCode()
+   {
+      final int prime = 31;
+      int result = super.hashCode();
+      result = prime * result + ((lang == null) ? 0 : lang.hashCode());
+      return result;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#equals(java.lang.Object)
+    */
+   @Override
+   public boolean equals(Object obj)
+   {
+      if (this == obj)
+      {
+         return true;
+      }
+      if (!super.equals(obj))
+      {
+         return false;
+      }
+      if (!(obj instanceof LocalizedXsdString))
+      {
+         return false;
+      }
+      LocalizedXsdString other = (LocalizedXsdString) obj;
+      if (lang == null)
+      {
+         if (other.lang != null)
+         {
+            return false;
+         }
+      }
+      else if (!lang.equals(other.lang))
+      {
+         return false;
+      }
+      return true;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#toString()
+    */
+   @Override
+   public String toString()
+   {
+      return "LocalizedXsdString [lang=" + lang + ", value=" + value + ", id=" + id + "]";
+   }
+
+}

Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/MessageAdapter.java (from rev 106884, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/MessageAdapter.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/MessageAdapter.java	                        (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/MessageAdapter.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -0,0 +1,147 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.common;
+
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
+ *
+ */
+public class MessageAdapter implements IdDecoratedMetadata
+{
+   /**
+    */
+   private static final long serialVersionUID = 1731250340667920811L;
+
+   private final List<MessageListener> messagelistener;
+
+   private final String id;
+
+   /**
+    * @param messagelistener The messagelistener specifies information about a
+    *  specific message listener supported by the messaging
+    *  resource adapter. It contains information on the Java type
+    *  of the message listener interface and an activation
+    *  specification.
+    * @param id XML ID
+    */
+   public MessageAdapter(List<MessageListener> messagelistener, String id)
+   {
+      super();
+      this.messagelistener = messagelistener;
+      this.id = id;
+   }
+
+   /**
+    * @return messagelistener
+    */
+   public List<MessageListener> getMessagelistener()
+   {
+      return Collections.unmodifiableList(messagelistener);
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see IdDecoratedMetadata#getId()
+    */
+   @Override
+   public String getId()
+   {
+      return id;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#hashCode()
+    */
+   @Override
+   public int hashCode()
+   {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + ((id == null) ? 0 : id.hashCode());
+      result = prime * result + ((messagelistener == null) ? 0 : messagelistener.hashCode());
+      return result;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#equals(java.lang.Object)
+    */
+   @Override
+   public boolean equals(Object obj)
+   {
+      if (this == obj)
+      {
+         return true;
+      }
+      if (obj == null)
+      {
+         return false;
+      }
+      if (!(obj instanceof MessageAdapter))
+      {
+         return false;
+      }
+      MessageAdapter other = (MessageAdapter) obj;
+      if (id == null)
+      {
+         if (other.id != null)
+         {
+            return false;
+         }
+      }
+      else if (!id.equals(other.id))
+      {
+         return false;
+      }
+      if (messagelistener == null)
+      {
+         if (other.messagelistener != null)
+         {
+            return false;
+         }
+      }
+      else if (!messagelistener.equals(other.messagelistener))
+      {
+         return false;
+      }
+      return true;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#toString()
+    */
+   @Override
+   public String toString()
+   {
+      return "MessageAdapter [messagelistener=" + messagelistener + ", id=" + id + "]";
+   }
+}

Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/MessageListener.java (from rev 106884, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/MessageListener.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/MessageListener.java	                        (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/MessageListener.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -0,0 +1,169 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.common;
+
+import org.jboss.jca.common.metadata.ra.ra15.Activationspec15;
+
+/**
+ * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
+ *
+ */
+public class MessageListener implements IdDecoratedMetadata
+{
+   /**
+    */
+   private static final long serialVersionUID = 6417807206318228618L;
+
+   private final String messagelistenerType;
+
+   private final Activationspec15 activationspec;
+
+   private final String id;
+
+   /**
+    * @param messagelistenerType full qualified name of the java type
+    * @param activationspec  The activationspecType specifies an activation
+    * specification.  The information includes fully qualified
+    * Java class name of an activation specification and a set of
+    * required configuration property names.
+    * @param id XML ID
+    */
+   public MessageListener(String messagelistenerType, Activationspec15 activationspec, String id)
+   {
+      super();
+      this.messagelistenerType = messagelistenerType;
+      this.activationspec = activationspec;
+      this.id = id;
+   }
+
+   /**
+    * @return messagelistenerType
+    */
+   public String getMessagelistenerType()
+   {
+      return messagelistenerType;
+   }
+
+   /**
+    * @return activationspec
+    */
+   public Activationspec15 getActivationspec()
+   {
+      return activationspec;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see IdDecoratedMetadata#getId()
+    */
+   @Override
+   public String getId()
+   {
+      return id;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#hashCode()
+    */
+   @Override
+   public int hashCode()
+   {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + ((activationspec == null) ? 0 : activationspec.hashCode());
+      result = prime * result + ((id == null) ? 0 : id.hashCode());
+      result = prime * result + ((messagelistenerType == null) ? 0 : messagelistenerType.hashCode());
+      return result;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#equals(java.lang.Object)
+    */
+   @Override
+   public boolean equals(Object obj)
+   {
+      if (this == obj)
+      {
+         return true;
+      }
+      if (obj == null)
+      {
+         return false;
+      }
+      if (!(obj instanceof MessageListener))
+      {
+         return false;
+      }
+      MessageListener other = (MessageListener) obj;
+      if (activationspec == null)
+      {
+         if (other.activationspec != null)
+         {
+            return false;
+         }
+      }
+      else if (!activationspec.equals(other.activationspec))
+      {
+         return false;
+      }
+      if (id == null)
+      {
+         if (other.id != null)
+         {
+            return false;
+         }
+      }
+      else if (!id.equals(other.id))
+      {
+         return false;
+      }
+      if (messagelistenerType == null)
+      {
+         if (other.messagelistenerType != null)
+         {
+            return false;
+         }
+      }
+      else if (!messagelistenerType.equals(other.messagelistenerType))
+      {
+         return false;
+      }
+      return true;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#toString()
+    */
+   @Override
+   public String toString()
+   {
+      return "MessageListener [messagelistenerType=" + messagelistenerType + ", activationspec=" + activationspec
+            + ", id=" + id + "]";
+   }
+}

Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/OutboundResourceAdapter.java (from rev 106884, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/OutboundResourceAdapter.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/OutboundResourceAdapter.java	                        (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/OutboundResourceAdapter.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -0,0 +1,212 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.common;
+
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
+ *
+ */
+public class OutboundResourceAdapter implements IdDecoratedMetadata
+{
+   /**
+    */
+   private static final long serialVersionUID = 421345307326415666L;
+
+   private final List<ConnectionDefinition> connectionDefinition;
+
+   private final TransactionSupportEnum transactionSupport;
+
+   private final List<AuthenticationMechanism> authenticationMechanism;
+
+   private final Boolean reauthenticationSupport;
+
+   private final String id;
+
+   /**
+    * @param connectionDefinition list of connection definitions
+    * @param transactionSupport transaction supported form this RA. Valid ones are defined by an enum
+    * @param authenticationMechanism list of authentication mechanism supported
+    * @param reauthenticationSupport not mandatary boolean value
+    * @param id XML ID
+    */
+   public OutboundResourceAdapter(List<ConnectionDefinition> connectionDefinition,
+         TransactionSupportEnum transactionSupport, List<AuthenticationMechanism> authenticationMechanism,
+         Boolean reauthenticationSupport, String id)
+   {
+      super();
+      this.connectionDefinition = connectionDefinition;
+      this.transactionSupport = transactionSupport;
+      this.authenticationMechanism = authenticationMechanism;
+      this.reauthenticationSupport = reauthenticationSupport;
+      this.id = id;
+   }
+
+   /**
+    * @return connectionDefinition
+    */
+   public List<ConnectionDefinition> getConnectionDefinition()
+   {
+      return Collections.unmodifiableList(connectionDefinition);
+   }
+
+   /**
+    * @return transactionSupport
+    */
+   public TransactionSupportEnum getTransactionSupport()
+   {
+      return transactionSupport;
+   }
+
+   /**
+    * @return authenticationMechanism
+    */
+   public List<AuthenticationMechanism> getAuthenticationMechanism()
+   {
+      return Collections.unmodifiableList(authenticationMechanism);
+   }
+
+   /**
+    * @return reauthenticationSupport
+    */
+   public Boolean getReauthenticationSupport()
+   {
+      return reauthenticationSupport;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see IdDecoratedMetadata#getId()
+    */
+   @Override
+   public String getId()
+   {
+      return id;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#hashCode()
+    */
+   @Override
+   public int hashCode()
+   {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + ((authenticationMechanism == null) ? 0 : authenticationMechanism.hashCode());
+      result = prime * result + ((connectionDefinition == null) ? 0 : connectionDefinition.hashCode());
+      result = prime * result + ((id == null) ? 0 : id.hashCode());
+      result = prime * result + ((reauthenticationSupport == null) ? 0 : reauthenticationSupport.hashCode());
+      result = prime * result + ((transactionSupport == null) ? 0 : transactionSupport.hashCode());
+      return result;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#equals(java.lang.Object)
+    */
+   @Override
+   public boolean equals(Object obj)
+   {
+      if (this == obj)
+      {
+         return true;
+      }
+      if (obj == null)
+      {
+         return false;
+      }
+      if (!(obj instanceof OutboundResourceAdapter))
+      {
+         return false;
+      }
+      OutboundResourceAdapter other = (OutboundResourceAdapter) obj;
+      if (authenticationMechanism == null)
+      {
+         if (other.authenticationMechanism != null)
+         {
+            return false;
+         }
+      }
+      else if (!authenticationMechanism.equals(other.authenticationMechanism))
+      {
+         return false;
+      }
+      if (connectionDefinition == null)
+      {
+         if (other.connectionDefinition != null)
+         {
+            return false;
+         }
+      }
+      else if (!connectionDefinition.equals(other.connectionDefinition))
+      {
+         return false;
+      }
+      if (id == null)
+      {
+         if (other.id != null)
+         {
+            return false;
+         }
+      }
+      else if (!id.equals(other.id))
+      {
+         return false;
+      }
+      if (reauthenticationSupport == null)
+      {
+         if (other.reauthenticationSupport != null)
+         {
+            return false;
+         }
+      }
+      else if (!reauthenticationSupport.equals(other.reauthenticationSupport))
+      {
+         return false;
+      }
+      if (transactionSupport != other.transactionSupport)
+      {
+         return false;
+      }
+      return true;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#toString()
+    */
+   @Override
+   public String toString()
+   {
+      return "OutboundResourceAdapter [connectionDefinition=" + connectionDefinition + ", transactionSupport="
+            + transactionSupport + ", authenticationMechanism=" + authenticationMechanism
+            + ", reauthenticationSupport=" + reauthenticationSupport + ", id=" + id + "]";
+   }
+}

Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ResourceAdapter.java (from rev 106884, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/ResourceAdapter.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ResourceAdapter.java	                        (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ResourceAdapter.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -0,0 +1,268 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.common;
+
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
+ *
+ */
+public class ResourceAdapter implements IdDecoratedMetadata
+{
+   /**
+    */
+   private static final long serialVersionUID = 4841095296099713549L;
+
+   private final String resourceadapterClass;
+
+   private final List<? extends ConfigProperty> configProperty;
+
+   private final OutboundResourceAdapter outboundResourceadapter;
+
+   private final InboundResourceAdapter inboundResourceadapter;
+
+   private final List<Adminobject> adminobject;
+
+   private final List<SecurityPermission> securityPermission;
+
+   private final String id;
+
+   /**
+    * @param resourceadapterClass full qualified name of the class
+    * @param configProperty confi properties for this RA
+    * @param outboundResourceadapter outbound RA
+    * @param inboundResourceadapter inbound RA
+    * @param adminobject list of admin objects of this RA
+    * @param securityPermission supported security permissions
+    * @param id XML ID
+    */
+   public ResourceAdapter(String resourceadapterClass, List<? extends ConfigProperty> configProperty,
+         OutboundResourceAdapter outboundResourceadapter, InboundResourceAdapter inboundResourceadapter,
+         List<Adminobject> adminobject, List<SecurityPermission> securityPermission, String id)
+   {
+      super();
+      this.resourceadapterClass = resourceadapterClass;
+      this.configProperty = configProperty;
+      this.outboundResourceadapter = outboundResourceadapter;
+      this.inboundResourceadapter = inboundResourceadapter;
+      this.adminobject = adminobject;
+      this.securityPermission = securityPermission;
+      this.id = id;
+   }
+
+   /**
+    * @return resourceadapterClass
+    */
+   public String getResourceadapterClass()
+   {
+      return resourceadapterClass;
+   }
+
+   /**
+    * @return configProperty
+    */
+   public List<? extends ConfigProperty> getConfigProperty()
+   {
+      return Collections.unmodifiableList(configProperty);
+   }
+
+   /**
+    * @return outboundResourceadapter
+    */
+   public OutboundResourceAdapter getOutboundResourceadapter()
+   {
+      return outboundResourceadapter;
+   }
+
+   /**
+    * @return inboundResourceadapter
+    */
+   public InboundResourceAdapter getInboundResourceadapter()
+   {
+      return inboundResourceadapter;
+   }
+
+   /**
+    * @return adminobject
+    */
+   public List<Adminobject> getAdminobject()
+   {
+      return Collections.unmodifiableList(adminobject);
+   }
+
+   /**
+    * @return securityPermission
+    */
+   public List<SecurityPermission> getSecurityPermission()
+   {
+      return Collections.unmodifiableList(securityPermission);
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see IdDecoratedMetadata#getId()
+    */
+   @Override
+   public String getId()
+   {
+      return id;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#hashCode()
+    */
+   @Override
+   public int hashCode()
+   {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + ((adminobject == null) ? 0 : adminobject.hashCode());
+      result = prime * result + ((configProperty == null) ? 0 : configProperty.hashCode());
+      result = prime * result + ((id == null) ? 0 : id.hashCode());
+      result = prime * result + ((inboundResourceadapter == null) ? 0 : inboundResourceadapter.hashCode());
+      result = prime * result + ((outboundResourceadapter == null) ? 0 : outboundResourceadapter.hashCode());
+      result = prime * result + ((resourceadapterClass == null) ? 0 : resourceadapterClass.hashCode());
+      result = prime * result + ((securityPermission == null) ? 0 : securityPermission.hashCode());
+      return result;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#equals(java.lang.Object)
+    */
+   @Override
+   public boolean equals(Object obj)
+   {
+      if (this == obj)
+      {
+         return true;
+      }
+      if (obj == null)
+      {
+         return false;
+      }
+      if (!(obj instanceof ResourceAdapter))
+      {
+         return false;
+      }
+      ResourceAdapter other = (ResourceAdapter) obj;
+      if (adminobject == null)
+      {
+         if (other.adminobject != null)
+         {
+            return false;
+         }
+      }
+      else if (!adminobject.equals(other.adminobject))
+      {
+         return false;
+      }
+      if (configProperty == null)
+      {
+         if (other.configProperty != null)
+         {
+            return false;
+         }
+      }
+      else if (!configProperty.equals(other.configProperty))
+      {
+         return false;
+      }
+      if (id == null)
+      {
+         if (other.id != null)
+         {
+            return false;
+         }
+      }
+      else if (!id.equals(other.id))
+      {
+         return false;
+      }
+      if (inboundResourceadapter == null)
+      {
+         if (other.inboundResourceadapter != null)
+         {
+            return false;
+         }
+      }
+      else if (!inboundResourceadapter.equals(other.inboundResourceadapter))
+      {
+         return false;
+      }
+      if (outboundResourceadapter == null)
+      {
+         if (other.outboundResourceadapter != null)
+         {
+            return false;
+         }
+      }
+      else if (!outboundResourceadapter.equals(other.outboundResourceadapter))
+      {
+         return false;
+      }
+      if (resourceadapterClass == null)
+      {
+         if (other.resourceadapterClass != null)
+         {
+            return false;
+         }
+      }
+      else if (!resourceadapterClass.equals(other.resourceadapterClass))
+      {
+         return false;
+      }
+      if (securityPermission == null)
+      {
+         if (other.securityPermission != null)
+         {
+            return false;
+         }
+      }
+      else if (!securityPermission.equals(other.securityPermission))
+      {
+         return false;
+      }
+      return true;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#toString()
+    */
+   @Override
+   public String toString()
+   {
+      return "ResourceAdapter [resourceadapterClass=" + resourceadapterClass + ", configProperty=" + configProperty
+            + ", outboundResourceadapter=" + outboundResourceadapter + ", inboundResourceadapter="
+            + inboundResourceadapter + ", adminobject=" + adminobject + ", securityPermission=" + securityPermission
+            + ", id=" + id + "]";
+   }
+}

Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/SecurityPermission.java (from rev 106884, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/SecurityPermission.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/SecurityPermission.java	                        (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/SecurityPermission.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -0,0 +1,168 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.common;
+
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
+ *
+ */
+public class SecurityPermission implements IdDecoratedMetadata
+{
+   /**
+    */
+   private static final long serialVersionUID = -7931009018498254330L;
+
+   private final List<LocalizedXsdString> description;
+
+   private final XsdString securityPermissionSpec;
+
+   private final String id;
+
+   /**
+    * @param description descriptions
+    * @param securityPermissionSpec the security permission spec as defined in the xml
+    * @param id XML ID
+    */
+   public SecurityPermission(List<LocalizedXsdString> description, XsdString securityPermissionSpec, String id)
+   {
+      super();
+      this.description = description;
+      this.securityPermissionSpec = securityPermissionSpec;
+      this.id = id;
+   }
+
+   /**
+    * @return description
+    */
+   public List<LocalizedXsdString> getDescription()
+   {
+      return Collections.unmodifiableList(description);
+   }
+
+   /**
+    * @return securityPermissionSpec
+    */
+   public XsdString getSecurityPermissionSpec()
+   {
+      return securityPermissionSpec;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see IdDecoratedMetadata#getId()
+    */
+   @Override
+   public String getId()
+   {
+      return id;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#hashCode()
+    */
+   @Override
+   public int hashCode()
+   {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + ((description == null) ? 0 : description.hashCode());
+      result = prime * result + ((id == null) ? 0 : id.hashCode());
+      result = prime * result + ((securityPermissionSpec == null) ? 0 : securityPermissionSpec.hashCode());
+      return result;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#equals(java.lang.Object)
+    */
+   @Override
+   public boolean equals(Object obj)
+   {
+      if (this == obj)
+      {
+         return true;
+      }
+      if (obj == null)
+      {
+         return false;
+      }
+      if (!(obj instanceof SecurityPermission))
+      {
+         return false;
+      }
+      SecurityPermission other = (SecurityPermission) obj;
+      if (description == null)
+      {
+         if (other.description != null)
+         {
+            return false;
+         }
+      }
+      else if (!description.equals(other.description))
+      {
+         return false;
+      }
+      if (id == null)
+      {
+         if (other.id != null)
+         {
+            return false;
+         }
+      }
+      else if (!id.equals(other.id))
+      {
+         return false;
+      }
+      if (securityPermissionSpec == null)
+      {
+         if (other.securityPermissionSpec != null)
+         {
+            return false;
+         }
+      }
+      else if (!securityPermissionSpec.equals(other.securityPermissionSpec))
+      {
+         return false;
+      }
+      return true;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#toString()
+    */
+   @Override
+   public String toString()
+   {
+      return "SecurityPermission [description=" + description + ", securityPermissionSpec=" + securityPermissionSpec
+            + ", id=" + id + "]";
+   }
+}

Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/TransactionSupportEnum.java (from rev 106884, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/TransactionSupportEnum.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/TransactionSupportEnum.java	                        (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/TransactionSupportEnum.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.common;
+
+/**
+ * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
+ *
+ */
+public enum TransactionSupportEnum
+{
+   /**
+    * NoTransaction
+    */
+   NoTransaction,
+   /**
+    * LocalTransaction
+    */
+   LocalTransaction,
+   /**
+    * XATransaction
+    */
+   XATransaction;
+
+}

Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/XsdString.java (from rev 106884, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/XsdString.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/XsdString.java	                        (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/XsdString.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -0,0 +1,147 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.common;
+
+
+/**
+ * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
+ *
+ */
+public class XsdString implements IdDecoratedMetadata
+{
+   /**
+    */
+   private static final long serialVersionUID = -3045754045828271173L;
+
+   /**
+    * the actual String value
+    */
+   protected final String value;
+
+   /**
+    * XML ID
+    */
+   protected final String id;
+
+   /**
+    * @param value the actual String value
+    * @param id XML ID
+    */
+   public XsdString(String value, String id)
+   {
+      super();
+      this.value = value;
+      this.id = id;
+   }
+
+   /**
+    * @return value
+    */
+   public String getValue()
+   {
+      return value;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see IdDecoratedMetadata#getId()
+    */
+   @Override
+   public String getId()
+   {
+      return id;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#hashCode()
+    */
+   @Override
+   public int hashCode()
+   {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + ((id == null) ? 0 : id.hashCode());
+      result = prime * result + ((value == null) ? 0 : value.hashCode());
+      return result;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#equals(java.lang.Object)
+    */
+   @Override
+   public boolean equals(Object obj)
+   {
+      if (this == obj)
+      {
+         return true;
+      }
+      if (obj == null)
+      {
+         return false;
+      }
+      if (!(obj instanceof XsdString))
+      {
+         return false;
+      }
+      XsdString other = (XsdString) obj;
+      if (id == null)
+      {
+         if (other.id != null)
+         {
+            return false;
+         }
+      }
+      else if (!id.equals(other.id))
+      {
+         return false;
+      }
+      if (value == null)
+      {
+         if (other.value != null)
+         {
+            return false;
+         }
+      }
+      else if (!value.equals(other.value))
+      {
+         return false;
+      }
+      return true;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#toString()
+    */
+   @Override
+   public String toString()
+   {
+      return "XsdString [value=" + value + ", id=" + id + "]";
+   }
+
+}

Added: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/package.html
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/package.html	                        (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/package.html	2010-07-20 13:09:00 UTC (rev 106915)
@@ -0,0 +1,3 @@
+<body>
+This package contains metadatas common for connector-*.xsd
+</body>

Added: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/Connector10.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/Connector10.java	                        (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/Connector10.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -0,0 +1,210 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.ra10;
+
+import org.jboss.jca.common.metadata.ra.common.Connector;
+import org.jboss.jca.common.metadata.ra.common.LicenseType;
+import org.jboss.jca.common.metadata.ra.common.LocalizedXsdString;
+import org.jboss.jca.common.metadata.ra.common.ResourceAdapter;
+import org.jboss.jca.common.metadata.ra.common.XsdString;
+import org.jboss.jca.common.metadata.ra.ra16.Icon;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
+ *
+ */
+public final class Connector10 extends Connector
+{
+
+   /**
+    */
+   private static final long serialVersionUID = -6095735191032372517L;
+
+   private final String moduleName;
+
+   private final List<LocalizedXsdString> description;
+
+   private final XsdString displayName;
+
+   private final String version = "1.0";
+
+   private final String specVersion = "1.0";
+
+   private final List<Icon> icon;
+
+   /**
+    * @param moduleName name of the module
+    * @param description descriptions of this connector
+    * @param displayName name to display for this connecotro
+    * @param icon icon representing this connectore
+    * @param vendorName vendor name
+    * @param eisType eis type
+    * @param resourceadapterVersion version number for the RA
+    * @param license license information
+    * @param resourceadapter full qualified name of the resource adapter
+    * @param id XML ID
+    */
+   public Connector10(String moduleName, List<LocalizedXsdString> description, XsdString displayName, List<Icon> icon,
+         XsdString vendorName, XsdString eisType, XsdString resourceadapterVersion, LicenseType license,
+         ResourceAdapter resourceadapter, String id)
+   {
+      super(vendorName, eisType, license, resourceadapter, id);
+      this.moduleName = moduleName;
+      this.description = description;
+      this.displayName = displayName;
+      this.icon = icon;
+   }
+
+   /**
+    * @return moduleName
+    */
+   public String getModuleName()
+   {
+      return moduleName;
+   }
+
+   /**
+    * @return description
+    */
+   public List<LocalizedXsdString> getDescription()
+   {
+      return Collections.unmodifiableList(description);
+   }
+
+   /**
+    * @return displayName
+    */
+   public XsdString getDisplayName()
+   {
+      return displayName;
+   }
+
+   /**
+    * @return icon
+    */
+   public List<Icon> getIcon()
+   {
+      return Collections.unmodifiableList(icon);
+   }
+
+   /**
+    * Get the version.
+    *
+    * @return the version.
+    */
+   @Override
+   public String getVersion()
+   {
+      return version;
+   }
+
+   /**
+    * Get the specVersion.
+    *
+    * @return the specVersion.
+    */
+   public String getSpecVersion()
+   {
+      return specVersion;
+   }
+
+   @Override
+   public int hashCode()
+   {
+      final int prime = 31;
+      int result = super.hashCode();
+      result = prime * result + ((description == null) ? 0 : description.hashCode());
+      result = prime * result + ((displayName == null) ? 0 : displayName.hashCode());
+      result = prime * result + ((icon == null) ? 0 : icon.hashCode());
+      result = prime * result + ((moduleName == null) ? 0 : moduleName.hashCode());
+      result = prime * result + ((specVersion == null) ? 0 : specVersion.hashCode());
+      result = prime * result + ((version == null) ? 0 : version.hashCode());
+      return result;
+   }
+
+   @Override
+   public boolean equals(Object obj)
+   {
+      if (this == obj)
+         return true;
+      if (!super.equals(obj))
+         return false;
+      if (!(obj instanceof Connector10))
+         return false;
+      Connector10 other = (Connector10) obj;
+      if (description == null)
+      {
+         if (other.description != null)
+            return false;
+      }
+      else if (!description.equals(other.description))
+         return false;
+      if (displayName == null)
+      {
+         if (other.displayName != null)
+            return false;
+      }
+      else if (!displayName.equals(other.displayName))
+         return false;
+      if (icon == null)
+      {
+         if (other.icon != null)
+            return false;
+      }
+      else if (!icon.equals(other.icon))
+         return false;
+      if (moduleName == null)
+      {
+         if (other.moduleName != null)
+            return false;
+      }
+      else if (!moduleName.equals(other.moduleName))
+         return false;
+      if (specVersion == null)
+      {
+         if (other.specVersion != null)
+            return false;
+      }
+      else if (!specVersion.equals(other.specVersion))
+         return false;
+      if (version == null)
+      {
+         if (other.version != null)
+            return false;
+      }
+      else if (!version.equals(other.version))
+         return false;
+      return true;
+   }
+
+   @Override
+   public String toString()
+   {
+      return "Connector10 [moduleName=" + moduleName + ", description=" + description + ", displayName=" + displayName
+            + ", version=" + version + ", specVersion=" + specVersion + ", icon=" + icon + ", vendorName=" + vendorName
+            + ", eisType=" + eisType + ", license=" + license + ", resourceadapter=" + resourceadapter + ", id=" + id
+            + "]";
+   }
+}

Added: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/ResourceAdapter10.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/ResourceAdapter10.java	                        (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/ResourceAdapter10.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -0,0 +1,330 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.ra10;
+
+import org.jboss.jca.common.metadata.ra.common.AuthenticationMechanism;
+import org.jboss.jca.common.metadata.ra.common.ConfigProperty;
+import org.jboss.jca.common.metadata.ra.common.IdDecoratedMetadata;
+import org.jboss.jca.common.metadata.ra.common.SecurityPermission;
+import org.jboss.jca.common.metadata.ra.common.TransactionSupportEnum;
+import org.jboss.jca.common.metadata.ra.common.XsdString;
+
+import java.util.List;
+
+/**
+ * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
+ *
+ */
+public class ResourceAdapter10 implements IdDecoratedMetadata
+{
+
+
+   /** The serialVersionUID */
+   private static final long serialVersionUID = 6841574517370539456L;
+
+   private final XsdString managedConnectionFactoryClass;
+
+   private final XsdString connectionFactoryInterface;
+
+   private final XsdString connectionFactoryImplClass;
+
+   private final XsdString connectionInterface;
+
+   private final XsdString connectionImplClass;
+
+   private final TransactionSupportEnum transactionSupport;
+
+   private final List<AuthenticationMechanism> authenticationMechanism;
+
+   private final List<ConfigProperty> configProperties;
+
+   private final Boolean reauthenticationSupport;
+
+   private final List<SecurityPermission> securityPermission;
+
+   private final String id;
+
+   /**
+    *
+    * Create a new ResourceAdapter10.
+    *
+    * @param managedConnectionFactoryClass class name
+    * @param connectionFactoryInterface interface name
+    * @param connectionFactoryImplClass class name
+    * @param connectionInterface interface name
+    * @param connectionImplClass class name
+    * @param transactionSupport how transactions are supported
+    * @param authenticationMechanism how authentication is performed
+    * @param configProperties list of configs
+    * @param reauthenticationSupport true if reautentication is supported
+    * @param securityPermission what security permissions are supported
+    * @param id the id attribute in xml file
+    */
+   public ResourceAdapter10(XsdString managedConnectionFactoryClass, XsdString connectionFactoryInterface,
+         XsdString connectionFactoryImplClass, XsdString connectionInterface, XsdString connectionImplClass,
+         TransactionSupportEnum transactionSupport, List<AuthenticationMechanism> authenticationMechanism,
+         List<ConfigProperty> configProperties, Boolean reauthenticationSupport,
+         List<SecurityPermission> securityPermission, String id)
+   {
+      super();
+      this.managedConnectionFactoryClass = managedConnectionFactoryClass;
+      this.connectionFactoryInterface = connectionFactoryInterface;
+      this.connectionFactoryImplClass = connectionFactoryImplClass;
+      this.connectionInterface = connectionInterface;
+      this.connectionImplClass = connectionImplClass;
+      this.transactionSupport = transactionSupport;
+      this.authenticationMechanism = authenticationMechanism;
+      this.configProperties = configProperties;
+      this.reauthenticationSupport = reauthenticationSupport;
+      this.securityPermission = securityPermission;
+      this.id = id;
+   }
+
+   /**
+    * Get the managedConnectionFactoryClass.
+    *
+    * @return the managedConnectionFactoryClass.
+    */
+   public XsdString getManagedConnectionFactoryClass()
+   {
+      return managedConnectionFactoryClass;
+   }
+
+   /**
+    * Get the connectionFactoryInterface.
+    *
+    * @return the connectionFactoryInterface.
+    */
+   public XsdString getConnectionFactoryInterface()
+   {
+      return connectionFactoryInterface;
+   }
+
+   /**
+    * Get the connectionFactoryImplClass.
+    *
+    * @return the connectionFactoryImplClass.
+    */
+   public XsdString getConnectionFactoryImplClass()
+   {
+      return connectionFactoryImplClass;
+   }
+
+   /**
+    * Get the connectionInterface.
+    *
+    * @return the connectionInterface.
+    */
+   public XsdString getConnectionInterface()
+   {
+      return connectionInterface;
+   }
+
+   /**
+    * Get the connectionImplClass.
+    *
+    * @return the connectionImplClass.
+    */
+   public XsdString getConnectionImplClass()
+   {
+      return connectionImplClass;
+   }
+
+   /**
+    * Get the transactionSupport.
+    *
+    * @return the transactionSupport.
+    */
+   public TransactionSupportEnum getTransactionSupport()
+   {
+      return transactionSupport;
+   }
+
+   /**
+    * Get the authenticationMechanism.
+    *
+    * @return the authenticationMechanism.
+    */
+   public List<AuthenticationMechanism> getAuthenticationMechanism()
+   {
+      return authenticationMechanism;
+   }
+
+   /**
+    * Get the configProperties.
+    *
+    * @return the configProperties.
+    */
+   public List<ConfigProperty> getConfigProperties()
+   {
+      return configProperties;
+   }
+
+   /**
+    * Get the reauthenticationSupport.
+    *
+    * @return the reauthenticationSupport.
+    */
+   public Boolean getReauthenticationSupport()
+   {
+      return reauthenticationSupport;
+   }
+
+   /**
+    * Get the securityPermission.
+    *
+    * @return the securityPermission.
+    */
+   public List<SecurityPermission> getSecurityPermission()
+   {
+      return securityPermission;
+   }
+
+   /**
+    * Get the id.
+    *
+    * @return the id.
+    */
+   @Override
+   public String getId()
+   {
+      return id;
+   }
+
+   @Override
+   public int hashCode()
+   {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + ((authenticationMechanism == null) ? 0 : authenticationMechanism.hashCode());
+      result = prime * result + ((configProperties == null) ? 0 : configProperties.hashCode());
+      result = prime * result + ((connectionFactoryImplClass == null) ? 0 : connectionFactoryImplClass.hashCode());
+      result = prime * result + ((connectionFactoryInterface == null) ? 0 : connectionFactoryInterface.hashCode());
+      result = prime * result + ((connectionImplClass == null) ? 0 : connectionImplClass.hashCode());
+      result = prime * result + ((connectionInterface == null) ? 0 : connectionInterface.hashCode());
+      result = prime * result + ((id == null) ? 0 : id.hashCode());
+      result = prime * result
+            + ((managedConnectionFactoryClass == null) ? 0 : managedConnectionFactoryClass.hashCode());
+      result = prime * result + ((reauthenticationSupport == null) ? 0 : reauthenticationSupport.hashCode());
+      result = prime * result + ((securityPermission == null) ? 0 : securityPermission.hashCode());
+      result = prime * result + ((transactionSupport == null) ? 0 : transactionSupport.hashCode());
+      return result;
+   }
+
+   @Override
+   public boolean equals(Object obj)
+   {
+      if (this == obj)
+         return true;
+      if (obj == null)
+         return false;
+      if (!(obj instanceof ResourceAdapter10))
+         return false;
+      ResourceAdapter10 other = (ResourceAdapter10) obj;
+      if (authenticationMechanism == null)
+      {
+         if (other.authenticationMechanism != null)
+            return false;
+      }
+      else if (!authenticationMechanism.equals(other.authenticationMechanism))
+         return false;
+      if (configProperties == null)
+      {
+         if (other.configProperties != null)
+            return false;
+      }
+      else if (!configProperties.equals(other.configProperties))
+         return false;
+      if (connectionFactoryImplClass == null)
+      {
+         if (other.connectionFactoryImplClass != null)
+            return false;
+      }
+      else if (!connectionFactoryImplClass.equals(other.connectionFactoryImplClass))
+         return false;
+      if (connectionFactoryInterface == null)
+      {
+         if (other.connectionFactoryInterface != null)
+            return false;
+      }
+      else if (!connectionFactoryInterface.equals(other.connectionFactoryInterface))
+         return false;
+      if (connectionImplClass == null)
+      {
+         if (other.connectionImplClass != null)
+            return false;
+      }
+      else if (!connectionImplClass.equals(other.connectionImplClass))
+         return false;
+      if (connectionInterface == null)
+      {
+         if (other.connectionInterface != null)
+            return false;
+      }
+      else if (!connectionInterface.equals(other.connectionInterface))
+         return false;
+      if (id == null)
+      {
+         if (other.id != null)
+            return false;
+      }
+      else if (!id.equals(other.id))
+         return false;
+      if (managedConnectionFactoryClass == null)
+      {
+         if (other.managedConnectionFactoryClass != null)
+            return false;
+      }
+      else if (!managedConnectionFactoryClass.equals(other.managedConnectionFactoryClass))
+         return false;
+      if (reauthenticationSupport == null)
+      {
+         if (other.reauthenticationSupport != null)
+            return false;
+      }
+      else if (!reauthenticationSupport.equals(other.reauthenticationSupport))
+         return false;
+      if (securityPermission == null)
+      {
+         if (other.securityPermission != null)
+            return false;
+      }
+      else if (!securityPermission.equals(other.securityPermission))
+         return false;
+      if (transactionSupport != other.transactionSupport)
+         return false;
+      return true;
+   }
+
+   @Override
+   public String toString()
+   {
+      return "ResourceAdapter10 [managedConnectionFactoryClass=" + managedConnectionFactoryClass
+            + ", connectionFactoryInterface=" + connectionFactoryInterface + ", connectionFactoryImplClass="
+            + connectionFactoryImplClass + ", connectionInterface=" + connectionInterface + ", connectionImplClass="
+            + connectionImplClass + ", transactionSupport=" + transactionSupport + ", authenticationMechanism="
+            + authenticationMechanism + ", configProperties=" + configProperties + ", reauthenticationSupport="
+            + reauthenticationSupport + ", securityPermission=" + securityPermission + ", id=" + id + "]";
+   }
+
+
+}

Added: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/package.html
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/package.html	                        (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/package.html	2010-07-20 13:09:00 UTC (rev 106915)
@@ -0,0 +1,3 @@
+<body>
+This package contains metadatas for connector-1.0.dtd
+</body>

Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Activationspec15.java (from rev 106884, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Activationspec.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Activationspec15.java	                        (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Activationspec15.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -0,0 +1,188 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.ra15;
+
+import org.jboss.jca.common.metadata.ra.common.IdDecoratedMetadata;
+import org.jboss.jca.common.metadata.ra.ra16.Activationspec16;
+import org.jboss.jca.common.metadata.ra.ra16.RequiredConfigProperty;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ *
+ * A Activationspec15.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+public class Activationspec15 implements IdDecoratedMetadata
+{
+
+   /** The serialVersionUID */
+   private static final long serialVersionUID = -342663654303158977L;
+
+   /**
+    * activationspec class name
+    */
+   protected final String activationspecClass;
+
+   /**
+    * list of required properties
+    */
+   protected final List<RequiredConfigProperty> requiredConfigProperty;
+
+   /**
+    * id attribute in xml file
+    */
+   protected final String id;
+
+   /**
+    *
+    * Create a new Activationspec15.
+    *
+    * @param activationspecClass activation spec class name
+    * @param requiredConfigProperty list of required property
+    * @param id id attribute of xml file
+    */
+   public Activationspec15(String activationspecClass, List<RequiredConfigProperty> requiredConfigProperty, String id)
+   {
+      super();
+      this.activationspecClass = activationspecClass;
+      this.requiredConfigProperty = requiredConfigProperty;
+      this.id = id;
+   }
+
+   /**
+    * @return activationspecClass
+    */
+   public String getActivationspecClass()
+   {
+      return activationspecClass;
+   }
+
+   /**
+    * @return requiredConfigProperty
+    */
+   public List<RequiredConfigProperty> getRequiredConfigProperty()
+   {
+      return Collections.unmodifiableList(requiredConfigProperty);
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see IdDecoratedMetadata#getId()
+    */
+   @Override
+   public String getId()
+   {
+      return id;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#hashCode()
+    */
+   @Override
+   public int hashCode()
+   {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + ((activationspecClass == null) ? 0 : activationspecClass.hashCode());
+      result = prime * result + ((id == null) ? 0 : id.hashCode());
+      result = prime * result + ((requiredConfigProperty == null) ? 0 : requiredConfigProperty.hashCode());
+      return result;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#equals(java.lang.Object)
+    */
+   @Override
+   public boolean equals(Object obj)
+   {
+      if (this == obj)
+      {
+         return true;
+      }
+      if (obj == null)
+      {
+         return false;
+      }
+      if (!(obj instanceof Activationspec16))
+      {
+         return false;
+      }
+      Activationspec16 other = (Activationspec16) obj;
+      if (activationspecClass == null)
+      {
+         if (other.activationspecClass != null)
+         {
+            return false;
+         }
+      }
+      else if (!activationspecClass.equals(other.activationspecClass))
+      {
+         return false;
+      }
+
+      if (id == null)
+      {
+         if (other.id != null)
+         {
+            return false;
+         }
+      }
+      else if (!id.equals(other.id))
+      {
+         return false;
+      }
+      if (requiredConfigProperty == null)
+      {
+         if (other.requiredConfigProperty != null)
+         {
+            return false;
+         }
+      }
+      else if (!requiredConfigProperty.equals(other.requiredConfigProperty))
+      {
+         return false;
+      }
+      return true;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#toString()
+    */
+   @Override
+   public String toString()
+   {
+      return "Activationspec [activationspecClass=" + activationspecClass + ", requiredConfigProperty="
+            + requiredConfigProperty + ", id=" + id + "]";
+   }
+
+}

Added: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Connector15.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Connector15.java	                        (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Connector15.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -0,0 +1,127 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.ra15;
+
+import org.jboss.jca.common.metadata.ra.common.Connector;
+import org.jboss.jca.common.metadata.ra.common.LicenseType;
+import org.jboss.jca.common.metadata.ra.common.ResourceAdapter;
+import org.jboss.jca.common.metadata.ra.common.XsdString;
+
+/**
+ *
+ * A Connector15.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+public class Connector15 extends Connector
+{
+
+   /** The serialVersionUID */
+   private static final long serialVersionUID = 531372312218060928L;
+
+   private final String version = "1.5";
+
+   /**
+    * the resource adapter version
+    */
+   protected final XsdString resourceadapterVersion;
+
+   /**
+    * @param vendorName vendor name
+    * @param eisType eis type
+    * @param resourceadapterVersion version number for the RA
+    * @param license license information
+    * @param resourceadapter full qualified name of the resource adapter
+    * @param id XML ID
+    */
+   public Connector15(XsdString vendorName, XsdString eisType, XsdString resourceadapterVersion,
+         LicenseType license, ResourceAdapter resourceadapter, String id)
+   {
+      super(vendorName, eisType, license, resourceadapter, id);
+      this.resourceadapterVersion = resourceadapterVersion;
+   }
+
+   /**
+    * @return resourceadapterVersion
+    */
+   public XsdString getResourceadapterVersion()
+   {
+      return resourceadapterVersion;
+   }
+
+   /**
+    * Get the version.
+    *
+    * @return the version.
+    */
+   @Override
+   public String getVersion()
+   {
+      return version;
+   }
+
+   @Override
+   public int hashCode()
+   {
+      final int prime = 31;
+      int result = super.hashCode();
+      result = prime * result + ((resourceadapterVersion == null) ? 0 : resourceadapterVersion.hashCode());
+      result = prime * result + ((version == null) ? 0 : version.hashCode());
+      return result;
+   }
+
+   @Override
+   public boolean equals(Object obj)
+   {
+      if (this == obj)
+         return true;
+      if (!super.equals(obj))
+         return false;
+      if (!(obj instanceof Connector15))
+         return false;
+      Connector15 other = (Connector15) obj;
+      if (resourceadapterVersion == null)
+      {
+         if (other.resourceadapterVersion != null)
+            return false;
+      }
+      else if (!resourceadapterVersion.equals(other.resourceadapterVersion))
+         return false;
+      if (version == null)
+      {
+         if (other.version != null)
+            return false;
+      }
+      else if (!version.equals(other.version))
+         return false;
+      return true;
+   }
+
+   @Override
+   public String toString()
+   {
+      return "Connector15 [version=" + version + ", resourceadapterVersion=" + resourceadapterVersion + ", vendorName="
+            + vendorName + ", eisType=" + eisType + ", license=" + license + ", resourceadapter=" + resourceadapter
+            + ", id=" + id + "]";
+   }
+}

Added: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/package.html
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/package.html	                        (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/package.html	2010-07-20 13:09:00 UTC (rev 106915)
@@ -0,0 +1,3 @@
+<body>
+This package contains metadatas for connector-1.5.xsd
+</body>

Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Activationspec.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Activationspec.java	2010-07-20 11:49:54 UTC (rev 106914)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Activationspec.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -1,193 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.ra16;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
- *
- */
-public class Activationspec implements IdDecoratedMetadata
-{
-   /**
-    */
-   private static final long serialVersionUID = -6951903183562100136L;
-
-   private final String activationspecClass;
-
-   private final List<RequiredConfigProperty> requiredConfigProperty;
-
-   private final List<ConfigProperty> configProperty;
-
-   private final String id;
-
-   /**
-    * @param activationspecClass full qualified name of the class
-    * @param requiredConfigProperty a List of required config properties
-    * @param configProperty a list of (optional) config property
-    * @param id xmlID
-    */
-   public Activationspec(String activationspecClass, List<RequiredConfigProperty> requiredConfigProperty,
-         List<ConfigProperty> configProperty, String id)
-   {
-      super();
-      this.activationspecClass = activationspecClass;
-      this.requiredConfigProperty = requiredConfigProperty;
-      this.configProperty = configProperty;
-      this.id = id;
-   }
-
-   /**
-    * @return activationspecClass
-    */
-   public String getActivationspecClass()
-   {
-      return activationspecClass;
-   }
-
-   /**
-    * @return requiredConfigProperty
-    */
-   public List<RequiredConfigProperty> getRequiredConfigProperty()
-   {
-      return Collections.unmodifiableList(requiredConfigProperty);
-   }
-
-   /**
-    * @return configProperty
-    */
-   public List<ConfigProperty> getConfigProperty()
-   {
-      return Collections.unmodifiableList(configProperty);
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see IdDecoratedMetadata#getId()
-    */
-   @Override
-   public String getId()
-   {
-      return id;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#hashCode()
-    */
-   @Override
-   public int hashCode()
-   {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + ((activationspecClass == null) ? 0 : activationspecClass.hashCode());
-      result = prime * result + ((configProperty == null) ? 0 : configProperty.hashCode());
-      result = prime * result + ((id == null) ? 0 : id.hashCode());
-      result = prime * result + ((requiredConfigProperty == null) ? 0 : requiredConfigProperty.hashCode());
-      return result;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#equals(java.lang.Object)
-    */
-   @Override
-   public boolean equals(Object obj)
-   {
-      if (this == obj)
-      {
-         return true;
-      }
-      if (obj == null)
-      {
-         return false;
-      }
-      if (!(obj instanceof Activationspec))
-      {
-         return false;
-      }
-      Activationspec other = (Activationspec) obj;
-      if (activationspecClass == null)
-      {
-         if (other.activationspecClass != null)
-         {
-            return false;
-         }
-      }
-      else if (!activationspecClass.equals(other.activationspecClass))
-      {
-         return false;
-      }
-      if (configProperty == null)
-      {
-         if (other.configProperty != null)
-         {
-            return false;
-         }
-      }
-      else if (!configProperty.equals(other.configProperty))
-      {
-         return false;
-      }
-      if (id == null)
-      {
-         if (other.id != null)
-         {
-            return false;
-         }
-      }
-      else if (!id.equals(other.id))
-      {
-         return false;
-      }
-      if (requiredConfigProperty == null)
-      {
-         if (other.requiredConfigProperty != null)
-         {
-            return false;
-         }
-      }
-      else if (!requiredConfigProperty.equals(other.requiredConfigProperty))
-      {
-         return false;
-      }
-      return true;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#toString()
-    */
-   @Override
-   public String toString()
-   {
-      return "Activationspec [activationspecClass=" + activationspecClass + ", requiredConfigProperty="
-            + requiredConfigProperty + ", configProperty=" + configProperty + ", id=" + id + "]";
-   }
-
-}

Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Activationspec16.java (from rev 106884, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/LocalizedXsdString.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Activationspec16.java	                        (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Activationspec16.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -0,0 +1,98 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.ra16;
+
+import org.jboss.jca.common.metadata.ra.ra15.Activationspec15;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
+ *
+ */
+public class Activationspec16 extends Activationspec15
+{
+   /**
+    */
+   private static final long serialVersionUID = -6951903183562100136L;
+
+   private final List<ConfigProperty16> configProperty;
+
+   /**
+    * @param activationspecClass full qualified name of the class
+    * @param requiredConfigProperty a List of required config properties
+    * @param configProperty a list of (optional) config property
+    * @param id xmlID
+    */
+   public Activationspec16(String activationspecClass, List<RequiredConfigProperty> requiredConfigProperty,
+         List<ConfigProperty16> configProperty, String id)
+   {
+      super(activationspecClass, requiredConfigProperty, id);
+      this.configProperty = configProperty;
+   }
+
+   /**
+    * @return configProperty
+    */
+   public List<ConfigProperty16> getConfigProperty()
+   {
+      return Collections.unmodifiableList(configProperty);
+   }
+
+   @Override
+   public int hashCode()
+   {
+      final int prime = 31;
+      int result = super.hashCode();
+      result = prime * result + ((configProperty == null) ? 0 : configProperty.hashCode());
+      return result;
+   }
+
+   @Override
+   public boolean equals(Object obj)
+   {
+      if (this == obj)
+         return true;
+      if (!super.equals(obj))
+         return false;
+      if (!(obj instanceof Activationspec16))
+         return false;
+      Activationspec16 other = (Activationspec16) obj;
+      if (configProperty == null)
+      {
+         if (other.configProperty != null)
+            return false;
+      }
+      else if (!configProperty.equals(other.configProperty))
+         return false;
+      return true;
+   }
+
+   @Override
+   public String toString()
+   {
+      return "Activationspec [configProperty=" + configProperty + ", activationspecClass=" + activationspecClass
+            + ", requiredConfigProperty=" + requiredConfigProperty + ", id=" + id + "]";
+   }
+
+}

Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Adminobject.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Adminobject.java	2010-07-20 11:49:54 UTC (rev 106914)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Adminobject.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -1,193 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.ra16;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
- *
- */
-public class Adminobject implements IdDecoratedMetadata
-{
-   /**
-     */
-   private static final long serialVersionUID = -7653991400977178783L;
-
-   private final String adminobjectInterface;
-
-   private final String adminobjectClass;
-
-   private final List<ConfigProperty> configProperty;
-
-   private final String id;
-
-   /**
-    * @param adminobjectInterface full qualified name of the interface
-    * @param adminobjectClass full qualified name of the implementation class
-    * @param configProperty List of config propeties
-    * @param id xmlid
-    */
-   public Adminobject(final String adminobjectInterface, final String adminobjectClass,
-         final List<ConfigProperty> configProperty, final String id)
-   {
-      super();
-      this.adminobjectInterface = adminobjectInterface;
-      this.adminobjectClass = adminobjectClass;
-      this.configProperty = configProperty;
-      this.id = id;
-   }
-
-   /**
-    * @return adminobjectInterface
-    */
-   public String getAdminobjectInterface()
-   {
-      return adminobjectInterface;
-   }
-
-   /**
-    * @return adminobjectClass
-    */
-   public String getAdminobjectClass()
-   {
-      return adminobjectClass;
-   }
-
-   /**
-    * @return configProperty
-    */
-   public List<ConfigProperty> getConfigProperty()
-   {
-      return Collections.unmodifiableList(configProperty);
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see IdDecoratedMetadata#getId()
-    */
-   @Override
-   public String getId()
-   {
-      return id;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#hashCode()
-    */
-   @Override
-   public int hashCode()
-   {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + ((adminobjectClass == null) ? 0 : adminobjectClass.hashCode());
-      result = prime * result + ((adminobjectInterface == null) ? 0 : adminobjectInterface.hashCode());
-      result = prime * result + ((configProperty == null) ? 0 : configProperty.hashCode());
-      result = prime * result + ((id == null) ? 0 : id.hashCode());
-      return result;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#equals(java.lang.Object)
-    */
-   @Override
-   public boolean equals(final Object obj)
-   {
-      if (this == obj)
-      {
-         return true;
-      }
-      if (obj == null)
-      {
-         return false;
-      }
-      if (!(obj instanceof Adminobject))
-      {
-         return false;
-      }
-      final Adminobject other = (Adminobject) obj;
-      if (adminobjectClass == null)
-      {
-         if (other.adminobjectClass != null)
-         {
-            return false;
-         }
-      }
-      else if (!adminobjectClass.equals(other.adminobjectClass))
-      {
-         return false;
-      }
-      if (adminobjectInterface == null)
-      {
-         if (other.adminobjectInterface != null)
-         {
-            return false;
-         }
-      }
-      else if (!adminobjectInterface.equals(other.adminobjectInterface))
-      {
-         return false;
-      }
-      if (configProperty == null)
-      {
-         if (other.configProperty != null)
-         {
-            return false;
-         }
-      }
-      else if (!configProperty.equals(other.configProperty))
-      {
-         return false;
-      }
-      if (id == null)
-      {
-         if (other.id != null)
-         {
-            return false;
-         }
-      }
-      else if (!id.equals(other.id))
-      {
-         return false;
-      }
-      return true;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#toString()
-    */
-   @Override
-   public String toString()
-   {
-      return "Adminobject [adminobjectInterface=" + adminobjectInterface + ", adminobjectClass=" + adminobjectClass
-            + ", configProperty=" + configProperty + ", id=" + id + "]";
-   }
-
-}

Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/AuthenticationMechanism.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/AuthenticationMechanism.java	2010-07-20 11:49:54 UTC (rev 106914)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/AuthenticationMechanism.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -1,195 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.ra16;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
- *
- */
-public class AuthenticationMechanism implements IdDecoratedMetadata
-{
-   /**
-    */
-   private static final long serialVersionUID = -1448136517857827148L;
-
-   private final List<LocalizedXsdString> description;
-
-   private final XsdString authenticationMechanismType;
-
-   private final CredentialInterfaceEnum credentialInterface;
-
-   private final String id;
-
-   /**
-    * @param description description attribute in xml
-    * @param authenticationMechanismType specifies type of an authentication mechanism.
-            The example values are:
-
-            <authentication-mechanism-type>BasicPassword
-            </authentication-mechanism-type>
-
-            <authentication-mechanism-type>Kerbv5
-            </authentication-mechanism-type>
-
-            Any additional security mechanisms are outside the
-            scope of the Connector architecture specification.
-    * @param credentialInterface enumeration representing credentialInterface.
-    * @param id xml ID
-    */
-   public AuthenticationMechanism(List<LocalizedXsdString> description, XsdString authenticationMechanismType,
-         CredentialInterfaceEnum credentialInterface, String id)
-   {
-      super();
-      this.description = description;
-      this.authenticationMechanismType = authenticationMechanismType;
-      this.credentialInterface = credentialInterface;
-      this.id = id;
-   }
-
-   /**
-    * @return description
-    */
-   public List<LocalizedXsdString> getDescription()
-   {
-      return Collections.unmodifiableList(description);
-   }
-
-   /**
-    * @return authenticationMechanismType
-    */
-   public XsdString getAuthenticationMechanismType()
-   {
-      return authenticationMechanismType;
-   }
-
-   /**
-    * @return credentialInterface
-    */
-   public CredentialInterfaceEnum getCredentialInterface()
-   {
-      return credentialInterface;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see IdDecoratedMetadata#getId()
-    */
-   @Override
-   public String getId()
-   {
-      return id;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#hashCode()
-    */
-   @Override
-   public int hashCode()
-   {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + ((authenticationMechanismType == null) ? 0 : authenticationMechanismType.hashCode());
-      result = prime * result + ((credentialInterface == null) ? 0 : credentialInterface.hashCode());
-      result = prime * result + ((description == null) ? 0 : description.hashCode());
-      result = prime * result + ((id == null) ? 0 : id.hashCode());
-      return result;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#equals(java.lang.Object)
-    */
-   @Override
-   public boolean equals(Object obj)
-   {
-      if (this == obj)
-      {
-         return true;
-      }
-      if (obj == null)
-      {
-         return false;
-      }
-      if (!(obj instanceof AuthenticationMechanism))
-      {
-         return false;
-      }
-      AuthenticationMechanism other = (AuthenticationMechanism) obj;
-      if (authenticationMechanismType == null)
-      {
-         if (other.authenticationMechanismType != null)
-         {
-            return false;
-         }
-      }
-      else if (!authenticationMechanismType.equals(other.authenticationMechanismType))
-      {
-         return false;
-      }
-      if (credentialInterface != other.credentialInterface)
-      {
-         return false;
-      }
-      if (description == null)
-      {
-         if (other.description != null)
-         {
-            return false;
-         }
-      }
-      else if (!description.equals(other.description))
-      {
-         return false;
-      }
-      if (id == null)
-      {
-         if (other.id != null)
-         {
-            return false;
-         }
-      }
-      else if (!id.equals(other.id))
-      {
-         return false;
-      }
-      return true;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#toString()
-    */
-   @Override
-   public String toString()
-   {
-      return "AuthenticationMechanism [description=" + description + ", authenticationMechanismType="
-            + authenticationMechanismType + ", credentialInterface=" + credentialInterface + ", id=" + id + "]";
-   }
-}

Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/ConfigProperty.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/ConfigProperty.java	2010-07-20 11:49:54 UTC (rev 106914)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/ConfigProperty.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -1,309 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.ra16;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
- *
- */
-public class ConfigProperty implements IdDecoratedMetadata
-{
-   /**
-    */
-   private static final long serialVersionUID = -2025203811838727421L;
-
-   private final List<LocalizedXsdString> description;
-
-   private final XsdString configPropertyName;
-
-   private final XsdString configPropertyType;
-
-   private final XsdString configPropertyValue;
-
-   private final Boolean configPropertyIgnore;
-
-   private final Boolean configPropertySupportsDynamicUpdates;
-
-   private final Boolean configPropertyConfidential;
-
-   private final String id;
-
-   /**
-    * @param description list of descriptions
-    * @param configPropertyName name of the property
-    * @param configPropertyType full qualified name of the type of the property
-    * @param configPropertyValue value
-    * @param configPropertyIgnore not mandatory boolean value The element config-property-ignore is used to specify
-    *         whether the configuration tools must ignore considering the
-    *         configuration property during auto-discovery of
-    *         Configuration properties. See the Connector specification for
-    *         more details. If unspecified, the container must not ignore
-    *         the configuration property during auto-discovery.
-    * @param configPropertySupportsDynamicUpdates not mandatory The element
-    *             config-property-supports-dynamic-updates is used to specify
-    *             whether the configuration property allows its value to be updated, by
-    *             application server's configuration tools, during the lifetime of
-    *             the JavaBean instance. See the Connector specification for
-    *             more details. If unspecified, the container must not dynamically
-    *             reconfigure the property.
-    * @param configPropertyConfidential The element config-property-confidential is used to specify
-    *  whether the configuration property is confidential and
-    *  recommends application server's configuration tools to use special
-    *  visual aids for editing them. See the Connector specification for
-    *  more details. If unspecified, the container must not treat the
-    *  property as confidential.
-    * @param id XML ID
-    */
-   public ConfigProperty(List<LocalizedXsdString> description, XsdString configPropertyName,
-         XsdString configPropertyType, XsdString configPropertyValue, Boolean configPropertyIgnore,
-         Boolean configPropertySupportsDynamicUpdates, Boolean configPropertyConfidential, String id)
-   {
-      super();
-      this.description = description;
-      this.configPropertyName = configPropertyName;
-      this.configPropertyType = configPropertyType;
-      this.configPropertyValue = configPropertyValue;
-      this.configPropertyIgnore = configPropertyIgnore;
-      this.configPropertySupportsDynamicUpdates = configPropertySupportsDynamicUpdates;
-      this.configPropertyConfidential = configPropertyConfidential;
-      this.id = id;
-   }
-
-   /**
-    * @return description
-    */
-   public List<LocalizedXsdString> getDescription()
-   {
-      return Collections.unmodifiableList(description);
-   }
-
-   /**
-    * @return configPropertyName
-    */
-   public XsdString getConfigPropertyName()
-   {
-      return configPropertyName;
-   }
-
-   /**
-    * @return configPropertyType
-    */
-   public XsdString getConfigPropertyType()
-   {
-      return configPropertyType;
-   }
-
-   /**
-    * @return configPropertyValue
-    */
-   public XsdString getConfigPropertyValue()
-   {
-      return configPropertyValue;
-   }
-
-   /**
-    * @return configPropertyIgnore
-    */
-   public Boolean getConfigPropertyIgnore()
-   {
-      return configPropertyIgnore;
-   }
-
-   /**
-    * @return configPropertySupportsDynamicUpdates
-    */
-   public Boolean getConfigPropertySupportsDynamicUpdates()
-   {
-      return configPropertySupportsDynamicUpdates;
-   }
-
-   /**
-    * @return configPropertyConfidential
-    */
-   public Boolean getConfigPropertyConfidential()
-   {
-      return configPropertyConfidential;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see IdDecoratedMetadata#getId()
-    */
-   @Override
-   public String getId()
-   {
-      return id;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#hashCode()
-    */
-   @Override
-   public int hashCode()
-   {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + ((configPropertyConfidential == null) ? 0 : configPropertyConfidential.hashCode());
-      result = prime * result + ((configPropertyIgnore == null) ? 0 : configPropertyIgnore.hashCode());
-      result = prime * result + ((configPropertyName == null) ? 0 : configPropertyName.hashCode());
-      result = prime * result
-            + ((configPropertySupportsDynamicUpdates == null) ? 0 : configPropertySupportsDynamicUpdates.hashCode());
-      result = prime * result + ((configPropertyType == null) ? 0 : configPropertyType.hashCode());
-      result = prime * result + ((configPropertyValue == null) ? 0 : configPropertyValue.hashCode());
-      result = prime * result + ((description == null) ? 0 : description.hashCode());
-      result = prime * result + ((id == null) ? 0 : id.hashCode());
-      return result;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#equals(java.lang.Object)
-    */
-   @Override
-   public boolean equals(Object obj)
-   {
-      if (this == obj)
-      {
-         return true;
-      }
-      if (obj == null)
-      {
-         return false;
-      }
-      if (!(obj instanceof ConfigProperty))
-      {
-         return false;
-      }
-      ConfigProperty other = (ConfigProperty) obj;
-      if (configPropertyConfidential == null)
-      {
-         if (other.configPropertyConfidential != null)
-         {
-            return false;
-         }
-      }
-      else if (!configPropertyConfidential.equals(other.configPropertyConfidential))
-      {
-         return false;
-      }
-      if (configPropertyIgnore == null)
-      {
-         if (other.configPropertyIgnore != null)
-         {
-            return false;
-         }
-      }
-      else if (!configPropertyIgnore.equals(other.configPropertyIgnore))
-      {
-         return false;
-      }
-      if (configPropertyName == null)
-      {
-         if (other.configPropertyName != null)
-         {
-            return false;
-         }
-      }
-      else if (!configPropertyName.equals(other.configPropertyName))
-      {
-         return false;
-      }
-      if (configPropertySupportsDynamicUpdates == null)
-      {
-         if (other.configPropertySupportsDynamicUpdates != null)
-         {
-            return false;
-         }
-      }
-      else if (!configPropertySupportsDynamicUpdates.equals(other.configPropertySupportsDynamicUpdates))
-      {
-         return false;
-      }
-      if (configPropertyType == null)
-      {
-         if (other.configPropertyType != null)
-         {
-            return false;
-         }
-      }
-      else if (!configPropertyType.equals(other.configPropertyType))
-      {
-         return false;
-      }
-      if (configPropertyValue == null)
-      {
-         if (other.configPropertyValue != null)
-         {
-            return false;
-         }
-      }
-      else if (!configPropertyValue.equals(other.configPropertyValue))
-      {
-         return false;
-      }
-      if (description == null)
-      {
-         if (other.description != null)
-         {
-            return false;
-         }
-      }
-      else if (!description.equals(other.description))
-      {
-         return false;
-      }
-      if (id == null)
-      {
-         if (other.id != null)
-         {
-            return false;
-         }
-      }
-      else if (!id.equals(other.id))
-      {
-         return false;
-      }
-      return true;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#toString()
-    */
-   @Override
-   public String toString()
-   {
-      return "ConfigProperty [description=" + description + ", configPropertyName=" + configPropertyName
-            + ", configPropertyType=" + configPropertyType + ", configPropertyValue=" + configPropertyValue
-            + ", configPropertyIgnore=" + configPropertyIgnore + ", configPropertySupportsDynamicUpdates="
-            + configPropertySupportsDynamicUpdates + ", configPropertyConfidential=" + configPropertyConfidential
-            + ", id=" + id + "]";
-   }
-}

Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/ConfigProperty16.java (from rev 106884, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/ConfigProperty.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/ConfigProperty16.java	                        (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/ConfigProperty16.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -0,0 +1,254 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.ra16;
+
+import org.jboss.jca.common.metadata.ra.common.ConfigProperty;
+import org.jboss.jca.common.metadata.ra.common.LocalizedXsdString;
+import org.jboss.jca.common.metadata.ra.common.XsdString;
+
+import java.util.List;
+
+/**
+ * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
+ *
+ */
+public class ConfigProperty16 extends ConfigProperty
+{
+   /**
+    */
+   private static final long serialVersionUID = -2025203811838727421L;
+
+   private final Boolean configPropertyIgnore;
+
+   private final Boolean configPropertySupportsDynamicUpdates;
+
+   private final Boolean configPropertyConfidential;
+
+   /**
+    * @param description list of descriptions
+    * @param configPropertyName name of the property
+    * @param configPropertyType full qualified name of the type of the property
+    * @param configPropertyValue value
+    * @param configPropertyIgnore not mandatory boolean value The element config-property-ignore is used to specify
+    *         whether the configuration tools must ignore considering the
+    *         configuration property during auto-discovery of
+    *         Configuration properties. See the Connector specification for
+    *         more details. If unspecified, the container must not ignore
+    *         the configuration property during auto-discovery.
+    * @param configPropertySupportsDynamicUpdates not mandatory The element
+    *             config-property-supports-dynamic-updates is used to specify
+    *             whether the configuration property allows its value to be updated, by
+    *             application server's configuration tools, during the lifetime of
+    *             the JavaBean instance. See the Connector specification for
+    *             more details. If unspecified, the container must not dynamically
+    *             reconfigure the property.
+    * @param configPropertyConfidential The element config-property-confidential is used to specify
+    *  whether the configuration property is confidential and
+    *  recommends application server's configuration tools to use special
+    *  visual aids for editing them. See the Connector specification for
+    *  more details. If unspecified, the container must not treat the
+    *  property as confidential.
+    * @param id XML ID
+    */
+   public ConfigProperty16(List<LocalizedXsdString> description, XsdString configPropertyName,
+         XsdString configPropertyType, XsdString configPropertyValue, Boolean configPropertyIgnore,
+         Boolean configPropertySupportsDynamicUpdates, Boolean configPropertyConfidential, String id)
+   {
+      super(description, configPropertyName, configPropertyType, configPropertyValue, id);
+      this.configPropertyIgnore = configPropertyIgnore;
+      this.configPropertySupportsDynamicUpdates = configPropertySupportsDynamicUpdates;
+      this.configPropertyConfidential = configPropertyConfidential;
+   }
+
+   /**
+    * @return configPropertyIgnore
+    */
+   public Boolean getConfigPropertyIgnore()
+   {
+      return configPropertyIgnore;
+   }
+
+   /**
+    * @return configPropertySupportsDynamicUpdates
+    */
+   public Boolean getConfigPropertySupportsDynamicUpdates()
+   {
+      return configPropertySupportsDynamicUpdates;
+   }
+
+   /**
+    * @return configPropertyConfidential
+    */
+   public Boolean getConfigPropertyConfidential()
+   {
+      return configPropertyConfidential;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#hashCode()
+    */
+   @Override
+   public int hashCode()
+   {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + ((configPropertyConfidential == null) ? 0 : configPropertyConfidential.hashCode());
+      result = prime * result + ((configPropertyIgnore == null) ? 0 : configPropertyIgnore.hashCode());
+      result = prime * result + ((configPropertyName == null) ? 0 : configPropertyName.hashCode());
+      result = prime * result
+            + ((configPropertySupportsDynamicUpdates == null) ? 0 : configPropertySupportsDynamicUpdates.hashCode());
+      result = prime * result + ((configPropertyType == null) ? 0 : configPropertyType.hashCode());
+      result = prime * result + ((configPropertyValue == null) ? 0 : configPropertyValue.hashCode());
+      result = prime * result + ((description == null) ? 0 : description.hashCode());
+      result = prime * result + ((id == null) ? 0 : id.hashCode());
+      return result;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#equals(java.lang.Object)
+    */
+   @Override
+   public boolean equals(Object obj)
+   {
+      if (this == obj)
+      {
+         return true;
+      }
+      if (obj == null)
+      {
+         return false;
+      }
+      if (!(obj instanceof ConfigProperty16))
+      {
+         return false;
+      }
+      ConfigProperty16 other = (ConfigProperty16) obj;
+      if (configPropertyConfidential == null)
+      {
+         if (other.configPropertyConfidential != null)
+         {
+            return false;
+         }
+      }
+      else if (!configPropertyConfidential.equals(other.configPropertyConfidential))
+      {
+         return false;
+      }
+      if (configPropertyIgnore == null)
+      {
+         if (other.configPropertyIgnore != null)
+         {
+            return false;
+         }
+      }
+      else if (!configPropertyIgnore.equals(other.configPropertyIgnore))
+      {
+         return false;
+      }
+      if (configPropertyName == null)
+      {
+         if (other.configPropertyName != null)
+         {
+            return false;
+         }
+      }
+      else if (!configPropertyName.equals(other.configPropertyName))
+      {
+         return false;
+      }
+      if (configPropertySupportsDynamicUpdates == null)
+      {
+         if (other.configPropertySupportsDynamicUpdates != null)
+         {
+            return false;
+         }
+      }
+      else if (!configPropertySupportsDynamicUpdates.equals(other.configPropertySupportsDynamicUpdates))
+      {
+         return false;
+      }
+      if (configPropertyType == null)
+      {
+         if (other.configPropertyType != null)
+         {
+            return false;
+         }
+      }
+      else if (!configPropertyType.equals(other.configPropertyType))
+      {
+         return false;
+      }
+      if (configPropertyValue == null)
+      {
+         if (other.configPropertyValue != null)
+         {
+            return false;
+         }
+      }
+      else if (!configPropertyValue.equals(other.configPropertyValue))
+      {
+         return false;
+      }
+      if (description == null)
+      {
+         if (other.description != null)
+         {
+            return false;
+         }
+      }
+      else if (!description.equals(other.description))
+      {
+         return false;
+      }
+      if (id == null)
+      {
+         if (other.id != null)
+         {
+            return false;
+         }
+      }
+      else if (!id.equals(other.id))
+      {
+         return false;
+      }
+      return true;
+   }
+
+   /**
+    * {@inheritDoc}
+    *
+    * @see java.lang.Object#toString()
+    */
+   @Override
+   public String toString()
+   {
+      return "ConfigProperty [description=" + description + ", configPropertyName=" + configPropertyName
+            + ", configPropertyType=" + configPropertyType + ", configPropertyValue=" + configPropertyValue
+            + ", configPropertyIgnore=" + configPropertyIgnore + ", configPropertySupportsDynamicUpdates="
+            + configPropertySupportsDynamicUpdates + ", configPropertyConfidential=" + configPropertyConfidential
+            + ", id=" + id + "]";
+   }
+}

Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/ConnectionDefinition.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/ConnectionDefinition.java	2010-07-20 11:49:54 UTC (rev 106914)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/ConnectionDefinition.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -1,268 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.ra16;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
- *
- */
-public class ConnectionDefinition implements IdDecoratedMetadata
-{
-   /**
-    */
-   private static final long serialVersionUID = 197264648585424765L;
-
-   private final String managedconnectionfactoryClass;
-
-   private final List<ConfigProperty> configProperty;
-
-   private final String connectionfactoryInterface;
-
-   private final String connectionfactoryImplClass;
-
-   private final String connectionInterface;
-
-   private final String connectionImplClass;
-
-   private final String id;
-
-   /**
-    * @param managedconnectionfactoryClass full qualified name of the class
-    * @param configProperty List of configproperties
-    * @param connectionfactoryInterface full qualified name of the factory interface
-    * @param connectionfactoryImplClass full qualified name of the factory implementation class
-    * @param connectionInterface full qualified name of the connection interface
-    * @param connectionImplClass full qualified name of the connection implementation class
-    * @param id XML ID
-    */
-   public ConnectionDefinition(String managedconnectionfactoryClass, List<ConfigProperty> configProperty,
-         String connectionfactoryInterface, String connectionfactoryImplClass, String connectionInterface,
-         String connectionImplClass, String id)
-   {
-      super();
-      this.managedconnectionfactoryClass = managedconnectionfactoryClass;
-      this.configProperty = configProperty;
-      this.connectionfactoryInterface = connectionfactoryInterface;
-      this.connectionfactoryImplClass = connectionfactoryImplClass;
-      this.connectionInterface = connectionInterface;
-      this.connectionImplClass = connectionImplClass;
-      this.id = id;
-   }
-
-   /**
-    * @return managedconnectionfactoryClass
-    */
-   public String getManagedconnectionfactoryClass()
-   {
-      return managedconnectionfactoryClass;
-   }
-
-   /**
-    * @return configProperty
-    */
-   public List<ConfigProperty> getConfigProperty()
-   {
-      return Collections.unmodifiableList(configProperty);
-   }
-
-   /**
-    * @return connectionfactoryInterface
-    */
-   public String getConnectionfactoryInterface()
-   {
-      return connectionfactoryInterface;
-   }
-
-   /**
-    * @return connectionfactoryImplClass
-    */
-   public String getConnectionfactoryImplClass()
-   {
-      return connectionfactoryImplClass;
-   }
-
-   /**
-    * @return connectionInterface
-    */
-   public String getConnectionInterface()
-   {
-      return connectionInterface;
-   }
-
-   /**
-    * @return connectionImplClass
-    */
-   public String getConnectionImplClass()
-   {
-      return connectionImplClass;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see IdDecoratedMetadata#getId()
-    */
-   @Override
-   public String getId()
-   {
-      return id;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#hashCode()
-    */
-   @Override
-   public int hashCode()
-   {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + ((configProperty == null) ? 0 : configProperty.hashCode());
-      result = prime * result + ((connectionImplClass == null) ? 0 : connectionImplClass.hashCode());
-      result = prime * result + ((connectionInterface == null) ? 0 : connectionInterface.hashCode());
-      result = prime * result + ((connectionfactoryImplClass == null) ? 0 : connectionfactoryImplClass.hashCode());
-      result = prime * result + ((connectionfactoryInterface == null) ? 0 : connectionfactoryInterface.hashCode());
-      result = prime * result + ((id == null) ? 0 : id.hashCode());
-      result = prime * result
-            + ((managedconnectionfactoryClass == null) ? 0 : managedconnectionfactoryClass.hashCode());
-      return result;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#equals(java.lang.Object)
-    */
-   @Override
-   public boolean equals(Object obj)
-   {
-      if (this == obj)
-      {
-         return true;
-      }
-      if (obj == null)
-      {
-         return false;
-      }
-      if (!(obj instanceof ConnectionDefinition))
-      {
-         return false;
-      }
-      ConnectionDefinition other = (ConnectionDefinition) obj;
-      if (configProperty == null)
-      {
-         if (other.configProperty != null)
-         {
-            return false;
-         }
-      }
-      else if (!configProperty.equals(other.configProperty))
-      {
-         return false;
-      }
-      if (connectionImplClass == null)
-      {
-         if (other.connectionImplClass != null)
-         {
-            return false;
-         }
-      }
-      else if (!connectionImplClass.equals(other.connectionImplClass))
-      {
-         return false;
-      }
-      if (connectionInterface == null)
-      {
-         if (other.connectionInterface != null)
-         {
-            return false;
-         }
-      }
-      else if (!connectionInterface.equals(other.connectionInterface))
-      {
-         return false;
-      }
-      if (connectionfactoryImplClass == null)
-      {
-         if (other.connectionfactoryImplClass != null)
-         {
-            return false;
-         }
-      }
-      else if (!connectionfactoryImplClass.equals(other.connectionfactoryImplClass))
-      {
-         return false;
-      }
-      if (connectionfactoryInterface == null)
-      {
-         if (other.connectionfactoryInterface != null)
-         {
-            return false;
-         }
-      }
-      else if (!connectionfactoryInterface.equals(other.connectionfactoryInterface))
-      {
-         return false;
-      }
-      if (id == null)
-      {
-         if (other.id != null)
-         {
-            return false;
-         }
-      }
-      else if (!id.equals(other.id))
-      {
-         return false;
-      }
-      if (managedconnectionfactoryClass == null)
-      {
-         if (other.managedconnectionfactoryClass != null)
-         {
-            return false;
-         }
-      }
-      else if (!managedconnectionfactoryClass.equals(other.managedconnectionfactoryClass))
-      {
-         return false;
-      }
-      return true;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#toString()
-    */
-   @Override
-   public String toString()
-   {
-      return "ConnectionDefinition [managedconnectionfactoryClass=" + managedconnectionfactoryClass
-            + ", configProperty=" + configProperty + ", connectionfactoryInterface=" + connectionfactoryInterface
-            + ", connectionfactoryImplClass=" + connectionfactoryImplClass + ", connectionInterface="
-            + connectionInterface + ", connectionImplClass=" + connectionImplClass + ", id=" + id + "]";
-   }
-}

Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Connector16.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Connector16.java	2010-07-20 11:49:54 UTC (rev 106914)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Connector16.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -21,7 +21,11 @@
  */
 package org.jboss.jca.common.metadata.ra.ra16;
 
-import org.jboss.jca.common.metadata.ra.Connector;
+import org.jboss.jca.common.metadata.ra.common.LicenseType;
+import org.jboss.jca.common.metadata.ra.common.LocalizedXsdString;
+import org.jboss.jca.common.metadata.ra.common.ResourceAdapter;
+import org.jboss.jca.common.metadata.ra.common.XsdString;
+import org.jboss.jca.common.metadata.ra.ra15.Connector15;
 
 import java.util.Collections;
 import java.util.List;
@@ -30,7 +34,7 @@
  * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
  *
  */
-public final class Connector16 implements IdDecoratedMetadata, Connector
+public final class Connector16 extends Connector15
 {
 
    /**
@@ -45,23 +49,11 @@
 
    private final List<Icon> icon;
 
-   private final XsdString vendorName;
-
-   private final XsdString eisType;
-
-   private final XsdString resourceadapterVersion;
-
-   private final LicenseType license;
-
-   private final ResourceAdapter resourceadapter;
-
    private final List<String> requiredWorkContext;
 
-   private final String version = "1.6";
-
    private final Boolean metadataComplete;
 
-   private final String id;
+   private final String version = "1.6";
 
    /**
     * @param moduleName name of the module
@@ -82,46 +74,16 @@
          LicenseType license, ResourceAdapter resourceadapter, List<String> requiredWorkContext,
          Boolean metadataComplete, String id)
    {
-      super();
+      super(vendorName, eisType, resourceadapterVersion, license, resourceadapter, id);
       this.moduleName = moduleName;
       this.description = description;
       this.displayName = displayName;
       this.icon = icon;
-      this.vendorName = vendorName;
-      this.eisType = eisType;
-      this.resourceadapterVersion = resourceadapterVersion;
-      this.license = license;
-      this.resourceadapter = resourceadapter;
       this.requiredWorkContext = requiredWorkContext;
       this.metadataComplete = metadataComplete;
-      this.id = id;
    }
 
    /**
-    * @return resourceadapterVersion
-    */
-   public XsdString getResourceadapterVersion()
-   {
-      return resourceadapterVersion;
-   }
-
-   /**
-    * @return license
-    */
-   public LicenseType getLicense()
-   {
-      return license;
-   }
-
-   /**
-    * @return resourceadapter
-    */
-   public ResourceAdapter getResourceadapter()
-   {
-      return resourceadapter;
-   }
-
-   /**
     * @return requiredWorkContext
     */
    public List<String> getRequiredWorkContext()
@@ -162,30 +124,6 @@
    }
 
    /**
-    * @return vendorName
-    */
-   public XsdString getVendorName()
-   {
-      return vendorName;
-   }
-
-   /**
-    * @return eisType
-    */
-   public XsdString getEisType()
-   {
-      return eisType;
-   }
-
-   /**
-    * @return version
-    */
-   public String getVersion()
-   {
-      return version;
-   }
-
-   /**
     * @return metadataComplete
     */
    public Boolean getMetadataComplete()
@@ -196,17 +134,6 @@
    /**
     * {@inheritDoc}
     *
-    * @see IdDecoratedMetadata#getId()
-    */
-   @Override
-   public String getId()
-   {
-      return id;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
     * @see java.lang.Object#hashCode()
     */
    @Override

Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/CredentialInterfaceEnum.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/CredentialInterfaceEnum.java	2010-07-20 11:49:54 UTC (rev 106914)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/CredentialInterfaceEnum.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -1,102 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.ra16;
-
-/**
- * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
- *The credential-interfaceType specifies the
- *        interface that the resource adapter implementation
- *        supports for the representation of the
- *        credentials. This element(s) that use this type,
- *        i.e. credential-interface,  should be used by
- *        application server to find out the Credential
- *        interface it should use as part of the security
- *        contract.
- *        The possible values are:
- *
- *        javax.resource.spi.security.PasswordCredential
- *        org.ietf.jgss.GSSCredential
- *        javax.resource.spi.security.GenericCredential
- */
-public enum CredentialInterfaceEnum
-{
-   /**
-    * enum instance representing javax.resource.spi.security.PasswordCredential
-    */
-   PASSWORD("javax.resource.spi.security.PasswordCredential"),
-   /**
-    * enum instance representing org.ietf.jgss.GSSCredentia
-    */
-   GSS("org.ietf.jgss.GSSCredential"),
-   /**
-    * enum instance representing javax.resource.spi.security.GenericCredential
-    */
-   GENERIC("javax.resource.spi.security.GenericCredential");
-
-   private final String fullQualifiedName;
-
-   private CredentialInterfaceEnum(String name)
-   {
-      this.fullQualifiedName = name;
-   }
-
-   /**
-    *
-    * Conveninet method to get enum instance giving full qualified name
-    *
-    * @param fullQualifiedName the full qualified name of supported Credential interface
-    * @return the corresponding enum instance
-    * @throws IllegalArgumentException in case the fullQualifiedName isn't one of the supported interfaces:
-    *        javax.resource.spi.security.PasswordCredential
-    *        org.ietf.jgss.GSSCredential
-    *        javax.resource.spi.security.GenericCredential
-    */
-   public static CredentialInterfaceEnum build(String fullQualifiedName) throws IllegalArgumentException
-   {
-      if ("javax.resource.spi.security.PasswordCredential".equals(fullQualifiedName))
-      {
-         return PASSWORD;
-      }
-      else if ("org.ietf.jgss.GSSCredential".equals(fullQualifiedName))
-      {
-         return GSS;
-      }
-      else if ("javax.resource.spi.security.GenericCredential".equals(fullQualifiedName))
-      {
-         return GENERIC;
-      }
-      else
-      {
-         throw new IllegalArgumentException("fullQualifiedName should be one of "
-               + "javax.resource.spi.security.PasswordCredential;" + " org.ietf.jgss.GSSCredential;"
-               + "javax.resource.spi.security.GenericCredential");
-      }
-   }
-
-   /**
-    * @return fullQualifiedName
-    */
-   public String getFullQualifiedName()
-   {
-      return fullQualifiedName;
-   }
-}

Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Icon.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Icon.java	2010-07-20 11:49:54 UTC (rev 106914)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Icon.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -21,6 +21,9 @@
  */
 package org.jboss.jca.common.metadata.ra.ra16;
 
+import org.jboss.jca.common.metadata.ra.common.IdDecoratedMetadata;
+import org.jboss.jca.common.metadata.ra.common.LocalizedMetadata;
+
 /**
  * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
  *

Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/IdDecoratedMetadata.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/IdDecoratedMetadata.java	2010-07-20 11:49:54 UTC (rev 106914)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/IdDecoratedMetadata.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.ra16;
-
-import org.jboss.jca.common.metadata.JCAMetadata;
-
-/**
- * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
- *
- */
-public interface IdDecoratedMetadata extends JCAMetadata
-{
-
-   /**
-    *
-    * Return the String representing xml ID
-    *
-    * @return the XML ID
-    */
-   public String getId();
-
-}

Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/InboundResourceAdapter.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/InboundResourceAdapter.java	2010-07-20 11:49:54 UTC (rev 106914)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/InboundResourceAdapter.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -1,143 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.ra16;
-
-/**
- * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
- *
- */
-public class InboundResourceAdapter implements IdDecoratedMetadata
-{
-   /**
-    */
-   private static final long serialVersionUID = -2854927981408307535L;
-
-   private final MessageAdapter messageadapter;
-
-   private final String id;
-
-   /**
-    * @param messageadapter The messageadapterType specifies information about the
-    * messaging capabilities of the resource adapter. This
-    * contains information specific to the implementation of the
-    * resource adapter library as specified through the
-    * messagelistener element.
-    * @param id XML ID
-    */
-   public InboundResourceAdapter(MessageAdapter messageadapter, String id)
-   {
-      super();
-      this.messageadapter = messageadapter;
-      this.id = id;
-   }
-
-   /**
-    * @return messageadapter
-    */
-   public MessageAdapter getMessageadapter()
-   {
-      return messageadapter;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see IdDecoratedMetadata#getId()
-    */
-   @Override
-   public String getId()
-   {
-      return id;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#hashCode()
-    */
-   @Override
-   public int hashCode()
-   {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + ((id == null) ? 0 : id.hashCode());
-      result = prime * result + ((messageadapter == null) ? 0 : messageadapter.hashCode());
-      return result;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#equals(java.lang.Object)
-    */
-   @Override
-   public boolean equals(Object obj)
-   {
-      if (this == obj)
-      {
-         return true;
-      }
-      if (obj == null)
-      {
-         return false;
-      }
-      if (!(obj instanceof InboundResourceAdapter))
-      {
-         return false;
-      }
-      InboundResourceAdapter other = (InboundResourceAdapter) obj;
-      if (id == null)
-      {
-         if (other.id != null)
-         {
-            return false;
-         }
-      }
-      else if (!id.equals(other.id))
-      {
-         return false;
-      }
-      if (messageadapter == null)
-      {
-         if (other.messageadapter != null)
-         {
-            return false;
-         }
-      }
-      else if (!messageadapter.equals(other.messageadapter))
-      {
-         return false;
-      }
-      return true;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#toString()
-    */
-   @Override
-   public String toString()
-   {
-      return "InboundResourceAdapter [messageadapter=" + messageadapter + ", id=" + id + "]";
-   }
-}

Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/LicenseType.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/LicenseType.java	2010-07-20 11:49:54 UTC (rev 106914)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/LicenseType.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -1,161 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.ra16;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
- *
- */
-public class LicenseType implements IdDecoratedMetadata
-{
-
-   /**
-    */
-   private static final long serialVersionUID = 1590514246054447090L;
-
-   private final List<LocalizedXsdString> description;
-
-   private final boolean licenseRequired;
-
-   private final String id;
-
-   /**
-    * @param description description of the license
-    * @param licenseRequired mandatory boolena value
-    * @param id XML ID
-    */
-   public LicenseType(List<LocalizedXsdString> description, boolean licenseRequired, String id)
-   {
-      super();
-      this.description = description;
-      this.licenseRequired = licenseRequired;
-      this.id = id;
-   }
-
-   /**
-    * @return description
-    */
-   public List<LocalizedXsdString> getDescription()
-   {
-      return Collections.unmodifiableList(description);
-   }
-
-   /**
-    * @return licenseRequired
-    */
-   public boolean isLicenseRequired()
-   {
-      return licenseRequired;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see IdDecoratedMetadata#getId()
-    */
-   @Override
-   public String getId()
-   {
-      return id;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#hashCode()
-    */
-   @Override
-   public int hashCode()
-   {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + ((description == null) ? 0 : description.hashCode());
-      result = prime * result + ((id == null) ? 0 : id.hashCode());
-      result = prime * result + (licenseRequired ? 1231 : 1237);
-      return result;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#equals(java.lang.Object)
-    */
-   @Override
-   public boolean equals(Object obj)
-   {
-      if (this == obj)
-      {
-         return true;
-      }
-      if (obj == null)
-      {
-         return false;
-      }
-      if (!(obj instanceof LicenseType))
-      {
-         return false;
-      }
-      LicenseType other = (LicenseType) obj;
-      if (description == null)
-      {
-         if (other.description != null)
-         {
-            return false;
-         }
-      }
-      else if (!description.equals(other.description))
-      {
-         return false;
-      }
-      if (id == null)
-      {
-         if (other.id != null)
-         {
-            return false;
-         }
-      }
-      else if (!id.equals(other.id))
-      {
-         return false;
-      }
-      if (licenseRequired != other.licenseRequired)
-      {
-         return false;
-      }
-      return true;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#toString()
-    */
-   @Override
-   public String toString()
-   {
-      return "LicenseType [description=" + description + ", licenseRequired=" + licenseRequired + ", id=" + id + "]";
-   }
-
-}

Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/LocalizedMetadata.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/LocalizedMetadata.java	2010-07-20 11:49:54 UTC (rev 106914)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/LocalizedMetadata.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.ra16;
-
-import org.jboss.jca.common.metadata.JCAMetadata;
-
-/**
- * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
- *
- */
-public interface LocalizedMetadata extends JCAMetadata
-{
-
-   /**
-    *
-    * Language used for this string at xml level. Value are like "en", "it", "fr" and so on
-    *
-    * @return the lang used for this string
-    */
-   public String getLang();
-
-}

Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/LocalizedXsdString.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/LocalizedXsdString.java	2010-07-20 11:49:54 UTC (rev 106914)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/LocalizedXsdString.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -1,128 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.ra16;
-
-/**
- * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
- *
- */
-public class LocalizedXsdString extends XsdString implements LocalizedMetadata
-{
-   /**
-    */
-   private static final long serialVersionUID = -7778684576336929347L;
-
-   private final String lang;
-
-   /**
-    * @param value value of the String
-    * @param id XML ID
-    * @param lang language
-    */
-   public LocalizedXsdString(String value, String id, String lang)
-   {
-      super(value, id);
-      this.lang = lang;
-   }
-
-   /**
-    * Constructor for default language "en"
-    *
-    * @param value value of the String
-    * @param id XML ID
-    */
-   public LocalizedXsdString(String value, String id)
-   {
-      super(value, id);
-      this.lang = "en";
-   }
-
-   /**
-    * @return lang
-    */
-   @Override
-   public String getLang()
-   {
-      return lang;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#hashCode()
-    */
-   @Override
-   public int hashCode()
-   {
-      final int prime = 31;
-      int result = super.hashCode();
-      result = prime * result + ((lang == null) ? 0 : lang.hashCode());
-      return result;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#equals(java.lang.Object)
-    */
-   @Override
-   public boolean equals(Object obj)
-   {
-      if (this == obj)
-      {
-         return true;
-      }
-      if (!super.equals(obj))
-      {
-         return false;
-      }
-      if (!(obj instanceof LocalizedXsdString))
-      {
-         return false;
-      }
-      LocalizedXsdString other = (LocalizedXsdString) obj;
-      if (lang == null)
-      {
-         if (other.lang != null)
-         {
-            return false;
-         }
-      }
-      else if (!lang.equals(other.lang))
-      {
-         return false;
-      }
-      return true;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#toString()
-    */
-   @Override
-   public String toString()
-   {
-      return "LocalizedXsdString [lang=" + lang + ", value=" + value + ", id=" + id + "]";
-   }
-
-}

Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/MessageAdapter.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/MessageAdapter.java	2010-07-20 11:49:54 UTC (rev 106914)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/MessageAdapter.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -1,146 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.ra16;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
- *
- */
-public class MessageAdapter implements IdDecoratedMetadata
-{
-   /**
-    */
-   private static final long serialVersionUID = 1731250340667920811L;
-
-   private final List<MessageListener> messagelistener;
-
-   private final String id;
-
-   /**
-    * @param messagelistener The messagelistener specifies information about a
-    *  specific message listener supported by the messaging
-    *  resource adapter. It contains information on the Java type
-    *  of the message listener interface and an activation
-    *  specification.
-    * @param id XML ID
-    */
-   public MessageAdapter(List<MessageListener> messagelistener, String id)
-   {
-      super();
-      this.messagelistener = messagelistener;
-      this.id = id;
-   }
-
-   /**
-    * @return messagelistener
-    */
-   public List<MessageListener> getMessagelistener()
-   {
-      return Collections.unmodifiableList(messagelistener);
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see IdDecoratedMetadata#getId()
-    */
-   @Override
-   public String getId()
-   {
-      return id;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#hashCode()
-    */
-   @Override
-   public int hashCode()
-   {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + ((id == null) ? 0 : id.hashCode());
-      result = prime * result + ((messagelistener == null) ? 0 : messagelistener.hashCode());
-      return result;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#equals(java.lang.Object)
-    */
-   @Override
-   public boolean equals(Object obj)
-   {
-      if (this == obj)
-      {
-         return true;
-      }
-      if (obj == null)
-      {
-         return false;
-      }
-      if (!(obj instanceof MessageAdapter))
-      {
-         return false;
-      }
-      MessageAdapter other = (MessageAdapter) obj;
-      if (id == null)
-      {
-         if (other.id != null)
-         {
-            return false;
-         }
-      }
-      else if (!id.equals(other.id))
-      {
-         return false;
-      }
-      if (messagelistener == null)
-      {
-         if (other.messagelistener != null)
-         {
-            return false;
-         }
-      }
-      else if (!messagelistener.equals(other.messagelistener))
-      {
-         return false;
-      }
-      return true;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#toString()
-    */
-   @Override
-   public String toString()
-   {
-      return "MessageAdapter [messagelistener=" + messagelistener + ", id=" + id + "]";
-   }
-}

Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/MessageListener.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/MessageListener.java	2010-07-20 11:49:54 UTC (rev 106914)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/MessageListener.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -1,167 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.ra16;
-
-/**
- * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
- *
- */
-public class MessageListener implements IdDecoratedMetadata
-{
-   /**
-    */
-   private static final long serialVersionUID = 6417807206318228618L;
-
-   private final String messagelistenerType;
-
-   private final Activationspec activationspec;
-
-   private final String id;
-
-   /**
-    * @param messagelistenerType full qualified name of the java type
-    * @param activationspec  The activationspecType specifies an activation
-    * specification.  The information includes fully qualified
-    * Java class name of an activation specification and a set of
-    * required configuration property names.
-    * @param id XML ID
-    */
-   public MessageListener(String messagelistenerType, Activationspec activationspec, String id)
-   {
-      super();
-      this.messagelistenerType = messagelistenerType;
-      this.activationspec = activationspec;
-      this.id = id;
-   }
-
-   /**
-    * @return messagelistenerType
-    */
-   public String getMessagelistenerType()
-   {
-      return messagelistenerType;
-   }
-
-   /**
-    * @return activationspec
-    */
-   public Activationspec getActivationspec()
-   {
-      return activationspec;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see IdDecoratedMetadata#getId()
-    */
-   @Override
-   public String getId()
-   {
-      return id;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#hashCode()
-    */
-   @Override
-   public int hashCode()
-   {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + ((activationspec == null) ? 0 : activationspec.hashCode());
-      result = prime * result + ((id == null) ? 0 : id.hashCode());
-      result = prime * result + ((messagelistenerType == null) ? 0 : messagelistenerType.hashCode());
-      return result;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#equals(java.lang.Object)
-    */
-   @Override
-   public boolean equals(Object obj)
-   {
-      if (this == obj)
-      {
-         return true;
-      }
-      if (obj == null)
-      {
-         return false;
-      }
-      if (!(obj instanceof MessageListener))
-      {
-         return false;
-      }
-      MessageListener other = (MessageListener) obj;
-      if (activationspec == null)
-      {
-         if (other.activationspec != null)
-         {
-            return false;
-         }
-      }
-      else if (!activationspec.equals(other.activationspec))
-      {
-         return false;
-      }
-      if (id == null)
-      {
-         if (other.id != null)
-         {
-            return false;
-         }
-      }
-      else if (!id.equals(other.id))
-      {
-         return false;
-      }
-      if (messagelistenerType == null)
-      {
-         if (other.messagelistenerType != null)
-         {
-            return false;
-         }
-      }
-      else if (!messagelistenerType.equals(other.messagelistenerType))
-      {
-         return false;
-      }
-      return true;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#toString()
-    */
-   @Override
-   public String toString()
-   {
-      return "MessageListener [messagelistenerType=" + messagelistenerType + ", activationspec=" + activationspec
-            + ", id=" + id + "]";
-   }
-}

Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/OutboundResourceAdapter.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/OutboundResourceAdapter.java	2010-07-20 11:49:54 UTC (rev 106914)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/OutboundResourceAdapter.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -1,211 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.ra16;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
- *
- */
-public class OutboundResourceAdapter implements IdDecoratedMetadata
-{
-   /**
-    */
-   private static final long serialVersionUID = 421345307326415666L;
-
-   private final List<ConnectionDefinition> connectionDefinition;
-
-   private final TransactionSupportEnum transactionSupport;
-
-   private final List<AuthenticationMechanism> authenticationMechanism;
-
-   private final Boolean reauthenticationSupport;
-
-   private final String id;
-
-   /**
-    * @param connectionDefinition list of connection definitions
-    * @param transactionSupport transaction supported form this RA. Valid ones are defined by an enum
-    * @param authenticationMechanism list of authentication mechanism supported
-    * @param reauthenticationSupport not mandatary boolean value
-    * @param id XML ID
-    */
-   public OutboundResourceAdapter(List<ConnectionDefinition> connectionDefinition,
-         TransactionSupportEnum transactionSupport, List<AuthenticationMechanism> authenticationMechanism,
-         Boolean reauthenticationSupport, String id)
-   {
-      super();
-      this.connectionDefinition = connectionDefinition;
-      this.transactionSupport = transactionSupport;
-      this.authenticationMechanism = authenticationMechanism;
-      this.reauthenticationSupport = reauthenticationSupport;
-      this.id = id;
-   }
-
-   /**
-    * @return connectionDefinition
-    */
-   public List<ConnectionDefinition> getConnectionDefinition()
-   {
-      return Collections.unmodifiableList(connectionDefinition);
-   }
-
-   /**
-    * @return transactionSupport
-    */
-   public TransactionSupportEnum getTransactionSupport()
-   {
-      return transactionSupport;
-   }
-
-   /**
-    * @return authenticationMechanism
-    */
-   public List<AuthenticationMechanism> getAuthenticationMechanism()
-   {
-      return Collections.unmodifiableList(authenticationMechanism);
-   }
-
-   /**
-    * @return reauthenticationSupport
-    */
-   public Boolean getReauthenticationSupport()
-   {
-      return reauthenticationSupport;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see IdDecoratedMetadata#getId()
-    */
-   @Override
-   public String getId()
-   {
-      return id;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#hashCode()
-    */
-   @Override
-   public int hashCode()
-   {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + ((authenticationMechanism == null) ? 0 : authenticationMechanism.hashCode());
-      result = prime * result + ((connectionDefinition == null) ? 0 : connectionDefinition.hashCode());
-      result = prime * result + ((id == null) ? 0 : id.hashCode());
-      result = prime * result + ((reauthenticationSupport == null) ? 0 : reauthenticationSupport.hashCode());
-      result = prime * result + ((transactionSupport == null) ? 0 : transactionSupport.hashCode());
-      return result;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#equals(java.lang.Object)
-    */
-   @Override
-   public boolean equals(Object obj)
-   {
-      if (this == obj)
-      {
-         return true;
-      }
-      if (obj == null)
-      {
-         return false;
-      }
-      if (!(obj instanceof OutboundResourceAdapter))
-      {
-         return false;
-      }
-      OutboundResourceAdapter other = (OutboundResourceAdapter) obj;
-      if (authenticationMechanism == null)
-      {
-         if (other.authenticationMechanism != null)
-         {
-            return false;
-         }
-      }
-      else if (!authenticationMechanism.equals(other.authenticationMechanism))
-      {
-         return false;
-      }
-      if (connectionDefinition == null)
-      {
-         if (other.connectionDefinition != null)
-         {
-            return false;
-         }
-      }
-      else if (!connectionDefinition.equals(other.connectionDefinition))
-      {
-         return false;
-      }
-      if (id == null)
-      {
-         if (other.id != null)
-         {
-            return false;
-         }
-      }
-      else if (!id.equals(other.id))
-      {
-         return false;
-      }
-      if (reauthenticationSupport == null)
-      {
-         if (other.reauthenticationSupport != null)
-         {
-            return false;
-         }
-      }
-      else if (!reauthenticationSupport.equals(other.reauthenticationSupport))
-      {
-         return false;
-      }
-      if (transactionSupport != other.transactionSupport)
-      {
-         return false;
-      }
-      return true;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#toString()
-    */
-   @Override
-   public String toString()
-   {
-      return "OutboundResourceAdapter [connectionDefinition=" + connectionDefinition + ", transactionSupport="
-            + transactionSupport + ", authenticationMechanism=" + authenticationMechanism
-            + ", reauthenticationSupport=" + reauthenticationSupport + ", id=" + id + "]";
-   }
-}

Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/RequiredConfigProperty.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/RequiredConfigProperty.java	2010-07-20 11:49:54 UTC (rev 106914)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/RequiredConfigProperty.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -21,6 +21,9 @@
  */
 package org.jboss.jca.common.metadata.ra.ra16;
 
+import org.jboss.jca.common.metadata.ra.common.IdDecoratedMetadata;
+import org.jboss.jca.common.metadata.ra.common.LocalizedXsdString;
+
 import java.util.Collections;
 import java.util.List;
 

Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/ResourceAdapter.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/ResourceAdapter.java	2010-07-20 11:49:54 UTC (rev 106914)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/ResourceAdapter.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -1,267 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.ra16;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
- *
- */
-public class ResourceAdapter implements IdDecoratedMetadata
-{
-   /**
-    */
-   private static final long serialVersionUID = 4841095296099713549L;
-
-   private final String resourceadapterClass;
-
-   private final List<ConfigProperty> configProperty;
-
-   private final OutboundResourceAdapter outboundResourceadapter;
-
-   private final InboundResourceAdapter inboundResourceadapter;
-
-   private final List<Adminobject> adminobject;
-
-   private final List<SecurityPermission> securityPermission;
-
-   private final String id;
-
-   /**
-    * @param resourceadapterClass full qualified name of the class
-    * @param configProperty confi properties for this RA
-    * @param outboundResourceadapter outbound RA
-    * @param inboundResourceadapter inbound RA
-    * @param adminobject list of admin objects of this RA
-    * @param securityPermission supported security permissions
-    * @param id XML ID
-    */
-   public ResourceAdapter(String resourceadapterClass, List<ConfigProperty> configProperty,
-         OutboundResourceAdapter outboundResourceadapter, InboundResourceAdapter inboundResourceadapter,
-         List<Adminobject> adminobject, List<SecurityPermission> securityPermission, String id)
-   {
-      super();
-      this.resourceadapterClass = resourceadapterClass;
-      this.configProperty = configProperty;
-      this.outboundResourceadapter = outboundResourceadapter;
-      this.inboundResourceadapter = inboundResourceadapter;
-      this.adminobject = adminobject;
-      this.securityPermission = securityPermission;
-      this.id = id;
-   }
-
-   /**
-    * @return resourceadapterClass
-    */
-   public String getResourceadapterClass()
-   {
-      return resourceadapterClass;
-   }
-
-   /**
-    * @return configProperty
-    */
-   public List<ConfigProperty> getConfigProperty()
-   {
-      return Collections.unmodifiableList(configProperty);
-   }
-
-   /**
-    * @return outboundResourceadapter
-    */
-   public OutboundResourceAdapter getOutboundResourceadapter()
-   {
-      return outboundResourceadapter;
-   }
-
-   /**
-    * @return inboundResourceadapter
-    */
-   public InboundResourceAdapter getInboundResourceadapter()
-   {
-      return inboundResourceadapter;
-   }
-
-   /**
-    * @return adminobject
-    */
-   public List<Adminobject> getAdminobject()
-   {
-      return Collections.unmodifiableList(adminobject);
-   }
-
-   /**
-    * @return securityPermission
-    */
-   public List<SecurityPermission> getSecurityPermission()
-   {
-      return Collections.unmodifiableList(securityPermission);
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see IdDecoratedMetadata#getId()
-    */
-   @Override
-   public String getId()
-   {
-      return id;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#hashCode()
-    */
-   @Override
-   public int hashCode()
-   {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + ((adminobject == null) ? 0 : adminobject.hashCode());
-      result = prime * result + ((configProperty == null) ? 0 : configProperty.hashCode());
-      result = prime * result + ((id == null) ? 0 : id.hashCode());
-      result = prime * result + ((inboundResourceadapter == null) ? 0 : inboundResourceadapter.hashCode());
-      result = prime * result + ((outboundResourceadapter == null) ? 0 : outboundResourceadapter.hashCode());
-      result = prime * result + ((resourceadapterClass == null) ? 0 : resourceadapterClass.hashCode());
-      result = prime * result + ((securityPermission == null) ? 0 : securityPermission.hashCode());
-      return result;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#equals(java.lang.Object)
-    */
-   @Override
-   public boolean equals(Object obj)
-   {
-      if (this == obj)
-      {
-         return true;
-      }
-      if (obj == null)
-      {
-         return false;
-      }
-      if (!(obj instanceof ResourceAdapter))
-      {
-         return false;
-      }
-      ResourceAdapter other = (ResourceAdapter) obj;
-      if (adminobject == null)
-      {
-         if (other.adminobject != null)
-         {
-            return false;
-         }
-      }
-      else if (!adminobject.equals(other.adminobject))
-      {
-         return false;
-      }
-      if (configProperty == null)
-      {
-         if (other.configProperty != null)
-         {
-            return false;
-         }
-      }
-      else if (!configProperty.equals(other.configProperty))
-      {
-         return false;
-      }
-      if (id == null)
-      {
-         if (other.id != null)
-         {
-            return false;
-         }
-      }
-      else if (!id.equals(other.id))
-      {
-         return false;
-      }
-      if (inboundResourceadapter == null)
-      {
-         if (other.inboundResourceadapter != null)
-         {
-            return false;
-         }
-      }
-      else if (!inboundResourceadapter.equals(other.inboundResourceadapter))
-      {
-         return false;
-      }
-      if (outboundResourceadapter == null)
-      {
-         if (other.outboundResourceadapter != null)
-         {
-            return false;
-         }
-      }
-      else if (!outboundResourceadapter.equals(other.outboundResourceadapter))
-      {
-         return false;
-      }
-      if (resourceadapterClass == null)
-      {
-         if (other.resourceadapterClass != null)
-         {
-            return false;
-         }
-      }
-      else if (!resourceadapterClass.equals(other.resourceadapterClass))
-      {
-         return false;
-      }
-      if (securityPermission == null)
-      {
-         if (other.securityPermission != null)
-         {
-            return false;
-         }
-      }
-      else if (!securityPermission.equals(other.securityPermission))
-      {
-         return false;
-      }
-      return true;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#toString()
-    */
-   @Override
-   public String toString()
-   {
-      return "ResourceAdapter [resourceadapterClass=" + resourceadapterClass + ", configProperty=" + configProperty
-            + ", outboundResourceadapter=" + outboundResourceadapter + ", inboundResourceadapter="
-            + inboundResourceadapter + ", adminobject=" + adminobject + ", securityPermission=" + securityPermission
-            + ", id=" + id + "]";
-   }
-}

Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/SecurityPermission.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/SecurityPermission.java	2010-07-20 11:49:54 UTC (rev 106914)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/SecurityPermission.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -1,167 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.ra16;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
- *
- */
-public class SecurityPermission implements IdDecoratedMetadata
-{
-   /**
-    */
-   private static final long serialVersionUID = -7931009018498254330L;
-
-   private final List<LocalizedXsdString> description;
-
-   private final XsdString securityPermissionSpec;
-
-   private final String id;
-
-   /**
-    * @param description descriptions
-    * @param securityPermissionSpec the security permission spec as defined in the xml
-    * @param id XML ID
-    */
-   public SecurityPermission(List<LocalizedXsdString> description, XsdString securityPermissionSpec, String id)
-   {
-      super();
-      this.description = description;
-      this.securityPermissionSpec = securityPermissionSpec;
-      this.id = id;
-   }
-
-   /**
-    * @return description
-    */
-   public List<LocalizedXsdString> getDescription()
-   {
-      return Collections.unmodifiableList(description);
-   }
-
-   /**
-    * @return securityPermissionSpec
-    */
-   public XsdString getSecurityPermissionSpec()
-   {
-      return securityPermissionSpec;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see IdDecoratedMetadata#getId()
-    */
-   @Override
-   public String getId()
-   {
-      return id;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#hashCode()
-    */
-   @Override
-   public int hashCode()
-   {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + ((description == null) ? 0 : description.hashCode());
-      result = prime * result + ((id == null) ? 0 : id.hashCode());
-      result = prime * result + ((securityPermissionSpec == null) ? 0 : securityPermissionSpec.hashCode());
-      return result;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#equals(java.lang.Object)
-    */
-   @Override
-   public boolean equals(Object obj)
-   {
-      if (this == obj)
-      {
-         return true;
-      }
-      if (obj == null)
-      {
-         return false;
-      }
-      if (!(obj instanceof SecurityPermission))
-      {
-         return false;
-      }
-      SecurityPermission other = (SecurityPermission) obj;
-      if (description == null)
-      {
-         if (other.description != null)
-         {
-            return false;
-         }
-      }
-      else if (!description.equals(other.description))
-      {
-         return false;
-      }
-      if (id == null)
-      {
-         if (other.id != null)
-         {
-            return false;
-         }
-      }
-      else if (!id.equals(other.id))
-      {
-         return false;
-      }
-      if (securityPermissionSpec == null)
-      {
-         if (other.securityPermissionSpec != null)
-         {
-            return false;
-         }
-      }
-      else if (!securityPermissionSpec.equals(other.securityPermissionSpec))
-      {
-         return false;
-      }
-      return true;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#toString()
-    */
-   @Override
-   public String toString()
-   {
-      return "SecurityPermission [description=" + description + ", securityPermissionSpec=" + securityPermissionSpec
-            + ", id=" + id + "]";
-   }
-}

Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/TransactionSupportEnum.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/TransactionSupportEnum.java	2010-07-20 11:49:54 UTC (rev 106914)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/TransactionSupportEnum.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.ra16;
-
-/**
- * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
- *
- */
-public enum TransactionSupportEnum
-{
-   /**
-    * NoTransaction
-    */
-   NoTransaction,
-   /**
-    * LocalTransaction
-    */
-   LocalTransaction,
-   /**
-    * XATransaction
-    */
-   XATransaction;
-
-}

Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/XsdString.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/XsdString.java	2010-07-20 11:49:54 UTC (rev 106914)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/XsdString.java	2010-07-20 13:09:00 UTC (rev 106915)
@@ -1,146 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jca.common.metadata.ra.ra16;
-
-/**
- * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
- *
- */
-public class XsdString implements IdDecoratedMetadata
-{
-   /**
-    */
-   private static final long serialVersionUID = -3045754045828271173L;
-
-   /**
-    * the actual String value
-    */
-   protected final String value;
-
-   /**
-    * XML ID
-    */
-   protected final String id;
-
-   /**
-    * @param value the actual String value
-    * @param id XML ID
-    */
-   public XsdString(String value, String id)
-   {
-      super();
-      this.value = value;
-      this.id = id;
-   }
-
-   /**
-    * @return value
-    */
-   public String getValue()
-   {
-      return value;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see IdDecoratedMetadata#getId()
-    */
-   @Override
-   public String getId()
-   {
-      return id;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#hashCode()
-    */
-   @Override
-   public int hashCode()
-   {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + ((id == null) ? 0 : id.hashCode());
-      result = prime * result + ((value == null) ? 0 : value.hashCode());
-      return result;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#equals(java.lang.Object)
-    */
-   @Override
-   public boolean equals(Object obj)
-   {
-      if (this == obj)
-      {
-         return true;
-      }
-      if (obj == null)
-      {
-         return false;
-      }
-      if (!(obj instanceof XsdString))
-      {
-         return false;
-      }
-      XsdString other = (XsdString) obj;
-      if (id == null)
-      {
-         if (other.id != null)
-         {
-            return false;
-         }
-      }
-      else if (!id.equals(other.id))
-      {
-         return false;
-      }
-      if (value == null)
-      {
-         if (other.value != null)
-         {
-            return false;
-         }
-      }
-      else if (!value.equals(other.value))
-      {
-         return false;
-      }
-      return true;
-   }
-
-   /**
-    * {@inheritDoc}
-    *
-    * @see java.lang.Object#toString()
-    */
-   @Override
-   public String toString()
-   {
-      return "XsdString [value=" + value + ", id=" + id + "]";
-   }
-
-}

Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/package.html
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/package.html	2010-07-20 11:49:54 UTC (rev 106914)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/package.html	2010-07-20 13:09:00 UTC (rev 106915)
@@ -1,3 +1,3 @@
 <body>
-This package contains metadatas for connector-*.xsd
+This package contains metadatas for connector-1.6.xsd
 </body>



More information about the jboss-cvs-commits mailing list