[jboss-cvs] JBossAS SVN: r63704 - trunk/server/src/main/org/jboss/deployment.

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

Author: wolfc
Date: 2007-06-28 04:34:08 -0400 (Thu, 28 Jun 2007)
New Revision: 63704

Modified:
   trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java
Log:
Reinstanted hack, WSEjbWebServiceRefTest2 needs analysis (JBCTS-625), hack needs to removed with JBAS-4506

Modified: trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java	2007-06-28 01:17:34 UTC (rev 63703)
+++ trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java	2007-06-28 08:34:08 UTC (rev 63704)
@@ -131,8 +131,9 @@
       throws Exception
    {
       // Wolf: hack to get to EJB3 deployer
-      //if(root.getEjbVersion() > 2)
-      //   return null;
+      // FIXME: unify the deployers (JBAS-4506)
+      if(root.getEjbVersion() > 2)
+         return null;
       
 //      TDI: The above return condition is invalid IMHO, because EJB3 deployments may have a jboss.xml descriptor 
 //      It breaks /com/sun/ts/tests/webservices12/ejb/annotations/WSEjbWebServiceRefTest2
@@ -149,6 +150,9 @@
 //          <port-component-uri>WSEjbWebServiceRefTest2/ejb</port-component-uri>
 //        </port-component>
 //      </session>
+//      
+//      Wolf: jboss.xml descriptor is parsed in Ejb3Deployment.getMetaDataFomLib. In revision 61897 Heiko added
+//      parsing of post-component. After which you also added some extra code for port-component on generic ejb3.
       
       String configPath = System.getProperty(ServerConfig.SERVER_CONFIG_URL);
       java.net.URL configUrl = new java.net.URL(configPath);