[jboss-cvs] JBossAS SVN: r99458 - in projects/metadata/rar/tags: 2.0.0.Alpha5 and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Jan 15 06:44:28 EST 2010


Author: jeff.zhang
Date: 2010-01-15 06:44:26 -0500 (Fri, 15 Jan 2010)
New Revision: 99458

Added:
   projects/metadata/rar/tags/2.0.0.Alpha5/
   projects/metadata/rar/tags/2.0.0.Alpha5/pom.xml
   projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA10DTDMetaData.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA15DTDMetaData.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA15DefaultNSMetaData.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA15MetaData.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16Base.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16DTDMetaData.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16DefaultNSMetaData.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16MetaData.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/RA10MetaData.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA10DTDUnitTestCase.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA15DTDUnitTestCase.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA15EverythingUnitTestCase.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA16DTDUnitTestCase.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java
Removed:
   projects/metadata/rar/tags/2.0.0.Alpha5/pom.xml
   projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA10DTDMetaData.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA15DTDMetaData.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA15DefaultNSMetaData.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA15MetaData.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16Base.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16DTDMetaData.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16DefaultNSMetaData.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16MetaData.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/RA10MetaData.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA10DTDUnitTestCase.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA15DTDUnitTestCase.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA15EverythingUnitTestCase.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA16DTDUnitTestCase.java
   projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java
Log:
[maven-release-plugin]  copy for tag 2.0.0.Alpha5

Copied: projects/metadata/rar/tags/2.0.0.Alpha5 (from rev 99395, projects/metadata/rar/trunk)

Deleted: projects/metadata/rar/tags/2.0.0.Alpha5/pom.xml
===================================================================
--- projects/metadata/rar/trunk/pom.xml	2010-01-14 09:38:49 UTC (rev 99395)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/pom.xml	2010-01-15 11:44:26 UTC (rev 99458)
@@ -1,125 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.jboss</groupId>
-    <artifactId>jboss-parent</artifactId>
-    <version>4.0.CR1</version>
-  </parent>
-  <groupId>org.jboss.metadata</groupId>
-  <artifactId>jboss-metadata-rar</artifactId>
-  <packaging>jar</packaging>
-  <version>2.0.0-SNAPSHOT</version>
-  <name>JBoss Metadata RAR</name>
-  <url>http://www.jboss.org</url>
-  <description>The common JavaEE metadata classes</description>
-  <scm>
-    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/metadata/rar/trunk/</connection>
-    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/metadata/rar/trunk/</developerConnection>
-  </scm>
-
-  <build>
-    <outputDirectory>${profile.outputDirectory}</outputDirectory>
-    <testOutputDirectory>${profile.testOutputDirectory}</testOutputDirectory>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.4.3</version>
-        <configuration>
-          <printSummary>true</printSummary>
-          <disableXmlReport>false</disableXmlReport>
-          <redirectTestOutputToFile>true</redirectTestOutputToFile>
-           <testFailureIgnore>false</testFailureIgnore>
-          <includes>
-            <include>**/*TestCase.java</include>
-          </includes>
-        </configuration>
-      </plugin>      
-    </plugins>
-  </build>
-
-  <repositories>
-    <repository>
-      <id>repository.jboss.org</id>
-      <name>JBoss Repository</name>
-      <layout>default</layout>
-      <url>http://repository.jboss.org/maven2/</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>snapshots.jboss.org</id>
-      <name>JBoss Snapshot Repository</name>
-      <layout>default</layout>
-      <url>http://snapshots.jboss.org/maven2/</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-  <!-- 
-    Eclipse settings have been removed from parent. This needs to be
-    done via an eclipse profile.
-    http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4085896#4085896 
-    -->
-  <profiles>
-    <profile>
-      <id>default</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <properties>
-        <profile.outputDirectory>target/classes</profile.outputDirectory>
-        <profile.testOutputDirectory>target/tests-classes</profile.testOutputDirectory>
-      </properties>
-    </profile>
-    
-    <profile>
-      <id>eclipse</id>
-      <properties>
-        <profile.outputDirectory>eclipse-target/classes</profile.outputDirectory>
-        <profile.testOutputDirectory>eclipse-target/tests-classes</profile.testOutputDirectory>
-      </properties>
-    </profile>
-  </profiles>
-
-  <!-- Compile Dependencies -->
-  <dependencies>
-
-    <dependency>
-      <groupId>org.jboss.metadata</groupId>
-      <artifactId>jboss-metadata-common</artifactId>
-      <version>2.0.0.Alpha8</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.metadata</groupId>
-      <artifactId>jboss-metadata-common</artifactId>
-      <version>2.0.0.Alpha8</version>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    
-    <!-- Test Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.4</version>
-      <scope>test</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.test</groupId>
-      <artifactId>jboss-test</artifactId>
-      <version>1.1.4.GA</version>
-      <scope>test</scope>
-    </dependency>
-
-  </dependencies>
-
-</project>
\ No newline at end of file

Copied: projects/metadata/rar/tags/2.0.0.Alpha5/pom.xml (from rev 99457, projects/metadata/rar/trunk/pom.xml)
===================================================================
--- projects/metadata/rar/tags/2.0.0.Alpha5/pom.xml	                        (rev 0)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/pom.xml	2010-01-15 11:44:26 UTC (rev 99458)
@@ -0,0 +1,125 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.jboss</groupId>
+    <artifactId>jboss-parent</artifactId>
+    <version>4.0.CR1</version>
+  </parent>
+  <groupId>org.jboss.metadata</groupId>
+  <artifactId>jboss-metadata-rar</artifactId>
+  <packaging>jar</packaging>
+  <version>2.0.0.Alpha5</version>
+  <name>JBoss Metadata RAR</name>
+  <url>http://www.jboss.org</url>
+  <description>The common JavaEE metadata classes</description>
+  <scm>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/metadata/rar/tags/2.0.0.Alpha5</connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/metadata/rar/tags/2.0.0.Alpha5</developerConnection>
+  </scm>
+
+  <build>
+    <outputDirectory>${profile.outputDirectory}</outputDirectory>
+    <testOutputDirectory>${profile.testOutputDirectory}</testOutputDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.4.3</version>
+        <configuration>
+          <printSummary>true</printSummary>
+          <disableXmlReport>false</disableXmlReport>
+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
+           <testFailureIgnore>false</testFailureIgnore>
+          <includes>
+            <include>**/*TestCase.java</include>
+          </includes>
+        </configuration>
+      </plugin>      
+    </plugins>
+  </build>
+
+  <repositories>
+    <repository>
+      <id>repository.jboss.org</id>
+      <name>JBoss Repository</name>
+      <layout>default</layout>
+      <url>http://repository.jboss.org/maven2/</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>snapshots.jboss.org</id>
+      <name>JBoss Snapshot Repository</name>
+      <layout>default</layout>
+      <url>http://snapshots.jboss.org/maven2/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
+  <!-- 
+    Eclipse settings have been removed from parent. This needs to be
+    done via an eclipse profile.
+    http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4085896#4085896 
+    -->
+  <profiles>
+    <profile>
+      <id>default</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <profile.outputDirectory>target/classes</profile.outputDirectory>
+        <profile.testOutputDirectory>target/tests-classes</profile.testOutputDirectory>
+      </properties>
+    </profile>
+    
+    <profile>
+      <id>eclipse</id>
+      <properties>
+        <profile.outputDirectory>eclipse-target/classes</profile.outputDirectory>
+        <profile.testOutputDirectory>eclipse-target/tests-classes</profile.testOutputDirectory>
+      </properties>
+    </profile>
+  </profiles>
+
+  <!-- Compile Dependencies -->
+  <dependencies>
+
+    <dependency>
+      <groupId>org.jboss.metadata</groupId>
+      <artifactId>jboss-metadata-common</artifactId>
+      <version>2.0.0.Alpha8</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jboss.metadata</groupId>
+      <artifactId>jboss-metadata-common</artifactId>
+      <version>2.0.0.Alpha8</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    
+    <!-- Test Dependencies -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.4</version>
+      <scope>test</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.jboss.test</groupId>
+      <artifactId>jboss-test</artifactId>
+      <version>1.1.4.GA</version>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+
+</project>
\ No newline at end of file

