[jboss-cvs] JBossAS SVN: r95273 - projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal.

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

Author: jeff.zhang
Date: 2009-10-21 06:08:11 -0400 (Wed, 21 Oct 2009)
New Revision: 95273

Modified:
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/Annotations.java
Log:
[JBJCA-176] use JCA16Base 

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/Annotations.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/Annotations.java	2009-10-21 09:40:01 UTC (rev 95272)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/Annotations.java	2009-10-21 10:08:11 UTC (rev 95273)
@@ -58,8 +58,7 @@
 import org.jboss.metadata.rar.spec.ConnectionDefinitionMetaData;
 import org.jboss.metadata.rar.spec.ConnectorMetaData;
 import org.jboss.metadata.rar.spec.InboundRaMetaData;
-import org.jboss.metadata.rar.spec.JCA16DTDMetaData;
-import org.jboss.metadata.rar.spec.JCA16DefaultNSMetaData;
+import org.jboss.metadata.rar.spec.JCA16Base;
 import org.jboss.metadata.rar.spec.JCA16MetaData;
 import org.jboss.metadata.rar.spec.LicenseMetaData;
 import org.jboss.metadata.rar.spec.MessageAdapterMetaData;
@@ -295,9 +294,9 @@
       {
          for (Class<? extends WorkContext> requiredWorkContext : requiredWorkContexts)
          {
-            if (md instanceof JCA16MetaData)
+            if (md instanceof JCA16Base)
             {
-               JCA16MetaData jmd = (JCA16MetaData)md;
+               JCA16Base jmd = (JCA16Base)md;
                if (jmd.getRequiredWorkContexts() == null)
                   jmd.setRequiredWorkContexts(new ArrayList<String>());
 
@@ -309,34 +308,6 @@
                   jmd.getRequiredWorkContexts().add(requiredWorkContext.getName());
                }
             }
-            else if (md instanceof JCA16DefaultNSMetaData)
-            {
-               JCA16DefaultNSMetaData jmd = (JCA16DefaultNSMetaData)md;
-               if (jmd.getRequiredWorkContexts() == null)
-                  jmd.setRequiredWorkContexts(new ArrayList<String>());
-
-               if (!jmd.getRequiredWorkContexts().contains(requiredWorkContext.getName()))
-               {
-                  if (trace)
-                     log.trace("RequiredWorkContext=" + requiredWorkContext.getName());
-
-                  jmd.getRequiredWorkContexts().add(requiredWorkContext.getName());
-               }
-            }
-            else if (md instanceof JCA16DTDMetaData)
-            {
-               JCA16DTDMetaData jmd = (JCA16DTDMetaData)md;
-               if (jmd.getRequiredWorkContexts() == null)
-                  jmd.setRequiredWorkContexts(new ArrayList<String>());
-
-               if (!jmd.getRequiredWorkContexts().contains(requiredWorkContext.getName()))
-               {
-                  if (trace)
-                     log.trace("RequiredWorkContext=" + requiredWorkContext.getName());
-
-                  jmd.getRequiredWorkContexts().add(requiredWorkContext.getName());
-               }
-            }
          }
       }