[jbossws-commits] JBossWS SVN: r3791 - in branches/jbossws-2.0/integration: jboss50/src/main/java/org/jboss/wsf/container/jboss50 and 1 other directory.

Author: thomas.diesler(a)jboss.com Date: 2007-07-03 10:18:50 -0400 (Tue, 03 Jul 2007) New Revision: 3791 Modified: branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java Log: Adapt EJB3 meta databefore EJB21. Errorneously both may exist Modified: branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java =================================================================== --- branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-07-03 12:37:30 UTC (rev 3790) +++ branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-07-03 14:18:50 UTC (rev 3791) @@ -117,13 +117,13 @@ udi.metaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, di); udi.webappURL = udi.url; } + else if (udi.type == DeploymentType.JAXRPC_EJB3 || udi.type == DeploymentType.JAXWS_EJB3) + { + udi.metaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi); + } else if (di.metaData instanceof ApplicationMetaData) { udi.metaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, di); } - else if (udi.type == DeploymentType.JAXRPC_EJB3 || udi.type == DeploymentType.JAXWS_EJB3) - { - udi.metaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi); - } } } Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java =================================================================== --- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-03 12:37:30 UTC (rev 3790) +++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-03 14:18:50 UTC (rev 3791) @@ -108,13 +108,13 @@ udi.metaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, unit); udi.webappURL = udi.vfRoot.toURL(); } + else if (unit.getAttachment(Ejb3Deployment.class) != null) + { + udi.metaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi, unit); + } else if (unit.getAttachment(ApplicationMetaData.class) != null) { udi.metaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, unit); } - else if (unit.getAttachment(Ejb3Deployment.class) != null) - { - udi.metaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi, unit); - } } }