You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by Davanum Srinivas <da...@gmail.com> on 2006/11/15 07:06:40 UTC
[Axis2][Proposal] Folding changes back to trunk
Folks,
I spent the day today staring at diff's...tried all sorts of things
with "svn merge" and winmerge. Bottom line, there's tons of changes in
the branch and HEAD has much fewer changes. So here's the proposal.
(Assuming base svn url is http://svn.apache.org/repos/asf/webservices/axis2/)
1. Freeze check-ins to trunk/java and branches/java/1_1/
2. copy trunk/java into branches/java/old_trunk/
3. copy branches/java/1_1/ to trunk/java
4. Fix all the version #'s in project.xml/project.properties/pom.xml's
5. Copy branches/java/old_trunk/modules/jaxws to
trunk/java/modules/jaxws (complete overwrite since all changes were
made in head)
6. Merge addressing module changes from
branches/java/old_trunk/modules/addressing to
trunk/java/modules/addressing by hand
7. Merge kernel module changes from
branches/java/old_trunk/modules/kernel to trunk/java/modules/kernel by
hand
8. Unfreeze trunk/java and branches/java/1_1/
9. Any other items can be merged on a need basis from old_trunk.
I can handle 1-5 and 8.
Bill and David, could you please help with 6 and 7? I could use some
help with 5 too if i run into trouble getting all the tests to work
properly.
Everyone can pitch in after step 8. people can continue working on
old_trunk, but they would be responsible for merging back...Please
remember, we have gone to great lengths to stabilize the code on the
branch and this is the best way that i can think of to minimize
instability and move forward.
Questions, comments, concerns?
Thanks,
dims
--
Davanum Srinivas : http://www.wso2.net (Oxygen for Web Service Developers)
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-dev-help@ws.apache.org
Re: [Axis2][Proposal] Folding changes back to trunk
Posted by Bill Nagy <na...@watson.ibm.com>.
Hi dims,
That's fine, I'll start merging in the changes.
-Bill
On Wed, 2006-11-15 at 01:06 -0500, Davanum Srinivas wrote:
> Folks,
>
> I spent the day today staring at diff's...tried all sorts of things
> with "svn merge" and winmerge. Bottom line, there's tons of changes in
> the branch and HEAD has much fewer changes. So here's the proposal.
>
> (Assuming base svn url is http://svn.apache.org/repos/asf/webservices/axis2/)
> 1. Freeze check-ins to trunk/java and branches/java/1_1/
> 2. copy trunk/java into branches/java/old_trunk/
> 3. copy branches/java/1_1/ to trunk/java
> 4. Fix all the version #'s in project.xml/project.properties/pom.xml's
> 5. Copy branches/java/old_trunk/modules/jaxws to
> trunk/java/modules/jaxws (complete overwrite since all changes were
> made in head)
> 6. Merge addressing module changes from
> branches/java/old_trunk/modules/addressing to
> trunk/java/modules/addressing by hand
> 7. Merge kernel module changes from
> branches/java/old_trunk/modules/kernel to trunk/java/modules/kernel by
> hand
> 8. Unfreeze trunk/java and branches/java/1_1/
> 9. Any other items can be merged on a need basis from old_trunk.
>
> I can handle 1-5 and 8.
>
> Bill and David, could you please help with 6 and 7? I could use some
> help with 5 too if i run into trouble getting all the tests to work
> properly.
>
> Everyone can pitch in after step 8. people can continue working on
> old_trunk, but they would be responsible for merging back...Please
> remember, we have gone to great lengths to stabilize the code on the
> branch and this is the best way that i can think of to minimize
> instability and move forward.
>
> Questions, comments, concerns?
>
> Thanks,
> dims
>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-dev-help@ws.apache.org
Re: [Axis2][Proposal] Folding changes back to trunk
Posted by R J Scheuerle Jr <sc...@us.ibm.com>.
I agree with the proposal.
The JAX-WS team can assist with debugging (5) if necessary.
Rich Scheuerle
IBM Web Services
Apache Axis2 (scheu@apache.org)
512-838-5115 (IBM TL 678-5115)
"Davanum
Srinivas"
<davanum@gmail.co To
m> "Axis developer list"
<ax...@ws.apache.org>
11/15/2006 12:06 cc
AM
Subject
[Axis2][Proposal] Folding changes
Please respond to back to trunk
axis-dev@ws.apach
e.org
Folks,
I spent the day today staring at diff's...tried all sorts of things
with "svn merge" and winmerge. Bottom line, there's tons of changes in
the branch and HEAD has much fewer changes. So here's the proposal.
(Assuming base svn url is
http://svn.apache.org/repos/asf/webservices/axis2/)
1. Freeze check-ins to trunk/java and branches/java/1_1/
2. copy trunk/java into branches/java/old_trunk/
3. copy branches/java/1_1/ to trunk/java
4. Fix all the version #'s in project.xml/project.properties/pom.xml's
5. Copy branches/java/old_trunk/modules/jaxws to
trunk/java/modules/jaxws (complete overwrite since all changes were
made in head)
6. Merge addressing module changes from
branches/java/old_trunk/modules/addressing to
trunk/java/modules/addressing by hand
7. Merge kernel module changes from
branches/java/old_trunk/modules/kernel to trunk/java/modules/kernel by
hand
8. Unfreeze trunk/java and branches/java/1_1/
9. Any other items can be merged on a need basis from old_trunk.
I can handle 1-5 and 8.
Bill and David, could you please help with 6 and 7? I could use some
help with 5 too if i run into trouble getting all the tests to work
properly.
Everyone can pitch in after step 8. people can continue working on
old_trunk, but they would be responsible for merging back...Please
remember, we have gone to great lengths to stabilize the code on the
branch and this is the best way that i can think of to minimize
instability and move forward.
Questions, comments, concerns?
Thanks,
dims
--
Davanum Srinivas : http://www.wso2.net (Oxygen for Web Service Developers)
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-dev-help@ws.apache.org