Deleted: projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java
===================================================================
--- projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java	2010-01-14 09:38:49 UTC (rev 99395)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -1,236 +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.metadata.rar.spec;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
-
-import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
-
-
-/**
- * Connector meta data
- *
- * @author <a href="mailto:adrian at jboss.com">Adrian Brock</a>
- * @author Jeff Zhang
- * @version $Revision: 83806 $
- */
-public class ConnectorMetaData extends IdMetaDataImplWithDescriptionGroup
-{
-   private static final long serialVersionUID = 7047130842894140222L;
-
-   private String dtdPublicId;
-   private String dtdSystemId;
-   /** The version */
-   private String version;
-
-   /** The vendor name */
-   private String vendorName;
-
-   /** The eis type */
-   private String eisType;
-
-   /** The resource adapter version */
-   private String raVersion;
-
-   /** The license */
-   private LicenseMetaData lmd;
-   
-   private ResourceAdapterMetaData ra;
-
-   /**
-    * Callback for the DTD information
-    * @param root
-    * @param publicId
-    * @param systemId
-    */
-   @XmlTransient
-   public void setDTD(String root, String publicId, String systemId)
-   {
-      this.dtdPublicId = publicId;
-      this.dtdSystemId = systemId;
-   }
-   /**
-    * Get the DTD public id if one was seen
-    * @return the value of the web.xml dtd public id
-    */
-   @XmlTransient
-   public String getDtdPublicId()
-   {
-      return dtdPublicId;
-   }
-   /**
-    * Get the DTD system id if one was seen
-    * @return the value of the web.xml dtd system id
-    */
-   @XmlTransient
-   public String getDtdSystemId()
-   {
-      return dtdSystemId;
-   }
-   /**
-    * Get the connector version
-    * 
-    * @return the connector version
-    */
-   public String getVersion()
-   {
-      return version;
-   }
-   /**
-    * Set the connector version
-    * 
-    * @param version the connector version
-    */
-   @XmlAttribute(required=true)
-   public void setVersion(String version)
-   {
-      this.version = version;
-   }
-
-   /**
-    * Is this a servlet 2.3 version application
-    * @return true if this is a javaee 2.3 version application
-    */
-   @XmlTransient
-   public boolean is10()
-   {
-      return dtdPublicId != null && dtdPublicId.equals("-//Sun Microsystems, Inc.//DTD Connector 1.0//EN"); 
-   }
-   @XmlTransient
-   public boolean is15()
-   {
-      return version != null && version.equals("1.5");
-   }
-   @XmlTransient
-   public boolean is16()
-   {
-      return version != null && version.equals("1.6");
-   }
-
-   /**
-    * Get the vendor name
-    * 
-    * @return the vendor name
-    */
-   public String getVendorName()
-   {
-      return vendorName;
-   }
-
-   /**
-    * Set the vendor name
-    * 
-    * @param vendorName the vendor name
-    */
-   @XmlElement()
-   public void setVendorName(String vendorName)
-   {
-      this.vendorName = vendorName;
-   }
-
-   /**
-    * Get the eis type
-    * 
-    * @return the eis type
-    */
-   public String getEISType()
-   {
-      return eisType;
-   }
-
-   /**
-    * Set the eis Type
-    * 
-    * @param eisType the eis type
-    */
-   @XmlElement(name="eis-type")
-   public void setEISType(String eisType)
-   {
-      this.eisType = eisType;
-   }
-
-   /**
-    * Get the resource adapter version
-    * 
-    * @return the resource adapter version
-    */
-   public String getRAVersion()
-   {
-      return raVersion;
-   }
-
-   /**
-    * Set the resource adapter version
-    * 
-    * @param version the resource adapter version
-    */
-   @XmlElement(name="resourceadapter-version")
-   public void setRAVersion(String version)
-   {
-      this.raVersion = version;
-   }
-
-   /**
-    * Get the license
-    * 
-    * @return the license
-    */
-   public LicenseMetaData getLicense()
-   {
-      return lmd;
-   }
-   /**
-    * Get the license
-    * 
-    * @return the license
-    */
-   public void setLicense(LicenseMetaData lmd)
-   {
-      this.lmd = lmd;
-   }
-   
-   @XmlElement(name="resourceadapter", required=true)
-   public void setRa(ResourceAdapterMetaData ra) throws Exception{
-      this.ra = ra;
-   }
-   public ResourceAdapterMetaData getRa() {
-      return ra;
-   }
-      
-   public String toString()
-   {
-      StringBuffer buffer = new StringBuffer();
-      buffer.append("ConnectorMetaData").append('@');
-      buffer.append(Integer.toHexString(System.identityHashCode(this)));
-      buffer.append("[version=").append(version);
-      buffer.append(" vendorName=").append(vendorName);
-      buffer.append(" eisType=").append(eisType);
-      buffer.append(" resourceAdapterVersion=").append(raVersion);
-      buffer.append(" license=").append(lmd);
-      buffer.append(" resourceadapter=").append(ra);
-      buffer.append(']');
-      return buffer.toString();
-   }
-
-}

Copied: projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java (from rev 99453, projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java)
===================================================================
--- projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java	                        (rev 0)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -0,0 +1,236 @@
+/*
+ * 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.metadata.rar.spec;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
+
+import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
+
+
+/**
+ * Connector meta data
+ *
+ * @author <a href="mailto:adrian at jboss.com">Adrian Brock</a>
+ * @author Jeff Zhang
+ * @version $Revision: 83806 $
+ */
+public class ConnectorMetaData extends IdMetaDataImplWithDescriptionGroup
+{
+   private static final long serialVersionUID = 7047130842894140222L;
+
+   private String dtdPublicId;
+   private String dtdSystemId;
+   /** The version */
+   private String version;
+
+   /** The vendor name */
+   private String vendorName;
+
+   /** The eis type */
+   private String eisType;
+
+   /** The resource adapter version */
+   String raVersion;
+
+   /** The license */
+   private LicenseMetaData lmd;
+   
+   ResourceAdapterMetaData ra;
+
+   /**
+    * Callback for the DTD information
+    * @param root
+    * @param publicId
+    * @param systemId
+    */
+   @XmlTransient
+   public void setDTD(String root, String publicId, String systemId)
+   {
+      this.dtdPublicId = publicId;
+      this.dtdSystemId = systemId;
+   }
+   /**
+    * Get the DTD public id if one was seen
+    * @return the value of the web.xml dtd public id
+    */
+   @XmlTransient
+   public String getDtdPublicId()
+   {
+      return dtdPublicId;
+   }
+   /**
+    * Get the DTD system id if one was seen
+    * @return the value of the web.xml dtd system id
+    */
+   @XmlTransient
+   public String getDtdSystemId()
+   {
+      return dtdSystemId;
+   }
+   /**
+    * Get the connector version
+    * 
+    * @return the connector version
+    */
+   public String getVersion()
+   {
+      return version;
+   }
+   /**
+    * Set the connector version
+    * 
+    * @param version the connector version
+    */
+   @XmlAttribute(required=true)
+   public void setVersion(String version)
+   {
+      this.version = version;
+   }
+
+   /**
+    * Is this a servlet 2.3 version application
+    * @return true if this is a javaee 2.3 version application
+    */
+   @XmlTransient
+   public boolean is10()
+   {
+      return dtdPublicId != null && dtdPublicId.equals("-//Sun Microsystems, Inc.//DTD Connector 1.0//EN"); 
+   }
+   @XmlTransient
+   public boolean is15()
+   {
+      return version != null && version.equals("1.5");
+   }
+   @XmlTransient
+   public boolean is16()
+   {
+      return version != null && version.equals("1.6");
+   }
+
+   /**
+    * Get the vendor name
+    * 
+    * @return the vendor name
+    */
+   public String getVendorName()
+   {
+      return vendorName;
+   }
+
+   /**
+    * Set the vendor name
+    * 
+    * @param vendorName the vendor name
+    */
+   @XmlElement()
+   public void setVendorName(String vendorName)
+   {
+      this.vendorName = vendorName;
+   }
+
+   /**
+    * Get the eis type
+    * 
+    * @return the eis type
+    */
+   public String getEISType()
+   {
+      return eisType;
+   }
+
+   /**
+    * Set the eis Type
+    * 
+    * @param eisType the eis type
+    */
+   @XmlElement(name="eis-type")
+   public void setEISType(String eisType)
+   {
+      this.eisType = eisType;
+   }
+
+   /**
+    * Get the resource adapter version
+    * 
+    * @return the resource adapter version
+    */
+   public String getRAVersion()
+   {
+      return raVersion;
+   }
+
+   /**
+    * Set the resource adapter version
+    * 
+    * @param version the resource adapter version
+    */
+   @XmlElement(name="resourceadapter-version")
+   public void setRAVersion(String version)
+   {
+      this.raVersion = version;
+   }
+
+   /**
+    * Get the license
+    * 
+    * @return the license
+    */
+   public LicenseMetaData getLicense()
+   {
+      return lmd;
+   }
+   /**
+    * Get the license
+    * 
+    * @return the license
+    */
+   public void setLicense(LicenseMetaData lmd)
+   {
+      this.lmd = lmd;
+   }
+   
+   @XmlElement(name="resourceadapter", required=true)
+   public void setRa(ResourceAdapterMetaData ra) throws Exception{
+      this.ra = ra;
+   }
+   public ResourceAdapterMetaData getRa() {
+      return ra;
+   }
+      
+   public String toString()
+   {
+      StringBuffer buffer = new StringBuffer();
+      buffer.append("ConnectorMetaData").append('@');
+      buffer.append(Integer.toHexString(System.identityHashCode(this)));
+      buffer.append("[version=").append(version);
+      buffer.append(" vendorName=").append(vendorName);
+      buffer.append(" eisType=").append(eisType);
+      buffer.append(" resourceAdapterVersion=").append(raVersion);
+      buffer.append(" license=").append(lmd);
+      buffer.append(" resourceadapter=").append(ra);
+      buffer.append(']');
+      return buffer.toString();
+   }
+
+}

Deleted: projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA10DTDMetaData.java
===================================================================
--- projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA10DTDMetaData.java	2010-01-14 09:38:49 UTC (rev 99395)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA10DTDMetaData.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -1,106 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, 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.metadata.rar.spec;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * Connector default namespace meta data
- *
- * @author Jeff Zhang
- * @version $Revision:$
- */
- at XmlRootElement(name="connector")
- at JBossXmlSchema(
-      ignoreUnresolvedFieldOrClass=false,
-      elementFormDefault=XmlNsForm.QUALIFIED,
-      normalizeSpace=true,
-      strict=false)
- at XmlType(name="connectorType", propOrder={"descriptionGroup", "vendorName", "specVersion", "EISType", "oldVersion", "license", "ra10"})
-public class JCA10DTDMetaData extends ConnectorMetaData
-{
-   private static final long serialVersionUID = 7047138842348140262L;
-   
-   /** The spec version */
-   private String specVersion;
-   
-   /** The version */
-   private String oldVersion;
-   
-   private RA10MetaData ra10;
-   
-   /**
-    * @return the specVersion
-    */
-   public String getSpecVersion()
-   {
-      return specVersion;
-   }
-
-   /**
-    * @param specVersion the specVersion to set
-    */
-   @XmlElement(name="spec-version")
-   public void setSpecVersion(String specVersion)
-   {
-      this.specVersion = specVersion;
-   }
-
-   /**
-    * @return the oldVersion
-    */
-   public String getOldVersion()
-   {
-      return oldVersion;
-   }
-
-   /**
-    * @param oldVersion the oldVersion to set
-    */
-   @XmlElement(name="version")
-   public void setOldVersion(String oldVersion)
-   {
-      this.oldVersion = oldVersion;
-   }
-
-   
-   @XmlElement(name="resourceadapter", required=true)
-   public void setRa10(RA10MetaData ra) throws Exception{
-      this.ra10 = ra;
-   }
-   public RA10MetaData getRa10() {
-      return ra10;
-   }
-   
-}
-
-

