Re: [jira] Commented: (GERONIMO-2219) [RTC] Merge m2migration (functional m2 build) to trunk
On Jul 27, 2006, at 2:02 PM, Jacek Laskowski wrote: Jason must be one of the happiest men in the world, mustn't he? Um... I can think of several reasons that I might be happier :-P * * * I will merge this back when I finish setting up my new Mac Book Pro :-) --jason
Re: [jira] Commented: (GERONIMO-2219) [RTC] Merge m2migration (functional m2 build) to trunk
Well, I certainly was not expecting this kinda of speedy response ;-) Still need you guys to bless this: http://issues.apache.org/jira/browse/GERONIMO-2223 --jason On Jul 27, 2006, at 2:02 PM, Jacek Laskowski wrote: On 7/27/06, Jason Dillon <[EMAIL PROTECTED]> wrote: 2 down... 1 to go. Any PMC member want to be the lucky third? After Jeff's you've got three. It's your turn then. Will watch all your steps...mind them! ;-) Jason must be one of the happiest men in the world, mustn't he? Jacek -- Jacek Laskowski http://www.laskowski.net.pl
Re: [jira] Commented: (GERONIMO-2219) [RTC] Merge m2migration (functional m2 build) to trunk
We still need some votes on GERONIMO-2223. This is the RTC that
moves genesis out of the sandbox. GERONIMO-2219 is built using
genesis and so you guys already kinda reviewed/tested it. But the
RTC issue is separate because it is logically different than the merge,
Please review and vote on this guy too:
http://issues.apache.org/jira/browse/GERONIMO-2223
--jason
On Jul 27, 2006, at 1:58 PM, Jeff Genender wrote:
You have them. Matt's comment looks like a +1 and you have Jacek
and mine.
Jeff
Jason Dillon wrote:
2 down... 1 to go. Any PMC member want to be the lucky third?
--jason
On Jul 27, 2006, at 1:10 PM, Jacek Laskowski (JIRA) wrote:
[
http://issues.apache.org/jira/browse/GERONIMO-2219?
page=comments#action_12423904
]
Jacek Laskowski commented on GERONIMO-2219:
---
Build, tested and am confident they can go to the trunk. Here
goes my
+1 for the work that's been done in the m2migration branch, i.e. for
applying the G-2219 to trunk.
I do second Matt's view on it (but I'd vote +1 without it, too,
as the
tests I've done finished successfully and although there may be some
issues they're almost invisible for end users).
Good job Jason, Anita and Prasad! I'm going on a 2-week holiday and
wish to see fully functional M2 build before I return =)
[RTC] Merge m2migration (functional m2 build) to trunk
--
Key: GERONIMO-2219
URL: http://issues.apache.org/jira/browse/
GERONIMO-2219
Project: Geronimo
Issue Type: RTC
Security Level: public(Regular issues)
Components: buildsystem
Affects Versions: 1.2
Reporter: Jason Dillon
Priority: Critical
Fix For: 1.2
h3. Overview
For the past few weeks we have been busy at work getting Geronimo
1.2-SNAPSHOT to build with Maven 2. As I have noted before in
email,
the process is almost complete. At this point the work done so far
results in a functional server for the following assemblies:
* geronimo-jetty-j2ee
* geronimo-jetty-minimal
* geronimo-tomcat-j2ee
* geronimo-tomcat-minimal
The work to implement has been applied to a branch in the sandbox,
and includes many submitted patches from those contributors and
commiters that had been helping with the effort.
My recommendation is that we _merge_ this change to trunk and not
generate a diff and then patch. There are a few changes which
patch
does not handle well and will cause failed chunks when applied, and
there are a few files moved and copied, which when patched will
cause
loss of that history.
As I mentioned this work is _almost complete_, there are still a
few
pending issues, please see the section below for more details.
h3. Recommend Action Post RTC
Once we have the required RTC +1's to allow this work to be merged,
this is what I recommend:
# Merge m2migration to trunk as described below
# Deprecate the Maven1 build; meaning leave the m1 files, but
strongly urge developers to use the m2 build
# Enable the TCK _automated_ testing in GBuild using the m2 build
# Remove the m1 build (and related files)
These steps will probably take a few weeks post-merge to complete.
h3. About the Branch
The main branch which should be used for review is:
*
https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/
m2migration
I have been using SVK ( http://svk.elixus.org/ ) to keep this
m2migration branch up to date with the latest changes that have
been
made to trunk (with a few exceptions). I have been staging the
merge
as follows:
* merge from {{trunk}} to {{sandbox/svkmerge/trunk}}
* merge from {{sandbox/svkmerge/trunk}}
{{sandbox/svkmerge/m2migration}}
This has worked out very well and I have found that using SVK
dramatically reduces to complexity of performing full tree (or
partial tree merges). I have been verifying that the SVK
{{smerge}}
is indeed doing the right thing and I have a good deal of
confidence
in it at this point.
The idea is to merge m2migration back to trunk using SVK as
follows:
* merge from {{sandbox/svkmerge/m2migration}} to
{{sandbox/svkmerge/trunk}}
* merge from {{sandbox/svkmerge/trunk}} to {{trunk}}
This is the opposite of what I am performing now on a regular basis
to sync this development branch. Normally the additional branch
(svkmerge/trunk) would not be needed, but it exists to help ensure
that the merge is indeed _doing the right thing_.
h3. Recommended Review Steps
{noformat}
svn co
https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/
m2migration
cd m2migration
./bootstrap
gunzip -c
m2-assemblies/geronimo-jetty-j2ee/target/geronimo-jetty-j2ee-1.2-
SNAPSHOT-bin.tar.gz
| tar xf -
./geronimo-jetty-j2ee/bin/startup.sh && tail -f
geronimo-jetty-j2ee/var/log/geronimo.out
./geronimo-jetty-j2ee/bin/shutdown.sh --user system --password
manager
{noformat}
*NOTE:* Windows users need to run {{bootstrap}} f
Re: [jira] Commented: (GERONIMO-2219) [RTC] Merge m2migration (functional m2 build) to trunk
On 7/27/06, Jason Dillon <[EMAIL PROTECTED]> wrote: 2 down... 1 to go. Any PMC member want to be the lucky third? After Jeff's you've got three. It's your turn then. Will watch all your steps...mind them! ;-) Jason must be one of the happiest men in the world, mustn't he? Jacek -- Jacek Laskowski http://www.laskowski.net.pl
Re: [jira] Commented: (GERONIMO-2219) [RTC] Merge m2migration (functional m2 build) to trunk
You have them. Matt's comment looks like a +1 and you have Jacek and mine.
Jeff
Jason Dillon wrote:
> 2 down... 1 to go. Any PMC member want to be the lucky third?
>
> --jason
>
>
> On Jul 27, 2006, at 1:10 PM, Jacek Laskowski (JIRA) wrote:
>
>> [
>> http://issues.apache.org/jira/browse/GERONIMO-2219?page=comments#action_12423904
>> ]
>>
>> Jacek Laskowski commented on GERONIMO-2219:
>> ---
>>
>> Build, tested and am confident they can go to the trunk. Here goes my
>> +1 for the work that's been done in the m2migration branch, i.e. for
>> applying the G-2219 to trunk.
>>
>> I do second Matt's view on it (but I'd vote +1 without it, too, as the
>> tests I've done finished successfully and although there may be some
>> issues they're almost invisible for end users).
>>
>> Good job Jason, Anita and Prasad! I'm going on a 2-week holiday and
>> wish to see fully functional M2 build before I return =)
>>
>>> [RTC] Merge m2migration (functional m2 build) to trunk
>>> --
>>>
>>> Key: GERONIMO-2219
>>> URL: http://issues.apache.org/jira/browse/GERONIMO-2219
>>> Project: Geronimo
>>> Issue Type: RTC
>>> Security Level: public(Regular issues)
>>> Components: buildsystem
>>>Affects Versions: 1.2
>>>Reporter: Jason Dillon
>>>Priority: Critical
>>> Fix For: 1.2
>>>
>>>
>>> h3. Overview
>>> For the past few weeks we have been busy at work getting Geronimo
>>> 1.2-SNAPSHOT to build with Maven 2. As I have noted before in email,
>>> the process is almost complete. At this point the work done so far
>>> results in a functional server for the following assemblies:
>>> * geronimo-jetty-j2ee
>>> * geronimo-jetty-minimal
>>> * geronimo-tomcat-j2ee
>>> * geronimo-tomcat-minimal
>>> The work to implement has been applied to a branch in the sandbox,
>>> and includes many submitted patches from those contributors and
>>> commiters that had been helping with the effort.
>>> My recommendation is that we _merge_ this change to trunk and not
>>> generate a diff and then patch. There are a few changes which patch
>>> does not handle well and will cause failed chunks when applied, and
>>> there are a few files moved and copied, which when patched will cause
>>> loss of that history.
>>> As I mentioned this work is _almost complete_, there are still a few
>>> pending issues, please see the section below for more details.
>>> h3. Recommend Action Post RTC
>>> Once we have the required RTC +1's to allow this work to be merged,
>>> this is what I recommend:
>>> # Merge m2migration to trunk as described below
>>> # Deprecate the Maven1 build; meaning leave the m1 files, but
>>> strongly urge developers to use the m2 build
>>> # Enable the TCK _automated_ testing in GBuild using the m2 build
>>> # Remove the m1 build (and related files)
>>> These steps will probably take a few weeks post-merge to complete.
>>> h3. About the Branch
>>> The main branch which should be used for review is:
>>> *
>>> https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration
>>> I have been using SVK ( http://svk.elixus.org/ ) to keep this
>>> m2migration branch up to date with the latest changes that have been
>>> made to trunk (with a few exceptions). I have been staging the merge
>>> as follows:
>>> * merge from {{trunk}} to {{sandbox/svkmerge/trunk}}
>>> * merge from {{sandbox/svkmerge/trunk}}
>>> {{sandbox/svkmerge/m2migration}}
>>> This has worked out very well and I have found that using SVK
>>> dramatically reduces to complexity of performing full tree (or
>>> partial tree merges). I have been verifying that the SVK {{smerge}}
>>> is indeed doing the right thing and I have a good deal of confidence
>>> in it at this point.
>>> The idea is to merge m2migration back to trunk using SVK as follows:
>>> * merge from {{sandbox/svkmerge/m2migration}} to
>>> {{sandbox/svkmerge/trunk}}
>>> * merge from {{sandbox/svkmerge/trunk}} to {{trunk}}
>>> This is the opposite of what I am performing now on a regular basis
>>> to sync this development branch. Normally the additional branch
>>> (svkmerge/trunk) would not be needed, but it exists to help ensure
>>> that the merge is indeed _doing the right thing_.
>>> h3. Recommended Review Steps
>>> {noformat}
>>> svn co
>>> https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration
>>> cd m2migration
>>> ./bootstrap
>>> gunzip -c
>>> m2-assemblies/geronimo-jetty-j2ee/target/geronimo-jetty-j2ee-1.2-SNAPSHOT-bin.tar.gz
>>> | tar xf -
>>> ./geronimo-jetty-j2ee/bin/startup.sh && tail -f
>>> geronimo-jetty-j2ee/var/log/geronimo.out
>>>
>>> ./geronimo-jetty-j2ee/bin/shutdown.sh --user system --password manager
>>> {noformat}
>>> *NOTE:* Windows users need to run {{bootstrap}} from a Cygwin
>>> environment and should probably run these steps from the root of a
>>> drive (c:, d:,
Re: [jira] Commented: (GERONIMO-2219) [RTC] Merge m2migration (functional m2 build) to trunk
2 down... 1 to go. Any PMC member want to be the lucky third?
--jason
On Jul 27, 2006, at 1:10 PM, Jacek Laskowski (JIRA) wrote:
[ http://issues.apache.org/jira/browse/GERONIMO-2219?
page=comments#action_12423904 ]
Jacek Laskowski commented on GERONIMO-2219:
---
Build, tested and am confident they can go to the trunk. Here goes
my +1 for the work that's been done in the m2migration branch, i.e.
for applying the G-2219 to trunk.
I do second Matt's view on it (but I'd vote +1 without it, too, as
the tests I've done finished successfully and although there may be
some issues they're almost invisible for end users).
Good job Jason, Anita and Prasad! I'm going on a 2-week holiday and
wish to see fully functional M2 build before I return =)
[RTC] Merge m2migration (functional m2 build) to trunk
--
Key: GERONIMO-2219
URL: http://issues.apache.org/jira/browse/
GERONIMO-2219
Project: Geronimo
Issue Type: RTC
Security Level: public(Regular issues)
Components: buildsystem
Affects Versions: 1.2
Reporter: Jason Dillon
Priority: Critical
Fix For: 1.2
h3. Overview
For the past few weeks we have been busy at work getting Geronimo
1.2-SNAPSHOT to build with Maven 2. As I have noted before in
email, the process is almost complete. At this point the work
done so far results in a functional server for the following
assemblies:
* geronimo-jetty-j2ee
* geronimo-jetty-minimal
* geronimo-tomcat-j2ee
* geronimo-tomcat-minimal
The work to implement has been applied to a branch in the sandbox,
and includes many submitted patches from those contributors and
commiters that had been helping with the effort.
My recommendation is that we _merge_ this change to trunk and not
generate a diff and then patch. There are a few changes which
patch does not handle well and will cause failed chunks when
applied, and there are a few files moved and copied, which when
patched will cause loss of that history.
As I mentioned this work is _almost complete_, there are still a
few pending issues, please see the section below for more details.
h3. Recommend Action Post RTC
Once we have the required RTC +1's to allow this work to be
merged, this is what I recommend:
# Merge m2migration to trunk as described below
# Deprecate the Maven1 build; meaning leave the m1 files, but
strongly urge developers to use the m2 build
# Enable the TCK _automated_ testing in GBuild using the m2 build
# Remove the m1 build (and related files)
These steps will probably take a few weeks post-merge to complete.
h3. About the Branch
The main branch which should be used for review is:
* https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/
m2migration
I have been using SVK ( http://svk.elixus.org/ ) to keep this
m2migration branch up to date with the latest changes that have
been made to trunk (with a few exceptions). I have been staging
the merge as follows:
* merge from {{trunk}} to {{sandbox/svkmerge/trunk}}
* merge from {{sandbox/svkmerge/trunk}} {{sandbox/svkmerge/
m2migration}}
This has worked out very well and I have found that using SVK
dramatically reduces to complexity of performing full tree (or
partial tree merges). I have been verifying that the SVK
{{smerge}} is indeed doing the right thing and I have a good deal
of confidence in it at this point.
The idea is to merge m2migration back to trunk using SVK as follows:
* merge from {{sandbox/svkmerge/m2migration}} to {{sandbox/
svkmerge/trunk}}
* merge from {{sandbox/svkmerge/trunk}} to {{trunk}}
This is the opposite of what I am performing now on a regular
basis to sync this development branch. Normally the additional
branch (svkmerge/trunk) would not be needed, but it exists to help
ensure that the merge is indeed _doing the right thing_.
h3. Recommended Review Steps
{noformat}
svn co https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/
m2migration
cd m2migration
./bootstrap
gunzip -c m2-assemblies/geronimo-jetty-j2ee/target/geronimo-jetty-
j2ee-1.2-SNAPSHOT-bin.tar.gz | tar xf -
./geronimo-jetty-j2ee/bin/startup.sh && tail -f geronimo-jetty-
j2ee/var/log/geronimo.out
./geronimo-jetty-j2ee/bin/shutdown.sh --user system --password
manager
{noformat}
*NOTE:* Windows users need to run {{bootstrap}} from a Cygwin
environment and should probably run these steps from the root of a
drive (c:, d:, etc) to better ensure that the long filename
problem is not an issue when testing.
*WARNING:* The {{bootstrap}} script will remove your local Maven2
repository cache and will take maybe 30 minutes or so to run...
more or less depending on how fast your network connection is.
You should define a mirror for the {{central}} m2 repository
before running... otherwise you will almost certainly get
Re: [jira] Commented: (GERONIMO-2219) [RTC] Merge m2migration (functional m2 build) to trunk
Please fill out any more details here:
https://issues.apache.org/jira/browse/GERONIMO-2225
--jason
On Jul 24, 2006, at 2:50 PM, Aaron Mulder (JIRA) wrote:
[ http://issues.apache.org/jira/browse/GERONIMO-2219?
page=comments#action_12423169 ]
Aaron Mulder commented on GERONIMO-2219:
The M2 build no longer inserts META-INF/geronimo-plugin.xml into
the CARs that have src/conf/geronimo-plugin.xml. There was
handling for this in the M1 build (e.g. for the welcome app and
other examples).
I'd like to see that fixed before this becomes the preferred
build. I assume this would require a change in the Maven car plugin.
[RTC] Merge m2migration (functional m2 build) to trunk
--
Key: GERONIMO-2219
URL: http://issues.apache.org/jira/browse/
GERONIMO-2219
Project: Geronimo
Issue Type: RTC
Security Level: public(Regular issues)
Components: buildsystem
Affects Versions: 1.2
Reporter: Jason Dillon
Priority: Critical
Fix For: 1.2
h3. Overview
For the past few weeks we have been busy at work getting Geronimo
1.2-SNAPSHOT to build with Maven 2. As I have noted before in
email, the process is almost complete. At this point the work
done so far results in a functional server for the following
assemblies:
* geronimo-jetty-j2ee
* geronimo-jetty-minimal
* geronimo-tomcat-j2ee
* geronimo-tomcat-minimal
The work to implement has been applied to a branch in the sandbox,
and includes many submitted patches from those contributors and
commiters that had been helping with the effort.
My recommendation is that we _merge_ this change to trunk and not
generate a diff and then patch. There are a few changes which
patch does not handle well and will cause failed chunks when
applied, and there are a few files moved and copied, which when
patched will cause loss of that history.
As I mentioned this work is _almost complete_, there are still a
few pending issues, please see the section below for more details.
h3. Recommend Action Post RTC
Once we have the required RTC +1's to allow this work to be
merged, this is what I recommend:
# Merge m2migration to trunk as described below
# Deprecate the Maven1 build; meaning leave the m1 files, but
strongly urge developers to use the m2 build
# Enable the TCK _automated_ testing in GBuild using the m2 build
# Remove the m1 build (and related files)
These steps will probably take a few weeks post-merge to complete.
h3. About the Branch
The main branch which should be used for review is:
* https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/
m2migration
I have been using SVK ( http://svk.elixus.org/ ) to keep this
m2migration branch up to date with the latest changes that have
been made to trunk (with a few exceptions). I have been staging
the merge as follows:
* merge from {{trunk}} to {{sandbox/svkmerge/trunk}}
* merge from {{sandbox/svkmerge/trunk}} {{sandbox/svkmerge/
m2migration}}
This has worked out very well and I have found that using SVK
dramatically reduces to complexity of performing full tree (or
partial tree merges). I have been verifying that the SVK
{{smerge}} is indeed doing the right thing and I have a good deal
of confidence in it at this point.
The idea is to merge m2migration back to trunk using SVK as follows:
* merge from {{sandbox/svkmerge/m2migration}} to {{sandbox/
svkmerge/trunk}}
* merge from {{sandbox/svkmerge/trunk}} to {{trunk}}
This is the opposite of what I am performing now on a regular
basis to sync this development branch. Normally the additional
branch (svkmerge/trunk) would not be needed, but it exists to help
ensure that the merge is indeed _doing the right thing_.
h3. Recommended Review Steps
{noformat}
svn co https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/
m2migration
cd m2migration
./bootstrap
gunzip -c m2-assemblies/geronimo-jetty-j2ee/target/geronimo-jetty-
j2ee-1.2-SNAPSHOT-bin.tar.gz | tar xf -
./geronimo-jetty-j2ee/bin/startup.sh && tail -f geronimo-jetty-
j2ee/var/log/geronimo.out
./geronimo-jetty-j2ee/bin/shutdown.sh --user system --password
manager
{noformat}
*NOTE:* Windows users need to run {{bootstrap}} from a Cygwin
environment and should probably run these steps from the root of a
drive (c:, d:, etc) to better ensure that the long filename
problem is not an issue when testing.
*WARNING:* The {{bootstrap}} script will remove your local Maven2
repository cache and will take maybe 30 minutes or so to run...
more or less depending on how fast your network connection is.
You should define a mirror for the {{central}} m2 repository
before running... otherwise you will almost certainly get
repository failures downloading from ibiblio. This is what I am
using (in ~/.m2/settings.xml):
{code:xml}
