<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">I saw some RestEasy-int commit that should probably be applied to this branch as well -- if not yet done.<div><br></div><div>----</div><div><br></div><div>Message: 5<br>Date: Thu, 22 Jul 2010 05:27:53 -0400<br>From: <a href="mailto:jboss-cvs-commits@lists.jboss.org">jboss-cvs-commits@lists.jboss.org</a><br>Subject: [jboss-cvs] JBossAS SVN: r107017 -<br><span class="Apple-tab-span" style="white-space: pre; "> </span>trunk/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers.<br><span class="Apple-tab-span" style="white-space: pre; "> </span><br>To: <a href="mailto:jboss-cvs-commits@lists.jboss.org">jboss-cvs-commits@lists.jboss.org</a><br>Message-ID:<br><span class="Apple-tab-span" style="white-space: pre; "> </span><<a href="mailto:201007220927.o6M9RrEL015390@svn01.web.mwc.hst.phx2.redhat.com">201007220927.o6M9RrEL015390@svn01.web.mwc.hst.phx2.redhat.com</a>><br>Content-Type: text/plain; charset=UTF-8<br><br>Author: <a href="mailto:richard.opalka@jboss.com">richard.opalka@jboss.com</a><br>Date: 2010-07-22 05:27:52 -0400 (Thu, 22 Jul 2010)<br>New Revision: 107017<br><br>Modified:<br> trunk/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyIntegrationDeployer.java<br>Log:<br>[JBAS-8234] fixing CCE<br><br>Modified: trunk/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyIntegrationDeployer.java<br>===================================================================<br>--- trunk/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyIntegrationDeployer.java<span class="Apple-tab-span" style="white-space: pre; "> </span>2010-07-22 09:02:39 UTC (rev 107016)<br>+++ trunk/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyIntegrationDeployer.java<span class="Apple-tab-span" style="white-space: pre; "> </span>2010-07-22 09:27:52 UTC (rev 107017)<br>@@ -146,7 +146,8 @@<br> {<br> Thread.currentThread().getContextClassLoader().loadClass(CDI_INJECTOR_FACTORY_CLASS);<br> // don't set this param if CDI is not in classpath<br>- if (((VFSDeploymentUnit) du).getMetaDataFile("beans.xml") != null)<br>+ final boolean isVFSDU = du instanceof VFSDeploymentUnit;<br>+ if (isVFSDU && ((VFSDeploymentUnit) du).getMetaDataFile("beans.xml") != null)<br> {<br> log.debug("***** Found CDI, adding injector factory class");<br> setContextParameter(webdata, "resteasy.injector.factory", CDI_INJECTOR_FACTORY_CLASS);<br><br><br></div><div><div><div>On Jul 22, 2010, at 4:32 PM, Brian Stansberry wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div>FYI, last night Jason created a branch for the M4 release.[1] Similar to <br>the M2 release, the final QE tasks for the release will be done on that <br>branch, with the expectation that the final M4 tag will be essentially <br>the same as the root of the branch.<br><br>The M4 release will probably come out early next week.<br><br>AS trunk is now open for normal development work toward AS 6.0 final.<br><br>[1] <a href="https://svn.jboss.org/repos/jbossas/branches/6.0.0.20100721-M4">https://svn.jboss.org/repos/jbossas/branches/6.0.0.20100721-M4</a><br>-- <br>Brian Stansberry<br>Lead, AS Clustering<br>JBoss by Red Hat<br>_______________________________________________<br>jboss-development mailing list<br><a href="mailto:jboss-development@lists.jboss.org">jboss-development@lists.jboss.org</a><br>https://lists.jboss.org/mailman/listinfo/jboss-development<br></div></blockquote></div><br></div></body></html>