I have put together a patch from the notcm branch, and attached it to:
https://issues.apache.org/jira/browse/GERONIMO-2277
The best way to test this chang is to use svn merge directly instead
of using the patch commnd. This is because the svn merge handles
adding, removing and relocating files. To merge the changes from the
notcm branch execute the following command from within geronimo/trunk
svn merge -r 427246:HEAD https://svn.apache.org/repos/asf/geronimo/
branches/dain/notcm .
You should not receive any conflicts during the merge. Once this is
complete, run the following commands to remove the existing openejb
checkout and checkout the new related openejb code (this will be
merged directly in openejb):
rm -rf openejb/
maven m:co
Then simply run the maven build with the following command:
maven install
Altermatively, you can use the attached patch insted of the svn merge
command.
Please, take a look at this sooner rather than later as the TCM
touched lots of code, so this is a large patch. Currently, it
applies without conflict but that could easily change.
Thanks in advance,
-dain
