I am trying another way to package and deploy Tomcat 7 artifacts, since it is just a temporary solution, I think we just need to create a "wrap" pom file, which means no source codes are copied. In this way, we could just use scm plugin to update the source codes, and no need to merge codes by ourselves.
                        <include name="org/apache/catalina/**" />
                        <include name="org/apache/naming/**" />
                        <exclude name="org/apache/catalina/ant/**" />
                        <exclude name="org/apache/catalina/ha/**" />
                        <exclude name="org/apache/catalina/mbeans/JmxRemote*" />
                        <exclude name="org/apache/catalina/tribes/**" />
                        <exclude name="org/apache/catalina/launcher/**" />
                        <exclude name="org/apache/catalina/storeconfig/**" />
                        <exclude name="org/apache/naming/factory/webservices/**" />

Another question is that I found that the way we divided the Tomcat codes are not the same with its original way.
Tomcat has an artifact named coyote, while we didn't.
Is there any story about it ?  If no special reason, I would like keep the same with Tomcat's.
Thanks !

2009/12/3 Ivan <xhhsld@gmail.com>
OK, I will try to do it in the next week if no one beats to it !

2009/12/3 Kevan Miller <kevan.miller@gmail.com>

On Dec 2, 2009, at 11:51 AM, David Jencks wrote:

> On Dec 2, 2009, at 1:57 AM, Ivan wrote:
>> I am thinking whether there is maven plugin would help us to repackge the tomcat jar file to include our changes, so that we do not need to maintain the whole Tomcat source codes, maybe just need to keep a few files.
> AFAIK tomcat is not pushing trunk snapshots into any maven repo, so I think we'd have to build tomcat ourselves anyway.  Given that, I think that the easiest way is to use the process for constructing a mavenized build.  I'm hoping we won't actually need to modify any files, at least not for long :-).  The first set of changes we needed that led me to set up the mavenized build have been in tomcat trunk for years.

Right. So, if the motivation for this process is to make Tomcat SNAPSHOT's available in maven, I'm ok with this. I would not want to see this as a way of fixing functional/integration problems with Tomcat (at least not in the long-term).