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

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

Author: wolfc
Date: 2006-11-15 03:16:12 -0500 (Wed, 15 Nov 2006)
New Revision: 58380

Modified:
   trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java
   trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java
Log:
hack to ignore EJB3 deployments

Modified: trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java	2006-11-15 06:27:50 UTC (rev 58379)
+++ trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java	2006-11-15 08:16:12 UTC (rev 58380)
@@ -86,6 +86,24 @@
          metaData = (ApplicationMetaData) root;
       else
          metaData = new ApplicationMetaData();
+      
+      String version = attrs.getValue(namespaceURI, "version");
+      // Wolf: somehow the namespace doesn't work
+      if(version == null)
+         version = attrs.getValue("", "version");
+      if(version != null)
+      {
+         log.info("version = " + version);
+         if(version.equals("3.0"))
+         {
+            metaData.setEjbVersion(3);
+            metaData.setEjbMinorVersion(0);
+            // make sure we don't get smacked later on
+            ejbVersion = 3;
+            ejbMinorVersion = 0;
+         }
+      }
+      
       return metaData;
    }
 
@@ -110,6 +128,11 @@
    {
       Object child = null;
 
+//      log.info("attrs.length = " + attrs.getLength());
+//      for(int i = 0; i < attrs.getLength(); i++)
+//      {
+//         log.info("attrs[" + i + "] : " + attrs.getURI(i) + " " + attrs.getLocalName(i) + " = " + attrs.getValue(i));
+//      }
       // Check version
       String version = attrs.getValue(namespaceURI, "version");
       if( version != null )

Modified: trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java	2006-11-15 06:27:50 UTC (rev 58379)
+++ trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java	2006-11-15 08:16:12 UTC (rev 58380)
@@ -99,7 +99,7 @@
    public void deploy(DeploymentUnit unit) throws DeploymentException
    {
       // make sure it's there is ejb-jar.xml
-      // TODO: also make sure it's ejb2.x module
+      // TODO: also make sure it's ejb2.x module (Wolf: added hack in parse)
       VirtualFile ejbjar = unit.getMetaDataFile("ejb-jar.xml");
       if (ejbjar == null)
       {
@@ -130,6 +130,10 @@
                                        ApplicationMetaData root)
       throws Exception
    {
+      // Wolf: hack to get to EJB3 deployer
+      if(root.getEjbVersion() >= 2)
+         return null;
+      
       String configPath = System.getProperty(ServerConfig.SERVER_CONFIG_URL);
       java.net.URL configUrl = new java.net.URL(configPath);
       VirtualFile stdJBoss = VFS.getVirtualFile(configUrl, "standardjboss.xml");