[jbossws-dev] Working on branch/jbossws-2.0

[Thomas Diesler]

Folks,

today we recreated branches/jbossws-2.0 from the trunk codebase and
removed the sunri, xfire integration from it.

The QA is hosted here:

trunk:		 http://jbws.dyndns.org:8180/hudson/
jbossws-2.0:	 http://jbws.dyndns.org:8280/hudson/

Note, the difference in port!

Since we cut jbossws-2.0 a couple of weeks ago, trunk has undergone
significant structural changes because of our switch to the general WS
integration layer. These changes are not necessarily functional.  Due to
these changes we needed to realign the 2.0 branch with trunk otherwise
the 2.0 code base would not be maintainable.

IMPORTANT!

You don't need to do anything if you immediately merged your changes
from jbossws-2.0 to trunk when you did it. In that case your changes are
preseved. However, if you did not merge your changes upstream because
trunk was too much of a moving target or for whatever other reason you
now need to manually merge your stuff to BOTH jbossws-2.0 and trunk.

I preserved a read-only copy of the old jbossws-2.0 code base here

https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0.backup/

Darran, Magesh, David please confirm that your changes are commited
upstream. The attached svn.log should show what you have actually done.

Please remember, that SVN does not maintain a record of merges that have
been done accross branches. We therefore maintain a mergeinfo.txt file
for every branch that should contain the merge commands that have been
issued. 

jbossws-2.0.0.GA is scheduled for 1-Jul-2007.

'svn merge' can now easily be used again to merge your changes upstream
to trunk. Please get back to me in case this procedure is not clear to
you. 

Here again our dev rules - I'll post them to the wiki as well.

#1 Run 'ant tests-samples' before you commit
#2 Merge your stuff upstream yourself - maintain a merge record
#3 Include JIRA issue and title in SVN commit messages when applicable
#4 Fix what your broke. Hudson should tell you at most 24h later

cheers
-thomas








	
-- 
xxxxxxxxxxxxxxxxxxxxxxxxxxxx
Thomas Diesler
Web Service Lead
JBoss, a division of Red Hat
xxxxxxxxxxxxxxxxxxxxxxxxxxxx
-------------- next part --------------
A non-text attachment was scrubbed...
Name: svn.log
Type: text/x-vhdl
Size: 74658 bytes
Desc: not available
Url : http://lists.jboss.org/pipermail/jbossws-dev/attachments/20070604/20fd6a5d/attachment.bin 
-------------- next part --------------

tdiesler: 27-Apr-2007
svn merge -r2933:2937 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0

tdiesler: 26-Apr-2007
svn merge -r2901:2933 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0

tdiesler: 23-Apr-2007
svn merge -r2891:2899 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0