[jboss-cvs] JBossAS SVN: r66573 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers.

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

Author: thomas.diesler at jboss.com
Date: 2007-10-30 11:56:57 -0400 (Tue, 30 Oct 2007)
New Revision: 66573

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
Log:
Fix service-ref JNDI binding

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2007-10-30 15:53:53 UTC (rev 66572)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2007-10-30 15:56:57 UTC (rev 66573)
@@ -53,14 +53,12 @@
 import org.apache.tomcat.util.modeler.Registry;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.logging.Logger;
-import org.jboss.metadata.javaee.spec.Environment;
 import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
 import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
 import org.jboss.metadata.serviceref.ServiceReferenceHandler;
 import org.jboss.metadata.serviceref.VirtualFileAdaptor;
 import org.jboss.metadata.web.jboss.ClassLoadingMetaData;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
 import org.jboss.mx.util.MBeanServerLocator;
 import org.jboss.naming.NonSerializableFactory;
 import org.jboss.security.AuthorizationManager;
@@ -80,7 +78,6 @@
 import org.jboss.web.tomcat.service.session.AbstractJBossManager;
 import org.jboss.web.tomcat.service.session.ClusteringNotSupportedException;
 import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
-import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
 import org.omg.CORBA.ORB;
 
 /**
@@ -490,19 +487,13 @@
 
                // Bind <service-ref> elements
                UnifiedVirtualFile vfsRoot = new VirtualFileAdaptor(unit.getRoot());
-               Environment envRefGroup = injectionContainer.getEnvironmentRefGroup();
                ServiceReferencesMetaData serviceRefs = metaData.getServiceReferences();
                if (serviceRefs != null)
                {
                   for (ServiceReferenceMetaData sref : serviceRefs)
                   {
                      String refName = sref.getServiceRefName();
-                     ServiceReferenceMetaData injectedRef = envRefGroup.getServiceReferenceByName(refName);
-                     throw new RuntimeException("NYI");
-//                     if (injectedRef == null || injectedRef.isProcessed() == false)
-//                     {
-//                        new ServiceReferenceHandler().bindServiceRef(envCtx, refName, vfsRoot, loader, sref);
-//                     }
+                     new ServiceReferenceHandler().bindServiceRef(envCtx, refName, vfsRoot, loader, sref);
                   }
                }
             }