Copied: projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA10DTDMetaData.java (from rev 99455, projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA10DTDMetaData.java)
===================================================================
--- projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA10DTDMetaData.java	                        (rev 0)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA10DTDMetaData.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -0,0 +1,134 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.metadata.rar.spec;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * Connector default namespace meta data
+ *
+ * @author Jeff Zhang
+ * @version $Revision$
+ */
+ at XmlRootElement(name="connector")
+ at JBossXmlSchema(
+      ignoreUnresolvedFieldOrClass=false,
+      elementFormDefault=XmlNsForm.QUALIFIED,
+      normalizeSpace=true,
+      strict=false)
+ at XmlType(name="connectorType", propOrder={"descriptionGroup", "vendorName", "specVersion", "EISType", "oldVersion", "license", "ra10"})
+public class JCA10DTDMetaData extends ConnectorMetaData
+{
+   private static final long serialVersionUID = 7047138842348140262L;
+   
+   /** The spec version */
+   private String specVersion;
+   
+   /** The version */
+   private String oldVersion;
+   
+   private RA10MetaData ra10;
+   
+   /**
+    * @return the specVersion
+    */
+   public String getSpecVersion()
+   {
+      return specVersion;
+   }
+
+   /**
+    * @param specVersion the specVersion to set
+    */
+   @XmlElement(name="spec-version")
+   public void setSpecVersion(String specVersion)
+   {
+      this.specVersion = specVersion;
+   }
+
+   /**
+    * @return the oldVersion
+    */
+   public String getOldVersion()
+   {
+      return oldVersion;
+   }
+
+   /**
+    * @param oldVersion the oldVersion to set
+    */
+   @XmlElement(name="version")
+   public void setOldVersion(String oldVersion)
+   {
+      this.oldVersion = oldVersion;
+      this.raVersion = oldVersion;
+   }
+
+   
+   @XmlElement(name="resourceadapter", required=true)
+   public void setRa10(RA10MetaData ra10) throws Exception{
+      this.ra10 = ra10;
+      if (ra == null)
+      {
+         ra = new ResourceAdapterMetaData();
+      }
+      ra.setSecurityPermissions(ra10.getSecurityPermissions());
+      if (ra.getOutboundRa() == null)
+      {
+         ra.setOutboundRa(new OutboundRaMetaData());
+      }
+      ra.getOutboundRa().setAuthMechanisms(ra10.getAuthMechanisms());
+      ra.getOutboundRa().setTransSupport(ra10.getTransSupport());
+      ra.getOutboundRa().setReAuthSupport(ra10.isReAuthSupport());
+      if (ra.getOutboundRa().getConDefs() == null || ra.getOutboundRa().getConDefs().size() == 0)
+      {
+         ConnectionDefinitionMetaData cdm = new ConnectionDefinitionMetaData();
+         ra.getOutboundRa().setConDefs(new ArrayList<ConnectionDefinitionMetaData>());
+         ra.getOutboundRa().getConDefs().add(cdm);
+      }
+      ConnectionDefinitionMetaData cdmd = ra.getOutboundRa().getConDefs().get(0);
+      cdmd.setManagedConnectionFactoryClass(ra10.getManagedConnectionFactoryClass());
+      cdmd.setConnectionFactoryInterfaceClass(ra10.getConnectionFactoryInterfaceClass());
+      cdmd.setConnectionFactoryImplementationClass(ra10.getConnectionFactoryImplementationClass());
+      cdmd.setConnectionInterfaceClass(ra10.getConnectionInterfaceClass());
+      cdmd.setConnectionImplementationClass(ra10.getConnectionImplementationClass());
+      cdmd.setConfigProps(ra10.getConfigProps());
+   }
+   
+   public RA10MetaData getRa10() {
+      return ra10;
+   }
+   
+}
+
+

Deleted: projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA15DTDMetaData.java
===================================================================
--- projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA15DTDMetaData.java	2010-01-14 09:38:49 UTC (rev 99395)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA15DTDMetaData.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -1,52 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, 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.metadata.rar.spec;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * Connector default namespace meta data
- *
- * @author Jeff Zhang
- * @version $Revision:$
- */
- at XmlRootElement(name="connector")
- at JBossXmlSchema(
-      ignoreUnresolvedFieldOrClass=false,
-      elementFormDefault=XmlNsForm.QUALIFIED,
-      normalizeSpace=true,
-      strict=false)
- at XmlType(name="connectorType", propOrder={"descriptionGroup", "vendorName", "EISType", "RAVersion", "license", "ra"})
-public class JCA15DTDMetaData extends ConnectorMetaData
-{
-   private static final long serialVersionUID = 7047138842344140262L;
-}

Copied: projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA15DTDMetaData.java (from rev 99455, projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA15DTDMetaData.java)
===================================================================
--- projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA15DTDMetaData.java	                        (rev 0)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA15DTDMetaData.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.metadata.rar.spec;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * Connector default namespace meta data
+ *
+ * @author Jeff Zhang
+ * @version $Revision$
+ */
+ at XmlRootElement(name="connector")
+ at JBossXmlSchema(
+      ignoreUnresolvedFieldOrClass=false,
+      elementFormDefault=XmlNsForm.QUALIFIED,
+      normalizeSpace=true,
+      strict=false)
+ at XmlType(name="connectorType", propOrder={"descriptionGroup", "vendorName", "EISType", "RAVersion", "license", "ra"})
+public class JCA15DTDMetaData extends ConnectorMetaData
+{
+   private static final long serialVersionUID = 7047138842344140262L;
+}

Deleted: projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA15DefaultNSMetaData.java
===================================================================
--- projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA15DefaultNSMetaData.java	2010-01-14 09:38:49 UTC (rev 99395)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA15DefaultNSMetaData.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -1,52 +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.metadata.rar.spec;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * Connector default namespace meta data
- *
- * @author Jeff Zhang
- * @version $Revision:$
- */
- at XmlRootElement(name="connector")
- at JBossXmlSchema(
-      ignoreUnresolvedFieldOrClass=false,
-      elementFormDefault=XmlNsForm.QUALIFIED,
-      normalizeSpace=true,
-      strict=false)
- at XmlType(name="connectorType", propOrder={"descriptionGroup", "vendorName", "EISType", "RAVersion", "license", "ra"})
-public class JCA15DefaultNSMetaData extends ConnectorMetaData
-{
-   private static final long serialVersionUID = 7047138842344140262L;
-}

Copied: projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA15DefaultNSMetaData.java (from rev 99455, projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA15DefaultNSMetaData.java)
===================================================================
--- projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA15DefaultNSMetaData.java	                        (rev 0)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA15DefaultNSMetaData.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -0,0 +1,52 @@
+/*
+ * 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.metadata.rar.spec;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * Connector default namespace meta data
+ *
+ * @author Jeff Zhang
+ * @version $Revision$
+ */
+ at XmlRootElement(name="connector")
+ at JBossXmlSchema(
+      ignoreUnresolvedFieldOrClass=false,
+      elementFormDefault=XmlNsForm.QUALIFIED,
+      normalizeSpace=true,
+      strict=false)
+ at XmlType(name="connectorType", propOrder={"descriptionGroup", "vendorName", "EISType", "RAVersion", "license", "ra"})
+public class JCA15DefaultNSMetaData extends ConnectorMetaData
+{
+   private static final long serialVersionUID = 7047138842344140262L;
+}

Deleted: projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA15MetaData.java
===================================================================
--- projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA15MetaData.java	2010-01-14 09:38:49 UTC (rev 99395)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA15MetaData.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -1,48 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, 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.metadata.rar.spec;
-
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * JCA 1.5 meta data
- *
- * @author Jeff Zhang
- * @version $Revision: 89782 $
- */
- at XmlRootElement(name="connector", namespace=JavaEEMetaDataConstants.J2EE_NS)
- at JBossXmlSchema(
-      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
-      ignoreUnresolvedFieldOrClass=false,
-      namespace=JavaEEMetaDataConstants.J2EE_NS,
-      elementFormDefault=XmlNsForm.QUALIFIED,
-      normalizeSpace=true)
- at XmlType(name="connectorType", propOrder={"descriptionGroup", "vendorName", "EISType", "RAVersion", "license", "ra"})
-public class JCA15MetaData extends ConnectorMetaData {
-   private static final long serialVersionUID = 7047132542344140262L;
-}

