[jboss-cvs] JBossAS SVN: r108168 - in projects/jboss-jca/trunk/common/src: test/java/org/jboss/jca/common/metadata/ironjacamar and 1 other directories.

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

Author: maeste
Date: 2010-09-16 05:43:46 -0400 (Thu, 16 Sep 2010)
New Revision: 108168

Modified:
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/merge/DefaultConnectionDefinitionMatcher.java
   projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java
   projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-connection-definition-empty.xml
   projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-connection-definition-xa-empty.xml
Log:
JBJCA-420: fixing a copy/paste error

Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/merge/DefaultConnectionDefinitionMatcher.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/merge/DefaultConnectionDefinitionMatcher.java	2010-09-16 09:25:25 UTC (rev 108167)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/merge/DefaultConnectionDefinitionMatcher.java	2010-09-16 09:43:46 UTC (rev 108168)
@@ -42,7 +42,7 @@
    {
       if (!XsdString.isNull(left.getConnectionImplClass()))
       {
-         return left.getConnectionImplClass().getValue().trim().equals(right.getClassName().trim());
+         return left.getManagedConnectionFactoryClass().getValue().trim().equals(right.getClassName().trim());
       }
       else
       {

Modified: projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java
===================================================================
--- projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java	2010-09-16 09:25:25 UTC (rev 108167)
+++ projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java	2010-09-16 09:43:46 UTC (rev 108168)
@@ -43,6 +43,7 @@
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsNot.not;
 import static org.junit.Assert.assertThat;
+
 /**
  *
  * A IronJacamarParserTestCase.
@@ -402,7 +403,6 @@
             //attribute defaults
             assertThat(connDef.getPoolName(), new IsNull<String>());
             assertThat(connDef.getClassName(), new IsNull<String>());
-            assertThat(connDef.getClassName(), new IsNull<String>());
             assertThat(connDef.isEnabled(), is(true));
             assertThat(connDef.isUseJavaContext(), is(false));
 
@@ -465,7 +465,6 @@
             //attribute defaults
             assertThat(connDef.getPoolName(), new IsNull<String>());
             assertThat(connDef.getClassName(), new IsNull<String>());
-            assertThat(connDef.getClassName(), new IsNull<String>());
             assertThat(connDef.isEnabled(), is(true));
             assertThat(connDef.isUseJavaContext(), is(false));
 
@@ -525,7 +524,6 @@
             IronJacamar ij = parser.parse(is);
             //then
 
-
          }
          finally
          {

Modified: projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-connection-definition-empty.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-connection-definition-empty.xml	2010-09-16 09:25:25 UTC (rev 108167)
+++ projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-connection-definition-empty.xml	2010-09-16 09:43:46 UTC (rev 108168)
@@ -5,7 +5,6 @@
     <transaction-support>NoTransaction</transaction-support>
     <connection-definitions>
       <connection-definition jndi-name="aSAPXcess">
-        <config-property name="LogConfigFile">ASAP_SAP_1_0.xml</config-property>
         <pool>
         </pool>
         <security>

Modified: projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-connection-definition-xa-empty.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-connection-definition-xa-empty.xml	2010-09-16 09:25:25 UTC (rev 108167)
+++ projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-connection-definition-xa-empty.xml	2010-09-16 09:43:46 UTC (rev 108168)
@@ -5,7 +5,6 @@
     <transaction-support>NoTransaction</transaction-support>
     <connection-definitions>
       <connection-definition jndi-name="aSAPXcess">
-        <config-property name="LogConfigFile">ASAP_SAP_1_0.xml</config-property>
         <xa-pool>
         </xa-pool>
         <security>