Index: ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java =================================================================== --- ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java (revision 77769) +++ ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java (working copy) @@ -45,6 +45,7 @@ import org.jboss.ejb3.metadata.jpa.spec.PersistenceUnitsMetaData; import org.jboss.ejb3.pool.PoolFactoryRegistry; import org.jboss.ejb3.proxy.factory.RemoteProxyFactoryRegistry; +import org.jboss.ejb3.resolvers.MessageDestinationReferenceResolver; import org.jboss.jpa.resolvers.PersistenceUnitDependencyResolver; import org.jboss.kernel.Kernel; import org.jboss.kernel.spi.deployment.KernelDeployment; @@ -87,6 +88,8 @@ private boolean scanWars = false; private PersistenceUnitDependencyResolver persistenceUnitDependencyResolver; + + private MessageDestinationReferenceResolver messageDestinationReferenceResolver; public Ejb3Deployer() { @@ -179,6 +182,8 @@ scope.setDeployment(deployment); } deployment.setCacheFactoryRegistry(this.getCacheFactoryRegistry()); + // TODO: if the deployment becomes a proper MC bean, it'll get injected by MC. + deployment.setMessageDestinationReferenceResolver(messageDestinationReferenceResolver); deployment.setPersistenceManagerFactoryRegistry(this.getPersistenceManagerFactoryRegistry()); // TODO: if the deployment becomes a proper MC bean, it'll get injected by MC. deployment.setPersistenceUnitDependencyResolver(persistenceUnitDependencyResolver); @@ -245,6 +250,12 @@ return persistenceManagerFactoryRegistry; } + @Inject + public void setMessageDestinationReferenceResolver(MessageDestinationReferenceResolver resolver) + { + this.messageDestinationReferenceResolver = resolver; + } + public void setPersistenceManagerFactoryRegistry(PersistenceManagerFactoryRegistry persistenceManagerFactoryRegistry) { this.persistenceManagerFactoryRegistry = persistenceManagerFactoryRegistry; Index: ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml =================================================================== --- ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml (revision 77769) +++ ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml (working copy) @@ -4,7 +4,9 @@ EJB3 Deployers --> - + + +