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

Ales Justin wrote: > Spring-int is now a separate project: > *http://jboss.org/snowdrop > Do we still need to have the spring-int folder in the AS trunk? I know you were keeping it for some tests that were there.

Like Brian already said, the trunk has no spring-int

 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

On 12/02/2009 06:05 PM, Rémy Maucherat wrote: > On Wed, Dec 2, 2009 at 9:36 PM, Brian Stansberry > <brian.stansberry(a)redhat.com&gt; 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". > Ok, I'll check the clustering stuff in the tomcat module and then mark that one off on JBAS-7500.

I've checked varia. There are some smallish differences and some stuff is missing too: org/jboss/varia/deployment/FoeDeployer.java org/jboss/varia/deployment/BeanShellSubDeployer missing org/jboss/varia/deployment/convertor/Convertor.java org/jboss/varia/deployment/convertor/WebLogicConvertor.java I don't think we need those anymore? I guess the biggest difference in trunk/varia is that missing Brian's new org/jboss/services/binding Where is that now? Brian Stansberry wrote: > On 12/02/2009 06:05 PM, Rémy Maucherat wrote: >> On Wed, Dec 2, 2009 at 9:36 PM, Brian Stansberry >> <brian.stansberry(a)redhat.com&gt; 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". >> > > Ok, I'll check the clustering stuff in the tomcat module and then mark > that one off on JBAS-7500. >

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. :-)

> I'm a bit worried for the rest if you're asking for these files ... Why?

There were other web-related differences besides these, but they were all new files in trunk, so obviously not a missed port, or were stuff where I could easily enough figure out what trunk commit accounted for the diff. I didn't even try w/ the above 4, as the changes were complex enough that after reviewing 40 other files, I'd just had enough. ;)

Oh, I have no intention whatsoever of merging anything. :-) All I've done is reviewed the diffs to identify 5.x stuff that looks like people forgot to port to trunk, then assigned JIRAs to whoever made the 5.x change. For this module a lot of people made changes, so it's dangerous to just hope that every one of them will do a review. So I'm doing one. Plus, it's a blocker JIRA that got assigned to me, so TBH I just want to get it done and out of my life.

Ok, I think this is really important to perform ASAP: https://jira.jboss.org/jira/browse/JBAS-7500 We need volunteers to pick modules for review and create a subtasks to know they are working on those, if changes are needed. Otherwise, maybe edit JBAS-7500 and put a checkpoint next to the module name, so we know those have been reviewed? Brian Stansberry 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 _______________________________________________ jboss-development mailing list jboss-development(a)lists.jboss.org https://lists.jboss.org/mailman/listinfo/jboss-development