I had the same issue with Jencks noted and a few patches got rejected. However, after looking and
the rejects I'm not sure why as I simply made the changes in the files and they were fine.
+1 from me.
David Jencks wrote:
I have studied the patch, built the branch, and tested it a bit. Aside
from one small issue about where openejb gets checked out that I fixed
and that will not be in the final merge, I see no problems.
+1 to completing this merge now.
We will need to add a pom.xml for the new interceptor module. I suggest
we do this as soon as the merge is complete.
thanks
david jencks
On Jun 26, 2006, at 6:46 PM, Dain Sundstrom wrote:
I have finished the work to update the openejb dead-2.2 branch to run
with Geronimo 1.2. The dead-2.2 branch contains a major
rearchitecture of the OpenEJB container system which split the
deployment units from reusable container and this rearchitecture has
already been adopted in OpenEJB 3. This work was done in the
https://svn.apache.org/repos/asf/geronimo/branches/dain/openejb-2.2-merge
branch, and is largely composed of merges from the Geronimo dead-1.2
branch.
A patch for this change can be found in GERONIMO-12345, but the
attached patch is not expected work perfectly. Any mismatches or
problems will be worked out during the final merge with trunk. The
best way to test this change is to checkout and build the branch
directly. The maven m:co goal should work to check out the
https://svn.codehaus.org/openejb/branches/dain-2.2-merge/merged branch
from openejb. For those with tck access, there is a
dain-openejb-2.2-merge branch available for testing the tck.
Please, review this quickly so the branch doesn't drift too much.
Thanks in advance,
-dain
A quick history of this branch follows:
417321 Fixed openejb version number in project.properties
------------------------------------------------------------------------
416533 Applied GERONIMO-1960 which verifies GBean references when the
final configuration data is created in a deployment context
416483 Fixed deployment plans to match newest openejb changes
------------------------------------------------------------------------
416428 Fixed more plans
------------------------------------------------------------------------
415721 Biggest change which updates the j2ee deployment context to
contain the transactionManager name amongst some smaller changes
------------------------------------------------------------------------
415720 Update maven.xml to use new openejb module names
------------------------------------------------------------------------
415225 Set svn:ignore on new interceptor module
------------------------------------------------------------------------
415224 svn merge -r 378403:378404
https://svn.apache.org/repos/asf/geronimo/[EMAIL PROTECTED]
------------------------------------------------------------------------
415222 svn merge -r 378358:378359
https://svn.apache.org/repos/asf/geronimo/[EMAIL PROTECTED]
------------------------------------------------------------------------
415220 svn merge -r 378346:378347
https://svn.apache.org/repos/asf/geronimo/[EMAIL PROTECTED]
------------------------------------------------------------------------
415218 svn merge -r 378182:378183
https://svn.apache.org/repos/asf/geronimo/[EMAIL PROTECTED]
------------------------------------------------------------------------
415217 svn merge -r 378161:378162
https://svn.apache.org/repos/asf/geronimo/[EMAIL PROTECTED]