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

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