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

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

Author: maeste
Date: 2010-08-19 11:49:45 -0400 (Thu, 19 Aug 2010)
New Revision: 107688

Modified:
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataFactory.java
   projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/MetadataFactoryTestCase.java
Log:
JBJCA-400: removing static from methods of MetadataFactory

Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataFactory.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataFactory.java	2010-08-19 15:45:32 UTC (rev 107687)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataFactory.java	2010-08-19 15:49:45 UTC (rev 107688)
@@ -180,7 +180,7 @@
     * @throws IllegalArgumentException if version is't 1.0, 1.5 or 1.6
     * @throws Exception in case of error
     */
-   public static Connector mergeConnectorAndDs(DataSource ds, Connector connector)
+   public Connector mergeConnectorAndDs(DataSource ds, Connector connector)
       throws IllegalArgumentException, Exception
    {
       if (ds == null)

Modified: projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/MetadataFactoryTestCase.java
===================================================================
--- projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/MetadataFactoryTestCase.java	2010-08-19 15:45:32 UTC (rev 107687)
+++ projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/MetadataFactoryTestCase.java	2010-08-19 15:49:45 UTC (rev 107688)
@@ -100,7 +100,8 @@
                      "org.jboss.jca.adapters.jdbc.local.LocalManagedConnectionFactory", null)));
 
          //when
-         Connector merged = MetadataFactory.mergeConnectorAndDs(ds.getDatasource().get(0), connector);
+         MetadataFactory mf = new MetadataFactory();
+         Connector merged = mf.mergeConnectorAndDs(ds.getDatasource().get(0), connector);
          //then
          assertThat(merged, instanceOf(Connector15.class));
          assertThat(merged.getVersion(), is(Version.V_15));