[jboss-dev] M4 branched, AS trunk open

[Brian Stansberry]

I ported it to the M4 branch.

On 7/22/10 1:30 PM, Bill Burke wrote:
> Richard Opalka put it in.  Looks like a possible bug fix, looks pretty
> harmless.
>
> Brian Stansberry wrote:
>> The JIRA[1] is not closed and is marked for 6.0.0.Final, so I'm not
>> porting this unless Bill, you tell me you want it and Rajesh says it's
>> ok.
>>
>> [1] https://jira.jboss.org/browse/JBAS-8234
>>
>> On 7/22/10 10:26 AM, Bill Burke wrote:
>>> I didn't put this commit in, so don't know what it is
>>>
>>> Brian Stansberry wrote:
>>>> Richard,
>>>>
>>>> Does this need to go in M4?
>>>>
>>>> Rajesh,
>>>>
>>>> If it needs to go in and I port it to the release branch this morning,
>>>> will that screw things up for you guys?
>>>>
>>>>
>>>> On 7/22/10 9:43 AM, Ales Justin wrote:
>>>>> I saw some RestEasy-int commit that should probably be applied to this
>>>>> branch as well -- if not yet done.
>>>>>
>>>>> ----
>>>>>
>>>>> Message: 5
>>>>> Date: Thu, 22 Jul 2010 05:27:53 -0400
>>>>> From: jboss-cvs-commits at lists.jboss.org
>>>>> <mailto:jboss-cvs-commits at lists.jboss.org>
>>>>> Subject: [jboss-cvs] JBossAS SVN: r107017 -
>>>>> trunk/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers.
>>>>>
>>>>>
>>>>> To: jboss-cvs-commits at lists.jboss.org
>>>>> <mailto:jboss-cvs-commits at lists.jboss.org>
>>>>> Message-ID:
>>>>> <201007220927.o6M9RrEL015390 at svn01.web.mwc.hst.phx2.redhat.com
>>>>> <mailto:201007220927.o6M9RrEL015390 at svn01.web.mwc.hst.phx2.redhat.com>>
>>>>>
>>>>> Content-Type: text/plain; charset=UTF-8
>>>>>
>>>>> Author: richard.opalka at jboss.com<mailto:richard.opalka at jboss.com>
>>>>> Date: 2010-07-22 05:27:52 -0400 (Thu, 22 Jul 2010)
>>>>> New Revision: 107017
>>>>>
>>>>> Modified:
>>>>> trunk/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyIntegrationDeployer.java
>>>>>
>>>>> Log:
>>>>> [JBAS-8234] fixing CCE
>>>>>
>>>>> Modified:
>>>>> trunk/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyIntegrationDeployer.java
>>>>>
>>>>> ===================================================================
>>>>> ---
>>>>> trunk/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyIntegrationDeployer.java
>>>>>
>>>>> 2010-07-22 09:02:39 UTC (rev 107016)
>>>>> +++
>>>>> trunk/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyIntegrationDeployer.java
>>>>>
>>>>> 2010-07-22 09:27:52 UTC (rev 107017)
>>>>> @@ -146,7 +146,8 @@
>>>>> {
>>>>> Thread.currentThread().getContextClassLoader().loadClass(CDI_INJECTOR_FACTORY_CLASS);
>>>>>
>>>>> // don't set this param if CDI is not in classpath
>>>>> - if (((VFSDeploymentUnit) du).getMetaDataFile("beans.xml") != null)
>>>>> + final boolean isVFSDU = du instanceof VFSDeploymentUnit;
>>>>> + if (isVFSDU&& ((VFSDeploymentUnit) du).getMetaDataFile("beans.xml")
>>>>> != null)
>>>>> {
>>>>> log.debug("***** Found CDI, adding injector factory class");
>>>>> setContextParameter(webdata, "resteasy.injector.factory",
>>>>> CDI_INJECTOR_FACTORY_CLASS);
>>>>>
>>>>>
>>>>> On Jul 22, 2010, at 4:32 PM, Brian Stansberry wrote:
>>>>>
>>>>>> FYI, last night Jason created a branch for the M4 release.[1]
>>>>>> Similar to
>>>>>> the M2 release, the final QE tasks for the release will be done on
>>>>>> that
>>>>>> branch, with the expectation that the final M4 tag will be
>>>>>> essentially
>>>>>> the same as the root of the branch.
>>>>>>
>>>>>> The M4 release will probably come out early next week.
>>>>>>
>>>>>> AS trunk is now open for normal development work toward AS 6.0 final.
>>>>>>
>>>>>> [1] https://svn.jboss.org/repos/jbossas/branches/6.0.0.20100721-M4
>>>>>> --
>>>>>> Brian Stansberry
>>>>>> Lead, AS Clustering
>>>>>> JBoss by Red Hat
>>>>>> _______________________________________________
>>>>>> jboss-development mailing list
>>>>>> jboss-development at lists.jboss.org
>>>>>> <mailto:jboss-development at lists.jboss.org>
>>>>>> https://lists.jboss.org/mailman/listinfo/jboss-development
>>>>>
>>>>>
>>>>> _______________________________________________
>>>>> jboss-development mailing list
>>>>> jboss-development at lists.jboss.org
>>>>> https://lists.jboss.org/mailman/listinfo/jboss-development
>>>>
>>>>
>>>
>>
>>
>


-- 
Brian Stansberry
Lead, AS Clustering
JBoss by Red Hat