Copied: projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA15MetaData.java (from rev 99455, projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA15MetaData.java)
===================================================================
--- projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA15MetaData.java	                        (rev 0)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA15MetaData.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, 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.metadata.rar.spec;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * JCA 1.5 meta data
+ *
+ * @author Jeff Zhang
+ * @version $Revision$
+ */
+ at XmlRootElement(name="connector", namespace=JavaEEMetaDataConstants.J2EE_NS)
+ at JBossXmlSchema(
+      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
+      ignoreUnresolvedFieldOrClass=false,
+      namespace=JavaEEMetaDataConstants.J2EE_NS,
+      elementFormDefault=XmlNsForm.QUALIFIED,
+      normalizeSpace=true)
+ at XmlType(name="connectorType", propOrder={"descriptionGroup", "vendorName", "EISType", "RAVersion", "license", "ra"})
+public class JCA15MetaData extends ConnectorMetaData {
+   private static final long serialVersionUID = 7047132542344140262L;
+}

Deleted: projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16Base.java
===================================================================
--- projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16Base.java	2010-01-14 09:38:49 UTC (rev 99395)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16Base.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -1,89 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, 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.metadata.rar.spec;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * JCA 1.6 base meta data
- *
- * @author Jeff Zhang
- * @version $Revision: $
- */
-public class JCA16Base extends ConnectorMetaData
-{
-   private static final long serialVersionUID = 7047130842394140262L;
-   
-   private boolean metadataComplete;
-   private List<String> requiredWorkContexts;
-
-   private String moduleName;   
-   
-   public boolean isMetadataComplete() 
-   {
-      return metadataComplete;
-   }
-   
-   @XmlAttribute
-   public void setMetadataComplete(boolean metadataComplete) 
-   {
-      this.metadataComplete = metadataComplete;
-   }
-   
-   public List<String> getRequiredWorkContexts() 
-   {
-      return requiredWorkContexts;
-   }
-   
-   @XmlElement(name = "required-work-context")
-   public void setRequiredWorkContexts(List<String> requiredWorkContexts) 
-   {
-      this.requiredWorkContexts = requiredWorkContexts;
-   }
-   
-   /**
-    * @return the moduleName
-    */
-   public String getModuleName() 
-   {
-      return moduleName;
-   }
-   
-   /**
-    * @param moduleName the moduleName to set
-    */
-   @XmlElement(name = "module-name")
-   public void setModuleName(String moduleName) 
-   {
-      this.moduleName = moduleName;
-   }
-}

Copied: projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16Base.java (from rev 99455, projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16Base.java)
===================================================================
--- projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16Base.java	                        (rev 0)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16Base.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -0,0 +1,89 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.metadata.rar.spec;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * JCA 1.6 base meta data
+ *
+ * @author Jeff Zhang
+ * @version $Revision$
+ */
+public class JCA16Base extends ConnectorMetaData
+{
+   private static final long serialVersionUID = 7047130842394140262L;
+   
+   private boolean metadataComplete;
+   private List<String> requiredWorkContexts;
+
+   private String moduleName;   
+   
+   public boolean isMetadataComplete() 
+   {
+      return metadataComplete;
+   }
+   
+   @XmlAttribute
+   public void setMetadataComplete(boolean metadataComplete) 
+   {
+      this.metadataComplete = metadataComplete;
+   }
+   
+   public List<String> getRequiredWorkContexts() 
+   {
+      return requiredWorkContexts;
+   }
+   
+   @XmlElement(name = "required-work-context")
+   public void setRequiredWorkContexts(List<String> requiredWorkContexts) 
+   {
+      this.requiredWorkContexts = requiredWorkContexts;
+   }
+   
+   /**
+    * @return the moduleName
+    */
+   public String getModuleName() 
+   {
+      return moduleName;
+   }
+   
+   /**
+    * @param moduleName the moduleName to set
+    */
+   @XmlElement(name = "module-name")
+   public void setModuleName(String moduleName) 
+   {
+      this.moduleName = moduleName;
+   }
+}

Deleted: projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16DTDMetaData.java
===================================================================
--- projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16DTDMetaData.java	2010-01-14 09:38:49 UTC (rev 99395)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16DTDMetaData.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -1,52 +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.metadata.rar.spec;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * Connector default namespace meta data
- *
- * @author Jeff Zhang
- * @version $Revision:$
- */
- at XmlRootElement(name="connector")
- at JBossXmlSchema(
-      ignoreUnresolvedFieldOrClass=false,
-      elementFormDefault=XmlNsForm.QUALIFIED,
-      normalizeSpace=true,
-      strict=false)
- at XmlType(name="connectorType", propOrder={"moduleName", "descriptionGroup", "vendorName", "EISType", "RAVersion", "license", "ra", "requiredWorkContexts"})
-public class JCA16DTDMetaData extends JCA16Base
-{
-   private static final long serialVersionUID = 7047130842344140262L;
-}

Copied: projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16DTDMetaData.java (from rev 99455, projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16DTDMetaData.java)
===================================================================
--- projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16DTDMetaData.java	                        (rev 0)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16DTDMetaData.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -0,0 +1,52 @@
+/*
+ * 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.metadata.rar.spec;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * Connector default namespace meta data
+ *
+ * @author Jeff Zhang
+ * @version $Revision$
+ */
+ at XmlRootElement(name="connector")
+ at JBossXmlSchema(
+      ignoreUnresolvedFieldOrClass=false,
+      elementFormDefault=XmlNsForm.QUALIFIED,
+      normalizeSpace=true,
+      strict=false)
+ at XmlType(name="connectorType", propOrder={"moduleName", "descriptionGroup", "vendorName", "EISType", "RAVersion", "license", "ra", "requiredWorkContexts"})
+public class JCA16DTDMetaData extends JCA16Base
+{
+   private static final long serialVersionUID = 7047130842344140262L;
+}

Deleted: projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16DefaultNSMetaData.java
===================================================================
--- projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16DefaultNSMetaData.java	2010-01-14 09:38:49 UTC (rev 99395)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16DefaultNSMetaData.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -1,52 +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.metadata.rar.spec;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * Connector default namespace meta data
- *
- * @author Jeff Zhang
- * @version $Revision:$
- */
- at XmlRootElement(name="connector")
- at JBossXmlSchema(
-      ignoreUnresolvedFieldOrClass=false,
-      elementFormDefault=XmlNsForm.QUALIFIED,
-      normalizeSpace=true,
-      strict=false)
- at XmlType(name="connectorType", propOrder={"moduleName", "descriptionGroup", "vendorName", "EISType", "RAVersion", "license", "ra", "requiredWorkContexts"})
-public class JCA16DefaultNSMetaData extends JCA16Base
-{
-   private static final long serialVersionUID = 7047130842344140262L;
-}

Copied: projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16DefaultNSMetaData.java (from rev 99455, projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16DefaultNSMetaData.java)
===================================================================
--- projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16DefaultNSMetaData.java	                        (rev 0)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16DefaultNSMetaData.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -0,0 +1,52 @@
+/*
+ * 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.metadata.rar.spec;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * Connector default namespace meta data
+ *
+ * @author Jeff Zhang
+ * @version $Revision$
+ */
+ at XmlRootElement(name="connector")
+ at JBossXmlSchema(
+      ignoreUnresolvedFieldOrClass=false,
+      elementFormDefault=XmlNsForm.QUALIFIED,
+      normalizeSpace=true,
+      strict=false)
+ at XmlType(name="connectorType", propOrder={"moduleName", "descriptionGroup", "vendorName", "EISType", "RAVersion", "license", "ra", "requiredWorkContexts"})
+public class JCA16DefaultNSMetaData extends JCA16Base
+{
+   private static final long serialVersionUID = 7047130842344140262L;
+}

