[jboss-dev] Code Differences between AS trunk and 6.0.0.M1 tag

[Brian Stansberry]

Rémy,

Could you do me a favor and confirm whether the changes in the attached 
diff in the following files are from your trunk work, meaning there's 
nothing to investigate for possible porting?

org/jboss/deployment/JBossWebAppParsingDeployer
org/jboss/web/deployers/AbstractWarDeployer
org/jboss/web/deployers/MergedJBossWebMetaDataDeployer
org/jboss/web/deployers/WARStructure

Since the server module covers such a wide area, lots of people have 
touched it. And it was clear some stuff need to be ported. So I've gone 
through every change in that diff and have been able to determine what's 
OK and what's something that needs porting. Every change that is, but 
those in those 4 files above. I was hoping you could say all those 
changes are yours and we're done. :-)

- Brian

On 12/02/2009 06:05 PM, Rémy Maucherat wrote:
> On Wed, Dec 2, 2009 at 9:36 PM, Brian Stansberry
> <brian.stansberry at redhat.com>  wrote:
>>   From comparing the component-matrix/pom.xml files, looks like there's a
>> fair amount of stuff to port from the JBoss_6_0_0_M1 tag to trunk.
>> Getting that done seems like a high priority. Diffing the tag to trunk
>> is a pain because trunk has moved toward a maven structure (e.g.
>> src/main/java/org/jboss instead of src/main/org/jboss). As an early
>> holiday gift to you all I went ahead and did a diff of src/main/java for
>> each of the modules in the AS source tree. Attached them to a wiki page.[1]
>>
>> I encourage folks to have a look. I was quite anal about porting
>> everything I did between Branch_5_x and trunk before closing any JIRA,
>> but looking at these diffs I found a couple small things I need to fix
>> in trunk.
>>
>> [1] http://www.jboss.org/community/docs/DOC-14457
>
> For the changes I know about, all the tomcat module (except possibly
> some clustering changes, but I doubt it) and a lot of the server
> module changes are Servlet 3.0, and do not need "merging".
>
> Rémy
>
> _______________________________________________
> 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
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: server.diff
Url: http://lists.jboss.org/pipermail/jboss-development/attachments/20091204/3676adb6/attachment.pl