<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta content="text/html;charset=ISO-8859-1" http-equiv="Content-Type">
</head>
<body bgcolor="#ffffff" text="#000000">
The merge has been committed and the command line and eclipse builds
are working(provided the admin-console project is excluded from
eclipse. This project should be removed).<br>
<br>
The server minimal boots fine and default looks to have only the
expected failures. Report any issues.<br>
<br>
Scott M Stark wrote:
<blockquote cite="mid45140404.3010703@jboss.org" type="cite">
<meta http-equiv="Content-Type" content="text/html; ">
<meta name="Generator" content="MS Exchange Server version 6.5.7638.1">
<title>MC_VDF_WORK branch merge starting tomorrow</title>
<!-- Converted from text/plain format -->
<p><font size="2">We are ready to begin the merge of the MC/VDF work<br>
(<a href="https://svn.jboss.org/repos/jbossas/branches/MC_VDF_WORK/">https://svn.jboss.org/repos/jbossas/branches/MC_VDF_WORK/</a>)
to trunk<br>
starting tomorrow. You need to have any outstanding commits in head by<br>
tonight (2100 GMT), or else migrate to the tck branch<br>
(<a href="https://svn.jboss.org/repos/jbossas/branches/JEE5_TCK/">https://svn.jboss.org/repos/jbossas/branches/JEE5_TCK/</a>),
which will be<br>
created from trunk tonight.<br>
<br>
I'll start the merge tomorrow and will focus on getting the command line<br>
and eclipse projects building. I'll be sending out any unresolvable<br>
conflicts to the dev list.<br>
<br>
In terms of tck work going forward, since we are rewriting the deployers<br>
its doubtful that merges between the JEE5_TCK branch and trunk will be<br>
practical. What I would like is that for any changes to the JEE5_TCK<br>
branch, you create an issue in the<br>
<a href="http://jira.jboss.com/jira/browse/JBCTS">http://jira.jboss.com/jira/browse/JBCTS</a>
project that includes the patch<br>
made (svn diff, eclipse Team->Create Patch) so that whoever is
working<br>
on the associated deployer in trunk can get the change included.<br>
<br>
</font>
</p>
</blockquote>
<br>
</body>
</html>