Deleted: projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16MetaData.java
===================================================================
--- projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16MetaData.java	2010-01-14 09:38:49 UTC (rev 99395)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16MetaData.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -1,54 +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.metadata.rar.spec;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * Connector meta data
- *
- * @author Jeff Zhang
- * @version $Revision: 83806 $
- */
- at XmlRootElement(name="connector", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
- at JBossXmlSchema(
-      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
-      ignoreUnresolvedFieldOrClass=false,
-      namespace=JavaEEMetaDataConstants.JAVAEE_NS,
-      elementFormDefault=XmlNsForm.QUALIFIED,
-      normalizeSpace=true)
- at XmlType(name="connectorType", propOrder={"moduleName", "descriptionGroup", "vendorName", "EISType", "RAVersion", "license", "ra", "requiredWorkContexts"})
-public class JCA16MetaData extends JCA16Base
-{
-   private static final long serialVersionUID = 7047130842344140262L;
-
-}

Copied: projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16MetaData.java (from rev 99455, projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16MetaData.java)
===================================================================
--- projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16MetaData.java	                        (rev 0)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/JCA16MetaData.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -0,0 +1,54 @@
+/*
+ * 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.metadata.rar.spec;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * Connector meta data
+ *
+ * @author Jeff Zhang
+ * @version $Revision$
+ */
+ at XmlRootElement(name="connector", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
+ at JBossXmlSchema(
+      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
+      ignoreUnresolvedFieldOrClass=false,
+      namespace=JavaEEMetaDataConstants.JAVAEE_NS,
+      elementFormDefault=XmlNsForm.QUALIFIED,
+      normalizeSpace=true)
+ at XmlType(name="connectorType", propOrder={"moduleName", "descriptionGroup", "vendorName", "EISType", "RAVersion", "license", "ra", "requiredWorkContexts"})
+public class JCA16MetaData extends JCA16Base
+{
+   private static final long serialVersionUID = 7047130842344140262L;
+
+}

Deleted: projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/RA10MetaData.java
===================================================================
--- projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/RA10MetaData.java	2010-01-14 09:38:49 UTC (rev 99395)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/RA10MetaData.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -1,232 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, 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.metadata.rar.spec;
-
-import java.util.List;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.jboss.metadata.javaee.support.IdMetaDataImpl;
-
-/**
- * Resource Adapter 1.0 meta data
- *
- * @author Jeff Zhang
- * @version $Revision: $
- */
- at XmlType(name="connection-definitionType", 
-        propOrder={"managedConnectionFactoryClass","connectionFactoryInterfaceClass",
-                   "connectionFactoryImplementationClass", "connectionInterfaceClass", "connectionImplementationClass", 
-                   "transSupport", "configProps", "authMechanisms",
-                   "reAuthSupport", "securityPermissions"})
-public class RA10MetaData  extends IdMetaDataImpl
-{
-   private static final long serialVersionUID = -138227135002730221L;
-   
-   /** The managed connection factory class */
-   private String managedConnectionFactoryClass;
-
-   /** The connector metadata */
-   private List<ConfigPropertyMetaData> configProps;
-
-   /** The connection factory interface class */
-   private String connectionFactoryInterfaceClass;
-
-   /** The connection factory implementation class */
-   private String connectionFactoryImplementationClass;
-
-   /** The connection interface class */
-   private String connectionInterfaceClass;
-
-   /** The connection implementation class */
-   private String connectionImplementationClass;
-   
-   private TransactionSupportMetaData transSupport;
-   private List<AuthenticationMechanismMetaData> authMechanisms;
-   private boolean reAuthSupport;
-   private List<SecurityPermissionMetaData> securityPermissions;
-
-   
-   /**
-    * Get the managed connection factory class
-    * 
-    * @return the managed connection factory class
-    */
-   public String getManagedConnectionFactoryClass()
-   {
-      return managedConnectionFactoryClass;
-   }
-
-   /**
-    * Set the managed connection factory class
-    * 
-    * @param managedConnectionFactoryClass the class name
-    */
-   @XmlElement(name="managedconnectionfactory-class", required=true)
-   public void setManagedConnectionFactoryClass(String managedConnectionFactoryClass)
-   {
-      this.managedConnectionFactoryClass = managedConnectionFactoryClass;
-   }
-   
-   @XmlElement(name="config-property")
-   public void setConfigProps(List<ConfigPropertyMetaData> configProps) {
-      this.configProps = configProps;
-   }
-
-   public List<ConfigPropertyMetaData> getConfigProps() {
-      return configProps;
-   }
-   /**
-    * Get the connection factory interface class
-    * 
-    * @return the connection factory interface class
-    */
-   public String getConnectionFactoryInterfaceClass()
-   {
-      return connectionFactoryInterfaceClass;
-   }
-
-   /**
-    * Set the connection factory interface class
-    * 
-    * @param connectionFactoryInterfaceClass the class name
-    */
-   @XmlElement(name="connectionfactory-interface", required=true)
-   public void setConnectionFactoryInterfaceClass(String connectionFactoryInterfaceClass)
-   {
-      this.connectionFactoryInterfaceClass = connectionFactoryInterfaceClass;
-   }
-
-   /**
-    * Get the connection factory implementation class
-    * 
-    * @return the connection factory implementation class
-    */
-   public String getConnectionFactoryImplementationClass()
-   {
-      return connectionFactoryImplementationClass;
-   }
-
-   /**
-    * Set the connection factory implementation class
-    * 
-    * @param connectionFactoryImplementationClass the class name
-    */
-   @XmlElement(name="connectionfactory-impl-class", required=true)
-   public void setConnectionFactoryImplementationClass(String connectionFactoryImplementationClass)
-   {
-      this.connectionFactoryImplementationClass = connectionFactoryImplementationClass;
-   }
-
-   /**
-    * Get the connection interface class
-    * 
-    * @return the connection interface class
-    */
-   public String getConnectionInterfaceClass()
-   {
-      return connectionInterfaceClass;
-   }
-
-   /**
-    * Set the connection interface class
-    * 
-    * @param connectionInterfaceClass the class name
-    */
-   @XmlElement(name="connection-interface", required=true)
-   public void setConnectionInterfaceClass(String connectionInterfaceClass)
-   {
-      this.connectionInterfaceClass = connectionInterfaceClass;
-   }
-
-   /**
-    * Get the connection implementation class
-    * 
-    * @return the connection implementation class
-    */
-   public String getConnectionImplementationClass()
-   {
-      return connectionImplementationClass;
-   }
-
-   /**
-    * Set the connection implementation class
-    * 
-    * @param connectionImplementationClass the class name
-    */
-   @XmlElement(name="connection-impl-class", required=true)
-   public void setConnectionImplementationClass(String connectionImplementationClass)
-   {
-      this.connectionImplementationClass = connectionImplementationClass;
-   }
-   
-   @XmlElement(name="transaction-support")
-   public void setTransSupport(TransactionSupportMetaData transSupport) {
-      this.transSupport = transSupport;
-   }
-
-   public TransactionSupportMetaData getTransSupport() {
-      return transSupport;
-   }
-
-   @XmlElement(name="authentication-mechanism")
-   public void setAuthMechanisms(List<AuthenticationMechanismMetaData> authMechanisms) {
-      this.authMechanisms = authMechanisms;
-   }
-
-   public List<AuthenticationMechanismMetaData> getAuthMechanisms() {
-      return authMechanisms;
-   }
-
-   @XmlElement(name="reauthentication-support")
-   public void setReAuthSupport(boolean reAuthSupport) {
-      this.reAuthSupport = reAuthSupport;
-   }
-
-   public boolean isReAuthSupport() {
-      return reAuthSupport;
-   }
-   
-   @XmlElement(name="security-permission")
-   public void setSecurityPermissions(List<SecurityPermissionMetaData> securityPermissions) {
-      this.securityPermissions = securityPermissions;
-   }
-
-   public List<SecurityPermissionMetaData> getSecurityPermissions() {
-      return securityPermissions;
-   }
-
-   public String toString()
-   {
-      StringBuffer buffer = new StringBuffer();
-      buffer.append("ConnectionDefinitionMetaData").append('@');
-      buffer.append(Integer.toHexString(System.identityHashCode(this)));
-      buffer.append("[managedConnectionFactoryClass=").append(managedConnectionFactoryClass);
-      buffer.append(" connectionFactoryInterfaceClass=").append(connectionFactoryInterfaceClass);
-      buffer.append(" connectionFactoryImplementationClass=").append(connectionFactoryImplementationClass);
-      buffer.append(" connectionInterfaceClass=").append(connectionInterfaceClass);
-      buffer.append(" connectionImplementationClass=").append(connectionImplementationClass);
-      buffer.append(" properties=").append(configProps);
-      buffer.append(']');
-      return buffer.toString();
-   }
-}
-

Copied: projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/RA10MetaData.java (from rev 99455, projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/RA10MetaData.java)
===================================================================
--- projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/RA10MetaData.java	                        (rev 0)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/main/java/org/jboss/metadata/rar/spec/RA10MetaData.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -0,0 +1,232 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.metadata.rar.spec;
+
+import java.util.List;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jboss.metadata.javaee.support.IdMetaDataImpl;
+
+/**
+ * Resource Adapter 1.0 meta data
+ *
+ * @author Jeff Zhang
+ * @version $Revision$
+ */
+ at XmlType(name="connection-definitionType", 
+        propOrder={"managedConnectionFactoryClass","connectionFactoryInterfaceClass",
+                   "connectionFactoryImplementationClass", "connectionInterfaceClass", "connectionImplementationClass", 
+                   "transSupport", "configProps", "authMechanisms",
+                   "reAuthSupport", "securityPermissions"})
+public class RA10MetaData  extends IdMetaDataImpl
+{
+   private static final long serialVersionUID = -138227135002730221L;
+   
+   /** The managed connection factory class */
+   private String managedConnectionFactoryClass;
+
+   /** The connector metadata */
+   private List<ConfigPropertyMetaData> configProps;
+
+   /** The connection factory interface class */
+   private String connectionFactoryInterfaceClass;
+
+   /** The connection factory implementation class */
+   private String connectionFactoryImplementationClass;
+
+   /** The connection interface class */
+   private String connectionInterfaceClass;
+
+   /** The connection implementation class */
+   private String connectionImplementationClass;
+   
+   private TransactionSupportMetaData transSupport;
+   private List<AuthenticationMechanismMetaData> authMechanisms;
+   private boolean reAuthSupport;
+   private List<SecurityPermissionMetaData> securityPermissions;
+
+   
+   /**
+    * Get the managed connection factory class
+    * 
+    * @return the managed connection factory class
+    */
+   public String getManagedConnectionFactoryClass()
+   {
+      return managedConnectionFactoryClass;
+   }
+
+   /**
+    * Set the managed connection factory class
+    * 
+    * @param managedConnectionFactoryClass the class name
+    */
+   @XmlElement(name="managedconnectionfactory-class", required=true)
+   public void setManagedConnectionFactoryClass(String managedConnectionFactoryClass)
+   {
+      this.managedConnectionFactoryClass = managedConnectionFactoryClass;
+   }
+   
+   @XmlElement(name="config-property")
+   public void setConfigProps(List<ConfigPropertyMetaData> configProps) {
+      this.configProps = configProps;
+   }
+
+   public List<ConfigPropertyMetaData> getConfigProps() {
+      return configProps;
+   }
+   /**
+    * Get the connection factory interface class
+    * 
+    * @return the connection factory interface class
+    */
+   public String getConnectionFactoryInterfaceClass()
+   {
+      return connectionFactoryInterfaceClass;
+   }
+
+   /**
+    * Set the connection factory interface class
+    * 
+    * @param connectionFactoryInterfaceClass the class name
+    */
+   @XmlElement(name="connectionfactory-interface", required=true)
+   public void setConnectionFactoryInterfaceClass(String connectionFactoryInterfaceClass)
+   {
+      this.connectionFactoryInterfaceClass = connectionFactoryInterfaceClass;
+   }
+
+   /**
+    * Get the connection factory implementation class
+    * 
+    * @return the connection factory implementation class
+    */
+   public String getConnectionFactoryImplementationClass()
+   {
+      return connectionFactoryImplementationClass;
+   }
+
+   /**
+    * Set the connection factory implementation class
+    * 
+    * @param connectionFactoryImplementationClass the class name
+    */
+   @XmlElement(name="connectionfactory-impl-class", required=true)
+   public void setConnectionFactoryImplementationClass(String connectionFactoryImplementationClass)
+   {
+      this.connectionFactoryImplementationClass = connectionFactoryImplementationClass;
+   }
+
+   /**
+    * Get the connection interface class
+    * 
+    * @return the connection interface class
+    */
+   public String getConnectionInterfaceClass()
+   {
+      return connectionInterfaceClass;
+   }
+
+   /**
+    * Set the connection interface class
+    * 
+    * @param connectionInterfaceClass the class name
+    */
+   @XmlElement(name="connection-interface", required=true)
+   public void setConnectionInterfaceClass(String connectionInterfaceClass)
+   {
+      this.connectionInterfaceClass = connectionInterfaceClass;
+   }
+
+   /**
+    * Get the connection implementation class
+    * 
+    * @return the connection implementation class
+    */
+   public String getConnectionImplementationClass()
+   {
+      return connectionImplementationClass;
+   }
+
+   /**
+    * Set the connection implementation class
+    * 
+    * @param connectionImplementationClass the class name
+    */
+   @XmlElement(name="connection-impl-class", required=true)
+   public void setConnectionImplementationClass(String connectionImplementationClass)
+   {
+      this.connectionImplementationClass = connectionImplementationClass;
+   }
+   
+   @XmlElement(name="transaction-support")
+   public void setTransSupport(TransactionSupportMetaData transSupport) {
+      this.transSupport = transSupport;
+   }
+
+   public TransactionSupportMetaData getTransSupport() {
+      return transSupport;
+   }
+
+   @XmlElement(name="authentication-mechanism")
+   public void setAuthMechanisms(List<AuthenticationMechanismMetaData> authMechanisms) {
+      this.authMechanisms = authMechanisms;
+   }
+
+   public List<AuthenticationMechanismMetaData> getAuthMechanisms() {
+      return authMechanisms;
+   }
+
+   @XmlElement(name="reauthentication-support")
+   public void setReAuthSupport(boolean reAuthSupport) {
+      this.reAuthSupport = reAuthSupport;
+   }
+
+   public boolean isReAuthSupport() {
+      return reAuthSupport;
+   }
+   
+   @XmlElement(name="security-permission")
+   public void setSecurityPermissions(List<SecurityPermissionMetaData> securityPermissions) {
+      this.securityPermissions = securityPermissions;
+   }
+
+   public List<SecurityPermissionMetaData> getSecurityPermissions() {
+      return securityPermissions;
+   }
+
+   public String toString()
+   {
+      StringBuffer buffer = new StringBuffer();
+      buffer.append("ConnectionDefinitionMetaData").append('@');
+      buffer.append(Integer.toHexString(System.identityHashCode(this)));
+      buffer.append("[managedConnectionFactoryClass=").append(managedConnectionFactoryClass);
+      buffer.append(" connectionFactoryInterfaceClass=").append(connectionFactoryInterfaceClass);
+      buffer.append(" connectionFactoryImplementationClass=").append(connectionFactoryImplementationClass);
+      buffer.append(" connectionInterfaceClass=").append(connectionInterfaceClass);
+      buffer.append(" connectionImplementationClass=").append(connectionImplementationClass);
+      buffer.append(" properties=").append(configProps);
+      buffer.append(']');
+      return buffer.toString();
+   }
+}
+

Deleted: projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA10DTDUnitTestCase.java
===================================================================
--- projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA10DTDUnitTestCase.java	2010-01-14 09:38:49 UTC (rev 99395)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA10DTDUnitTestCase.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -1,90 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.metadata.rar;
-
-
-import org.jboss.metadata.rar.spec.ActivationspecMetaData;
-import org.jboss.metadata.rar.spec.RA10MetaData;
-import org.jboss.metadata.rar.spec.ConnectorMetaData;
-import org.jboss.metadata.rar.spec.JCA10DTDMetaData;
-import org.jboss.metadata.rar.spec.TransactionSupportMetaData;
-import org.jboss.test.metadata.common.MetaDataSchemaResolverFactory;
-import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
-import org.jboss.xb.binding.resolver.MutableSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
-
-/**
- * Test ResourceAdapter ra.xml metadata.
- *
- * @author Jeff Zhang
- * @version $Revision:$
- */
-public class RA10DTDUnitTestCase extends AbstractJavaEEEverythingTest
-{
-
-   public RA10DTDUnitTestCase(String name)
-   {
-      super(name);
-   }
-   
-   public void testEverything() throws Exception
-   {
-      JCA10DTDMetaData connector = (JCA10DTDMetaData)unmarshal();
-      assertNotNull(connector);
-      assertEverything(connector);
-   }
-   
-   protected ConnectorMetaData unmarshal() throws Exception
-   {
-      return unmarshal(ConnectorMetaData.class);
-   }
-   
-   protected void assertEverything(JCA10DTDMetaData connector) throws Exception
-   {
-      assertTrue(connector.getVendorName().startsWith("Red"));
-      assertTrue(connector.getEISType().startsWith("JMS"));
-      assertEquals(connector.getOldVersion(), "6.0");
-      assertEquals(connector.getSpecVersion(), "1.0");
-      assertNotNull(connector.getLicense());
-      assertTrue(connector.getLicense().getRequired());
-      
-      assertNotNull(connector.getRa10());
-      RA10MetaData ra10 = connector.getRa10();
-      assertTrue(ra10.getManagedConnectionFactoryClass().endsWith("JmsManagedConnectionFactory"));
-      assertEquals(ra10.getConfigProps().size(), 7);
-      assertEquals(ra10.getConfigProps().get(6).getName(), "UseTryLock");
-      assertTrue(ra10.getConnectionFactoryInterfaceClass().endsWith("JmsConnectionFactory"));
-      assertTrue(ra10.getConnectionFactoryImplementationClass().endsWith("JmsConnectionFactoryImpl"));
-      assertTrue(ra10.getConnectionInterfaceClass().endsWith("Session"));
-      assertTrue(ra10.getConnectionImplementationClass().endsWith("JmsSession"));
-
-      assertEquals(ra10.getTransSupport(), TransactionSupportMetaData.XATransaction);
-      assertNotNull(ra10.getAuthMechanisms().get(0));
-      assertEquals(ra10.getAuthMechanisms().get(0).getAuthenticationMechanismType(), "BasicPassword");
-      assertTrue(ra10.getAuthMechanisms().get(0).getCredentialInterfaceClass().endsWith("PasswordCredential"));
-      assertFalse(ra10.isReAuthSupport());
-      assertNotNull(ra10.getSecurityPermissions());
-      assertEquals(ra10.getSecurityPermissions().get(0).getSecurityPermissionSpec(), "sa");
-   }
-
-}
-

Copied: projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA10DTDUnitTestCase.java (from rev 99455, projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA10DTDUnitTestCase.java)
===================================================================
--- projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA10DTDUnitTestCase.java	                        (rev 0)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA10DTDUnitTestCase.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -0,0 +1,118 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.metadata.rar;
+
+
+import org.jboss.metadata.rar.spec.ActivationspecMetaData;
+import org.jboss.metadata.rar.spec.ConnectionDefinitionMetaData;
+import org.jboss.metadata.rar.spec.ConnectorMetaData;
+import org.jboss.metadata.rar.spec.JCA10DTDMetaData;
+import org.jboss.metadata.rar.spec.OutboundRaMetaData;
+import org.jboss.metadata.rar.spec.RA10MetaData;
+import org.jboss.metadata.rar.spec.TransactionSupportMetaData;
+
+import org.jboss.test.metadata.common.MetaDataSchemaResolverFactory;
+import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
+import org.jboss.xb.binding.resolver.MutableSchemaResolver;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+
+/**
+ * Test ResourceAdapter ra.xml metadata.
+ *
+ * @author Jeff Zhang
+ * @version $Revision:$
+ */
+public class RA10DTDUnitTestCase extends AbstractJavaEEEverythingTest
+{
+
+   public RA10DTDUnitTestCase(String name)
+   {
+      super(name);
+   }
+   
+   public void testEverything() throws Exception
+   {
+      JCA10DTDMetaData connector = (JCA10DTDMetaData)unmarshal();
+      assertNotNull(connector);
+      assertEverything(connector);
+   }
+   
+   protected ConnectorMetaData unmarshal() throws Exception
+   {
+      return unmarshal(ConnectorMetaData.class);
+   }
+   
+   protected void assertEverything(JCA10DTDMetaData connector) throws Exception
+   {
+      assertTrue(connector.is10());
+      assertTrue(connector.getVendorName().startsWith("Red"));
+      assertTrue(connector.getEISType().startsWith("JMS"));
+      assertEquals(connector.getOldVersion(), "6.0");
+      assertEquals(connector.getSpecVersion(), "1.0");
+      assertNotNull(connector.getLicense());
+      assertTrue(connector.getLicense().getRequired());
+      
+      assertNotNull(connector.getRa10());
+      RA10MetaData ra10 = connector.getRa10();
+      assertTrue(ra10.getManagedConnectionFactoryClass().endsWith("JmsManagedConnectionFactory"));
+      assertEquals(ra10.getConfigProps().size(), 7);
+      assertEquals(ra10.getConfigProps().get(6).getName(), "UseTryLock");
+      assertTrue(ra10.getConnectionFactoryInterfaceClass().endsWith("JmsConnectionFactory"));
+      assertTrue(ra10.getConnectionFactoryImplementationClass().endsWith("JmsConnectionFactoryImpl"));
+      assertTrue(ra10.getConnectionInterfaceClass().endsWith("Session"));
+      assertTrue(ra10.getConnectionImplementationClass().endsWith("JmsSession"));
+
+      assertEquals(ra10.getTransSupport(), TransactionSupportMetaData.XATransaction);
+      assertNotNull(ra10.getAuthMechanisms().get(0));
+      assertEquals(ra10.getAuthMechanisms().get(0).getAuthenticationMechanismType(), "BasicPassword");
+      assertTrue(ra10.getAuthMechanisms().get(0).getCredentialInterfaceClass().endsWith("PasswordCredential"));
+      assertFalse(ra10.isReAuthSupport());
+      assertNotNull(ra10.getSecurityPermissions());
+      assertEquals(ra10.getSecurityPermissions().get(0).getSecurityPermissionSpec(), "sa");
+      
+      //also test ra for 1.5/1.6 element tree compatible
+      assertNotNull(connector.getRa());
+      assertEquals(connector.getRAVersion(), "6.0");
+      
+      OutboundRaMetaData omd = connector.getRa().getOutboundRa();
+      assertNotNull(omd.getConDefs());
+      ConnectionDefinitionMetaData cdmd = omd.getConDefs().get(0);
+      
+      assertTrue(cdmd.getManagedConnectionFactoryClass().endsWith("JmsManagedConnectionFactory"));
+      assertEquals(cdmd.getConfigProps().size(), 7);
+      assertEquals(cdmd.getConfigProps().get(6).getName(), "UseTryLock");
+      assertTrue(cdmd.getConnectionFactoryInterfaceClass().endsWith("JmsConnectionFactory"));
+      assertTrue(cdmd.getConnectionFactoryImplementationClass().endsWith("JmsConnectionFactoryImpl"));
+      assertTrue(cdmd.getConnectionInterfaceClass().endsWith("Session"));
+      assertTrue(cdmd.getConnectionImplementationClass().endsWith("JmsSession"));
+
+      assertEquals(omd.getTransSupport(), TransactionSupportMetaData.XATransaction);
+      assertNotNull(omd.getAuthMechanisms().get(0));
+      assertEquals(omd.getAuthMechanisms().get(0).getAuthenticationMechanismType(), "BasicPassword");
+      assertTrue(omd.getAuthMechanisms().get(0).getCredentialInterfaceClass().endsWith("PasswordCredential"));
+      assertFalse(omd.isReAuthSupport());
+      assertNotNull(connector.getRa().getSecurityPermissions());
+      assertEquals(connector.getRa().getSecurityPermissions().get(0).getSecurityPermissionSpec(), "sa");
+   }
+
+}
+

Deleted: projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA15DTDUnitTestCase.java
===================================================================
--- projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA15DTDUnitTestCase.java	2010-01-14 09:38:49 UTC (rev 99395)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA15DTDUnitTestCase.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -1,80 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.metadata.rar;
-
-
-import org.jboss.metadata.rar.spec.ActivationspecMetaData;
-import org.jboss.metadata.rar.spec.ConnectorMetaData;
-import org.jboss.metadata.rar.spec.JCA15DTDMetaData;
-import org.jboss.test.metadata.common.MetaDataSchemaResolverFactory;
-import org.jboss.xb.binding.resolver.MutableSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
-
-/**
- * Test ResourceAdapter ra.xml metadata.
- *
- * @author Jeff Zhang
- * @version $Revision: 88255 $
- */
-public class RA15DTDUnitTestCase extends BaseRAUnitTestCase
-{
-   /*
-   public static SchemaBindingResolver initResolver()
-   {
-      MutableSchemaResolver resolver = MetaDataSchemaResolverFactory.createSchemaResolver();
-      resolver.mapLocationToClass("connector_1_5.dtd", JCA15DTDMetaData.class);
-      return resolver;
-   } 
-*/
-   public RA15DTDUnitTestCase(String name)
-   {
-      super(name);
-   }
-   
-   public void testEverything() throws Exception
-   {
-      ConnectorMetaData connector = unmarshal();
-      assertNotNull(connector);
-      assertEverything(connector);
-   }
-   
-   protected ConnectorMetaData unmarshal() throws Exception
-   {
-      return unmarshal(ConnectorMetaData.class);
-   }
-   
-   protected void assertEverything(ConnectorMetaData connector) throws Exception
-   {
-      assertDescriptionGroup("connector", connector.getDescriptionGroup());
-      assertGeneralInfo(connector);
-      assertRA(connector.getRa());
-   }
-   @Override
-   protected String getRAVersion()
-   {
-      return "5.0";
-   }
-   @Override
-   protected void assertConfigPropsInAS(ActivationspecMetaData as)
-   {
-   }
-}

Copied: projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA15DTDUnitTestCase.java (from rev 99455, projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA15DTDUnitTestCase.java)
===================================================================
--- projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA15DTDUnitTestCase.java	                        (rev 0)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA15DTDUnitTestCase.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -0,0 +1,81 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.metadata.rar;
+
+
+import org.jboss.metadata.rar.spec.ActivationspecMetaData;
+import org.jboss.metadata.rar.spec.ConnectorMetaData;
+import org.jboss.metadata.rar.spec.JCA15DTDMetaData;
+import org.jboss.test.metadata.common.MetaDataSchemaResolverFactory;
+import org.jboss.xb.binding.resolver.MutableSchemaResolver;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+
+/**
+ * Test ResourceAdapter ra.xml metadata.
+ *
+ * @author Jeff Zhang
+ * @version $Revision: 88255 $
+ */
+public class RA15DTDUnitTestCase extends BaseRAUnitTestCase
+{
+   /*
+   public static SchemaBindingResolver initResolver()
+   {
+      MutableSchemaResolver resolver = MetaDataSchemaResolverFactory.createSchemaResolver();
+      resolver.mapLocationToClass("connector_1_5.dtd", JCA15DTDMetaData.class);
+      return resolver;
+   } 
+*/
+   public RA15DTDUnitTestCase(String name)
+   {
+      super(name);
+   }
+   
+   public void testEverything() throws Exception
+   {
+      ConnectorMetaData connector = unmarshal();
+      assertNotNull(connector);
+      assertEverything(connector);
+   }
+   
+   protected ConnectorMetaData unmarshal() throws Exception
+   {
+      return unmarshal(ConnectorMetaData.class);
+   }
+   
+   protected void assertEverything(ConnectorMetaData connector) throws Exception
+   {
+      assertTrue(connector.is15());
+      assertDescriptionGroup("connector", connector.getDescriptionGroup());
+      assertGeneralInfo(connector);
+      assertRA(connector.getRa());
+   }
+   @Override
+   protected String getRAVersion()
+   {
+      return "5.0";
+   }
+   @Override
+   protected void assertConfigPropsInAS(ActivationspecMetaData as)
+   {
+   }
+}

Deleted: projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA15EverythingUnitTestCase.java
===================================================================
--- projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA15EverythingUnitTestCase.java	2010-01-14 09:38:49 UTC (rev 99395)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA15EverythingUnitTestCase.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -1,68 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.metadata.rar;
-
-
-import org.jboss.metadata.rar.spec.ActivationspecMetaData;
-import org.jboss.metadata.rar.spec.ConnectorMetaData;
-
-/**
- * Test ResourceAdapter ra.xml metadata.
- *
- * @author Jeff Zhang
- * @version $Revision: 88255 $
- */
-public class RA15EverythingUnitTestCase extends BaseRAUnitTestCase
-{
-   public RA15EverythingUnitTestCase(String name)
-   {
-      super(name);
-   }
-   
-   public void testEverything() throws Exception
-   {
-      ConnectorMetaData connector = unmarshal();
-      assertNotNull(connector);
-      assertEverything(connector);
-   }
-   
-   protected ConnectorMetaData unmarshal() throws Exception
-   {
-      return unmarshal(ConnectorMetaData.class);
-   }
-   
-   protected void assertEverything(ConnectorMetaData connector) throws Exception
-   {
-      assertDescriptionGroup("connector", connector.getDescriptionGroup());
-      assertGeneralInfo(connector);
-      assertRA(connector.getRa());
-   }
-   @Override
-   protected String getRAVersion()
-   {
-      return "5.0";
-   }
-   @Override
-   protected void assertConfigPropsInAS(ActivationspecMetaData as)
-   {
-   }
-}

Copied: projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA15EverythingUnitTestCase.java (from rev 99455, projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA15EverythingUnitTestCase.java)
===================================================================
--- projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA15EverythingUnitTestCase.java	                        (rev 0)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA15EverythingUnitTestCase.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -0,0 +1,69 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.metadata.rar;
+
+
+import org.jboss.metadata.rar.spec.ActivationspecMetaData;
+import org.jboss.metadata.rar.spec.ConnectorMetaData;
+
+/**
+ * Test ResourceAdapter ra.xml metadata.
+ *
+ * @author Jeff Zhang
+ * @version $Revision: 88255 $
+ */
+public class RA15EverythingUnitTestCase extends BaseRAUnitTestCase
+{
+   public RA15EverythingUnitTestCase(String name)
+   {
+      super(name);
+   }
+   
+   public void testEverything() throws Exception
+   {
+      ConnectorMetaData connector = unmarshal();
+      assertNotNull(connector);
+      assertEverything(connector);
+   }
+   
+   protected ConnectorMetaData unmarshal() throws Exception
+   {
+      return unmarshal(ConnectorMetaData.class);
+   }
+   
+   protected void assertEverything(ConnectorMetaData connector) throws Exception
+   {
+      assertTrue(connector.is15());
+      assertDescriptionGroup("connector", connector.getDescriptionGroup());
+      assertGeneralInfo(connector);
+      assertRA(connector.getRa());
+   }
+   @Override
+   protected String getRAVersion()
+   {
+      return "5.0";
+   }
+   @Override
+   protected void assertConfigPropsInAS(ActivationspecMetaData as)
+   {
+   }
+}

Deleted: projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA16DTDUnitTestCase.java
===================================================================
--- projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA16DTDUnitTestCase.java	2010-01-14 09:38:49 UTC (rev 99395)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA16DTDUnitTestCase.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -1,75 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.metadata.rar;
-
-import org.jboss.metadata.rar.spec.ActivationspecMetaData;
-import org.jboss.metadata.rar.spec.JCA16DTDMetaData;
-
-/**
- * Test ResourceAdapter ra.xml metadata.
- *
- * @author Jeff Zhang
- * @version $Revision: 89782 $
- */
-public class RA16DTDUnitTestCase extends BaseRAUnitTestCase
-{
-   public RA16DTDUnitTestCase(String name)
-   {
-      super(name);
-   }
-   
-   public void testEverything() throws Exception
-   {
-      JCA16DTDMetaData connector = unmarshal();
-      assertNotNull(connector);
-      assertEverything(connector);
-   }
-
-   protected JCA16DTDMetaData unmarshal() throws Exception
-   {
-      return unmarshal(JCA16DTDMetaData.class);
-   }
-   
-   protected void assertEverything(JCA16DTDMetaData connector) throws Exception
-   {
-      assertDescriptionGroup("connector", connector.getDescriptionGroup());
-      assertGeneralInfo(connector);
-      assertTrue(connector.isMetadataComplete());
-      assertRA(connector.getRa());
-      assertEquals(connector.getRequiredWorkContexts().size(), 2);
-      assertEquals(connector.getRequiredWorkContexts().get(0), "java.work.Context1");
-   }
-   
-   @Override
-   protected String getRAVersion()
-   {
-      return "6.0";
-   }
-   
-   @Override
-   protected void assertConfigPropsInAS(ActivationspecMetaData as)
-   {
-      assertNotNull(as.getConfigProps());
-      assertFalse(as.getConfigProps().isEmpty());
-   }
-
-}

Copied: projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA16DTDUnitTestCase.java (from rev 99455, projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA16DTDUnitTestCase.java)
===================================================================
--- projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA16DTDUnitTestCase.java	                        (rev 0)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA16DTDUnitTestCase.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -0,0 +1,76 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.metadata.rar;
+
+import org.jboss.metadata.rar.spec.ActivationspecMetaData;
+import org.jboss.metadata.rar.spec.JCA16DTDMetaData;
+
+/**
+ * Test ResourceAdapter ra.xml metadata.
+ *
+ * @author Jeff Zhang
+ * @version $Revision: 89782 $
+ */
+public class RA16DTDUnitTestCase extends BaseRAUnitTestCase
+{
+   public RA16DTDUnitTestCase(String name)
+   {
+      super(name);
+   }
+   
+   public void testEverything() throws Exception
+   {
+      JCA16DTDMetaData connector = unmarshal();
+      assertNotNull(connector);
+      assertEverything(connector);
+   }
+
+   protected JCA16DTDMetaData unmarshal() throws Exception
+   {
+      return unmarshal(JCA16DTDMetaData.class);
+   }
+   
+   protected void assertEverything(JCA16DTDMetaData connector) throws Exception
+   {
+      assertTrue(connector.is16());
+      assertDescriptionGroup("connector", connector.getDescriptionGroup());
+      assertGeneralInfo(connector);
+      assertTrue(connector.isMetadataComplete());
+      assertRA(connector.getRa());
+      assertEquals(connector.getRequiredWorkContexts().size(), 2);
+      assertEquals(connector.getRequiredWorkContexts().get(0), "java.work.Context1");
+   }
+   
+   @Override
+   protected String getRAVersion()
+   {
+      return "6.0";
+   }
+   
+   @Override
+   protected void assertConfigPropsInAS(ActivationspecMetaData as)
+   {
+      assertNotNull(as.getConfigProps());
+      assertFalse(as.getConfigProps().isEmpty());
+   }
+
+}

Deleted: projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java
===================================================================
--- projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java	2010-01-14 09:38:49 UTC (rev 99395)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -1,90 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.metadata.rar;
-
-import org.jboss.metadata.rar.spec.ActivationspecMetaData;
-import org.jboss.metadata.rar.spec.JCA16MetaData;
-
-/**
- * Test ResourceAdapter ra.xml metadata.
- *
- * @author Jeff Zhang
- * @version $Revision: 89782 $
- */
-public class RA16EverythingUnitTestCase extends BaseRAUnitTestCase
-{
-   public RA16EverythingUnitTestCase(String name)
-   {
-      super(name);
-   }
-   
-   public void testEverything() throws Exception
-   {
-      JCA16MetaData connector = unmarshal();
-      assertNotNull(connector);
-      assertEverything(connector);
-   }
-   
-   public void testMinimal() throws Exception
-   {
-      JCA16MetaData connector = unmarshal();
-      assertNotNull(connector);
-
-      assertNotNull(connector.getRa());
-      assertNull(connector.getRa().getRaClass());
-      assertNull(connector.getRa().getConfigProperty());
-      assertNull(connector.getRa().getOutboundRa());
-      assertNull(connector.getRa().getInboundRa());
-      assertNull(connector.getRa().getAdminObjects());
-      assertNull(connector.getRa().getSecurityPermissions());
-   }
-   
-   protected JCA16MetaData unmarshal() throws Exception
-   {
-      return unmarshal(JCA16MetaData.class);
-   }
-   
-   protected void assertEverything(JCA16MetaData connector) throws Exception
-   {
-      assertDescriptionGroup("connector", connector.getDescriptionGroup());
-      assertGeneralInfo(connector);
-      assertTrue(connector.isMetadataComplete());
-      assertRA(connector.getRa());
-      assertEquals(connector.getRequiredWorkContexts().size(), 2);
-      assertEquals(connector.getRequiredWorkContexts().get(0), "java.work.Context1");
-      assertEquals(connector.getModuleName(), "JCA module");
-   }
-   
-   @Override
-   protected String getRAVersion()
-   {
-      return "6.0";
-   }
-   
-   @Override
-   protected void assertConfigPropsInAS(ActivationspecMetaData as)
-   {
-      assertNotNull(as.getConfigProps());
-      assertFalse(as.getConfigProps().isEmpty());
-   }
-
-}

Copied: projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java (from rev 99455, projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java)
===================================================================
--- projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java	                        (rev 0)
+++ projects/metadata/rar/tags/2.0.0.Alpha5/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java	2010-01-15 11:44:26 UTC (rev 99458)
@@ -0,0 +1,91 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.metadata.rar;
+
+import org.jboss.metadata.rar.spec.ActivationspecMetaData;
+import org.jboss.metadata.rar.spec.JCA16MetaData;
+
+/**
+ * Test ResourceAdapter ra.xml metadata.
+ *
+ * @author Jeff Zhang
+ * @version $Revision: 89782 $
+ */
+public class RA16EverythingUnitTestCase extends BaseRAUnitTestCase
+{
+   public RA16EverythingUnitTestCase(String name)
+   {
+      super(name);
+   }
+   
+   public void testEverything() throws Exception
+   {
+      JCA16MetaData connector = unmarshal();
+      assertNotNull(connector);
+      assertEverything(connector);
+   }
+   
+   public void testMinimal() throws Exception
+   {
+      JCA16MetaData connector = unmarshal();
+      assertNotNull(connector);
+
+      assertNotNull(connector.getRa());
+      assertNull(connector.getRa().getRaClass());
+      assertNull(connector.getRa().getConfigProperty());
+      assertNull(connector.getRa().getOutboundRa());
+      assertNull(connector.getRa().getInboundRa());
+      assertNull(connector.getRa().getAdminObjects());
+      assertNull(connector.getRa().getSecurityPermissions());
+   }
+   
+   protected JCA16MetaData unmarshal() throws Exception
+   {
+      return unmarshal(JCA16MetaData.class);
+   }
+   
+   protected void assertEverything(JCA16MetaData connector) throws Exception
+   {
+      assertTrue(connector.is16());
+      assertDescriptionGroup("connector", connector.getDescriptionGroup());
+      assertGeneralInfo(connector);
+      assertTrue(connector.isMetadataComplete());
+      assertRA(connector.getRa());
+      assertEquals(connector.getRequiredWorkContexts().size(), 2);
+      assertEquals(connector.getRequiredWorkContexts().get(0), "java.work.Context1");
+      assertEquals(connector.getModuleName(), "JCA module");
+   }
+   
+   @Override
+   protected String getRAVersion()
+   {
+      return "6.0";
+   }
+   
+   @Override
+   protected void assertConfigPropsInAS(ActivationspecMetaData as)
+   {
+      assertNotNull(as.getConfigProps());
+      assertFalse(as.getConfigProps().isEmpty());
+   }
+
+}




More information about the jboss-cvs-commits mailing list