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

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

Author: thomas.diesler at jboss.com
Date: 2007-06-11 12:16:45 -0400 (Mon, 11 Jun 2007)
New Revision: 63454

Modified:
   trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java
Log:
Remove hack to get to EJB3 deployer

Modified: trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java	2007-06-11 15:59:42 UTC (rev 63453)
+++ trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java	2007-06-11 16:16:45 UTC (rev 63454)
@@ -131,9 +131,25 @@
       throws Exception
    {
       // Wolf: hack to get to EJB3 deployer
-      if(root.getEjbVersion() > 2)
-         return null;
+      //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
+//      
+//      Specifically, it hides <port-component> in
+//      
+//      <session>
+//        <ejb-name>WSEjbWebServiceRefTest2</ejb-name>
+//        <jndi-name>WSEjbWebServiceRefTest2</jndi-name>
+//        <home-jndi-name>WSEjbWebServiceRefTest2Home</home-jndi-name>
+//        <call-by-value>true</call-by-value>
+//        <port-component>
+//          <port-component-name>HelloBean</port-component-name>
+//          <port-component-uri>WSEjbWebServiceRefTest2/ejb</port-component-uri>
+//        </port-component>
+//      </session>
+      
       String configPath = System.getProperty(ServerConfig.SERVER_CONFIG_URL);
       java.net.URL configUrl = new java.net.URL(configPath);
       VirtualFile stdJBoss = VFS.getVirtualFile(configUrl, "standardjboss.xml");