You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by Ferdinand Soethe <fe...@apache.org> on 2008/01/30 11:49:46 UTC

How to merge FOP94-branch

We are almost there. The branch with FOP 94 is running
smoothly and I'm planning to merge it back by the end of
this week.

Some questions for the experts remain:

The branch changes Forrest core and the pdf-plugin
Can I do a complete merge or will the plugin have to
become a new version?

I guess a new version is required or Forrest 0.8 runs into 
problems when using the modified plugin 0.2 that calls for 
libraries that it doesn't have.

So here is what I'll do:

- change version number of pdf-plugin in the branch to 0.3
- merge all changes

- create an instruction file for using the new fop in 0.8
   by changing the plugin in properties to 0.3,
   adding the required libraries and replace the style sheets

Thanks for your comments,
Ferdinand


Re: How to merge FOP94-branch

Posted by Ross Gardler <rg...@apache.org>.
Ferdinand Soethe wrote:

> where I removed fop-0.20.5.jar and added fop-0.94.jar in the same 
> transaction and I didn't know how best to undo the deletion of 
> fop-0.20.5.jar w/o undoing the rest.

Just do a standard revert specifiying only that specific file (I thin 
kour FAQ tells you how to revert, if not see the SVN Book)

Ross

Re: How to merge FOP94-branch

Posted by Ferdinand Soethe <fe...@apache.org>.
David Crossley wrote:

> Ferdinand Soethe wrote:
>> Thinking again: I'd also need to merge the pdf-plugin dir 
>> back into trunk so that change history of files is preserved.
>>
>> Can I do such a partial merge?
> 
> Yes, see the svn book for instructions. Merge can operate at
> any level of the tree.
> 
> However, why not just merge the whole lot.

I'd like to do that but I have this tricky issue with

> Author: ferdinand
> Date: Mon Dec 10 23:53:07 2007
> New Revision: 603165
> 
> URL: http://svn.apache.org/viewvc?rev=603165&view=rev
> Log:
> Replacing fop-0.20.5.jar with fop-0.94.jar, adding supporting modules and reconfiguring plugin to use it.
> 
> Added:
>     forrest/branches/UpdateFOPto094/lib/core/cocoon-fop-ng-impl-1.0.0-SNAPSHOT.jar   (with props)
>     forrest/branches/UpdateFOPto094/lib/core/commons-io-1.3.1.jar   (with props)
>     forrest/branches/UpdateFOPto094/lib/core/commons-io.LICENSE.txt
>     forrest/branches/UpdateFOPto094/lib/core/commons-io.NOTICE.txt
>     forrest/branches/UpdateFOPto094/lib/core/fop-0.94.LICENSE.txt
>     forrest/branches/UpdateFOPto094/lib/core/fop-0.94.jar   (with props)
>     forrest/branches/UpdateFOPto094/lib/core/xmlgraphics-commons-1.2.jar   (with props)
>     forrest/branches/UpdateFOPto094/lib/core/xmlgraphics-commons.LICENSE.txt
>     forrest/branches/UpdateFOPto094/lib/core/xmlgraphics-commons.NOTICE.txt
> Removed:
>     forrest/branches/UpdateFOPto094/lib/core/fop-0.20.5.jar
>     forrest/branches/UpdateFOPto094/lib/core/fop-0.20.5.jar.license.txt
> Modified:
>     forrest/branches/UpdateFOPto094/plugins/org.apache.forrest.plugin.output.pdf/output.xmap

where I removed fop-0.20.5.jar and added fop-0.94.jar in the 
same transaction and I didn't know how best to undo the 
deletion of fop-0.20.5.jar w/o undoing the rest.

Best regards,
Ferdinand Soethe

Re: How to merge FOP94-branch

Posted by David Crossley <cr...@apache.org>.
Ferdinand Soethe wrote:
> Thinking again: I'd also need to merge the pdf-plugin dir 
> back into trunk so that change history of files is preserved.
> 
> Can I do such a partial merge?

Yes, see the svn book for instructions. Merge can operate at
any level of the tree.

However, why not just merge the whole lot.

-David

Re: How to merge FOP94-branch

Posted by Ferdinand Soethe <fe...@apache.org>.
Thinking again: I'd also need to merge the pdf-plugin dir 
back into trunk so that change history of files is preserved.

Can I do such a partial merge?

Best regards,
Ferdinand Soethe

Ferdinand Soethe wrote:
> If I manage to build everything into the plugin, I would like to apply 
> those few remaining changes
> 
>     - delete main\webapp\skins\common\xslt\fo
>     - remove fo-pipeline from sitemap
> 
> directly to head and throw the branch away.
> 
> Best regards,
> Ferdinand Soethe
> 
> Johannes Schaefer wrote:
> 
> 
>> What if Ferdinand manages to contain everything in the PDF/FOP-plugin?
>>
>> Thanks and Cheers!
>> Johannes
> 
> 


Re: How to merge FOP94-branch

Posted by Ferdinand Soethe <fe...@apache.org>.
If I manage to build everything into the plugin, I would 
like to apply those few remaining changes

	- delete main\webapp\skins\common\xslt\fo
	- remove fo-pipeline from sitemap

directly to head and throw the branch away.

Best regards,
Ferdinand Soethe

Johannes Schaefer wrote:


> What if Ferdinand manages to contain everything in the PDF/FOP-plugin?
> 
> Thanks and Cheers!
> Johannes


Re: How to merge FOP94-branch

Posted by Ross Gardler <rg...@apache.org>.
Johannes Schaefer wrote:
> David Crossley schrieb:
>> Ross Gardler wrote:
>>> Ferdinand Soethe wrote:
>>>
>>>> - merge all changes
>>> You should merge changes from the whole trunk into branch first and 
>>> then test. If all goes well you can merge back into trunk. This step 
>>> is not required but sometimes it sometimes highlights a change in 
>>> trunk that affects your changes in the branch.
> 
> I now did a dry run to merge all changes from HEAD to r601867 into the
> branch -- no problems here. Should I commit this merge into the branch?

May as well do it when the full process can be followed. However, there 
is no harm in doing it periodically during branch development (some say 
it actually helps).

>> I see that Ferdinand and Johannes are doing piecemeal changes
>> to the branch. I reckon that you would do better to follow
>> Ross' advice. Remember that we got into big trouble one time
>> and couldn't later merge to trunk.
> 
> Ferdinand touched very few files (namely in skins/commion/xslt/fo and
> lib/core), so, he might as well apply these changes to HEAD.
> 
> What if Ferdinand manages to contain everything in the PDF/FOP-plugin?

Keep the work in the branch until it is complete, then do the merge into 
trunk in one go. It makes the logs easier to follow (one revision number 
for the complete branch merge).

Ross

Re: How to merge FOP94-branch

Posted by Johannes Schaefer <jo...@uidesign.de>.
David Crossley schrieb:
> Ross Gardler wrote:
>> Ferdinand Soethe wrote:
>>
>>> - merge all changes
>> You should merge changes from the whole trunk into branch first and then 
>> test. If all goes well you can merge back into trunk. This step is not 
>> required but sometimes it sometimes highlights a change in trunk that 
>> affects your changes in the branch.

I now did a dry run to merge all changes from HEAD to r601867 into the
branch -- no problems here. Should I commit this merge into the branch?


> I see that Ferdinand and Johannes are doing piecemeal changes
> to the branch. I reckon that you would do better to follow
> Ross' advice. Remember that we got into big trouble one time
> and couldn't later merge to trunk.

I just applied that one patch which was important for testing.

Ferdinand touched very few files (namely in skins/commion/xslt/fo and
lib/core), so, he might as well apply these changes to HEAD.

What if Ferdinand manages to contain everything in the PDF/FOP-plugin?

Thanks and Cheers!
Johannes



> 
> -David
> 

-- 
User Interface Design GmbH, Ludwigsburg, Germany
Phone/Fax  +49 7141 37700-46/-99, Mobile +49 170 4914567
E-mail johannes.schaefer@uidesign.de * www.uidesign.de

Offices:
Martin-Luther-Straße 57-59, D-71636 Ludwigsburg
Truderinger Strasse 330, D-81825 Muenchen
Friedrichsring 46, D-68161 Mannheim
Hansastraße 7-11, 44137 Dortmund

Legal information according to EHUG:
User Interface Design GmbH; Managing Directors: Dr. Claus Goerner,
Franz Koller; Head office: Ludwigsburg; Commercial register of the
local court of Stuttgart, Germany, HRB 205519

Re: How to merge FOP94-branch

Posted by David Crossley <cr...@apache.org>.
Ross Gardler wrote:
> Ferdinand Soethe wrote:
> 
> >- merge all changes
> 
> You should merge changes from the whole trunk into branch first and then 
> test. If all goes well you can merge back into trunk. This step is not 
> required but sometimes it sometimes highlights a change in trunk that 
> affects your changes in the branch.

I see that Ferdinand and Johannes are doing piecemeal changes
to the branch. I reckon that you would do better to follow
Ross' advice. Remember that we got into big trouble one time
and couldn't later merge to trunk.

-David

Re: How to merge FOP94-branch

Posted by David Crossley <cr...@apache.org>.
David Crossley wrote:
> Ross Gardler wrote:
> > Ferdinand Soethe wrote:
> > >
> > >So here is what I'll do:
> > >
> > >- change version number of pdf-plugin in the branch to 0.3
> >
> > - change required Forrest version number (but see below)
> 
> Yes, both the plugin number and the Forrest required version
> number would be incremented.
> http://forrest.apache.org/docs/dev/howto/howto-buildPlugin.html#descriptor

Ah, of course "Forrest required version" does not need
to be incremented if the plugin will still work with 0.8

-David

Re: How to merge FOP94-branch

Posted by Ross Gardler <rg...@apache.org>.
Ferdinand Soethe wrote:
> David Crossley wrote:
> 
>> Ross are you talking about "using" Forrest plugins?
>> IIUC, Ferdinand is talking about developing the code
>> in svn trunk. As far as i can see there can only be
>> one version.
> 
> David is right. Is it at all possible to have two separate versions of a 
> plugin in svn? And how would that work?

Ah, sorry. Then the answer is only if you branch.

>> Ferdinand i don't understand why we would want to maintain
>> two separate versions.
> 
> Good point. If the old plugin is still available  for download and the 
> new plugin is marked so that is works with 0.8 there is really no reason 
> to still have the old code in svn.

Exactly. It's just like we don't maintain forrest 0.7 in SVN (other than 
in a branch).

> So what I'd do is:
> 
> - publish the current state of the pdf-plugin if there are
>   changes
>   just checked: last change was April 10, 2007 thus before
>   the 0.8-release thus no need to republish

+1

> - update the version number of the plugin, move the libs and
>   stylesheets and test this with fop94-branch
> - when working test the new plugin with forrest 0.8 and
>   head

+1

> - when working publish the plugin and remove fop-code in
>   from head.

I assume you mean libs and stylesheets in core, in which case +1

You will also need to increment the version number of the plugin in SVN 
to 0.4-dev

We have never fixed our plugin release plan. It should really go through 
a PMC vote (otherwise the release is not really approved by the ASF) and 
we should also tag the source tree.

And the process should be documented.


Ross

Re: How to merge FOP94-branch

Posted by Ferdinand Soethe <fe...@apache.org>.
David Crossley wrote:

> Ross are you talking about "using" Forrest plugins?
> IIUC, Ferdinand is talking about developing the code
> in svn trunk. As far as i can see there can only be
> one version.

David is right. Is it at all possible to have two separate 
versions of a plugin in svn? And how would that work?

> Ferdinand i don't understand why we would want to maintain
> two separate versions.

Good point. If the old plugin is still available  for 
download and the new plugin is marked so that is works with 
0.8 there is really no reason to still have the old code in svn.

So what I'd do is:

- publish the current state of the pdf-plugin if there are
   changes
   just checked: last change was April 10, 2007 thus before
   the 0.8-release thus no need to republish
- update the version number of the plugin, move the libs and
   stylesheets and test this with fop94-branch
- when working test the new plugin with forrest 0.8 and
   head
- when working publish the plugin and remove fop-code in
   from head.

wdyt?

Ferdinand

Re: How to merge FOP94-branch

Posted by David Crossley <cr...@apache.org>.
Ross Gardler wrote:
> Ferdinand Soethe wrote:
> >
> >If libs and stylesheets where moved to the plugin directory (where they 
> >belong) there could be two versions of the plugin
> >
> >    0.2 using old fop
> >    0.3 using fop .94
> 
> Yes, both David and I responded before the mail explaining why there 
> were manual install steps. I think  you can go with your suggestion and 
> ignore our request to change minimum Forrest version. As long as it is 
> tested in both 0.8 both 0.9 properly.
> 
> >Btw. How can we maintain two plugins of the same name but with different 
> >versions in the plugin directory?
> 
> Yes.

Ross are you talking about "using" Forrest plugins?
IIUC, Ferdinand is talking about developing the code
in svn trunk. As far as i can see there can only be
one version.

Ferdinand i don't understand why we would want to maintain
two separate versions.

-David

Re: How to merge FOP94-branch

Posted by Ross Gardler <rg...@apache.org>.
Ferdinand Soethe wrote:
> If libs and stylesheets where moved to the plugin directory (where they 
> belong) there could be two versions of the plugin
> 
>     0.2 using old fop
>     0.3 using fop .94

Yes, both David and I responded before the mail explaining why there 
were manual install steps. I think  you can go with your suggestion and 
ignore our request to change minimum Forrest version. As long as it is 
tested in both 0.8 both 0.9 properly.

> Btw. How can we maintain two plugins of the same name but with different 
> versions in the plugin directory?

Yes.

Ross

Re: How to merge FOP94-branch

Posted by Ferdinand Soethe <fe...@apache.org>.
If libs and stylesheets where moved to the plugin directory 
(where they belong) there could be two versions of the plugin

	0.2 using old fop
	0.3 using fop .94

As far as I can tell, these could then be used with Forrest 
0.8 und higher and people had the option to use either 
fop-version with either Forrest version.

Btw. How can we maintain two plugins of the same name but 
with different versions in the plugin directory?

Thanks,
Ferdinand


David Crossley wrote:
> Ross Gardler wrote:
>> Ferdinand Soethe wrote:
>>> We are almost there. The branch with FOP 94 is running
>>> smoothly and I'm planning to merge it back by the end of
>>> this week.
>> Cool!
> 
> Yes, congratulations.
> 
>>> The branch changes Forrest core and the pdf-plugin
>>> Can I do a complete merge or will the plugin have to
>>> become a new version?
>>>
>>> I guess a new version is required or Forrest 0.8 runs into
>>> problems when using the modified plugin 0.2 that calls for
>>> libraries that it doesn't have.
>>>
>>> So here is what I'll do:
>>>
>>> - change version number of pdf-plugin in the branch to 0.3
>> - change required Forrest version number (but see below)
> 
> Yes, both the plugin number and the Forrest required version
> number would be incremented.
> http://forrest.apache.org/docs/dev/howto/howto-buildPlugin.html#descriptor
> 
> Please someone make sure that the existing plugin is deployed
> to our website (both locations) before changing it.
> 
>>> - merge all changes
>> You should merge changes from the whole trunk into branch first and then
>> test. If all goes well you can merge back into trunk. This step is not
>> required but sometimes it sometimes highlights a change in trunk that
>> affects your changes in the branch.
>>
>>> - create an instruction file for using the new fop in 0.8
>>>  by changing the plugin in properties to 0.3,
>>>  adding the required libraries and replace the style sheets
>> If there are manual install steps needed I don't think it's a good idea
>> to claim that FOP is supported in 0.8 (hence change the minimal forrest
>> version). We don't want support requests for this so it should be
>> confident users only.
>>
>> This will mean the autodownload will not work for this plugin and the
>> user will need to perform all steps manually including downloading the
>> plugin manually.
> 
> It would be better to do a 0.9 release.
> 
> -David
> 


Re: How to merge FOP94-branch

Posted by David Crossley <cr...@apache.org>.
Ross Gardler wrote:
> Ferdinand Soethe wrote:
> >
> >We are almost there. The branch with FOP 94 is running
> >smoothly and I'm planning to merge it back by the end of
> >this week.
>
> Cool!

Yes, congratulations.

> >The branch changes Forrest core and the pdf-plugin
> >Can I do a complete merge or will the plugin have to
> >become a new version?
> > 
> >I guess a new version is required or Forrest 0.8 runs into
> >problems when using the modified plugin 0.2 that calls for
> >libraries that it doesn't have.
> >
> >So here is what I'll do:
> >
> >- change version number of pdf-plugin in the branch to 0.3
>
> - change required Forrest version number (but see below)

Yes, both the plugin number and the Forrest required version
number would be incremented.
http://forrest.apache.org/docs/dev/howto/howto-buildPlugin.html#descriptor

Please someone make sure that the existing plugin is deployed
to our website (both locations) before changing it.

> >- merge all changes
>
> You should merge changes from the whole trunk into branch first and then
> test. If all goes well you can merge back into trunk. This step is not
> required but sometimes it sometimes highlights a change in trunk that
> affects your changes in the branch.
>
> >- create an instruction file for using the new fop in 0.8
> >  by changing the plugin in properties to 0.3,
> >  adding the required libraries and replace the style sheets
>
> If there are manual install steps needed I don't think it's a good idea
> to claim that FOP is supported in 0.8 (hence change the minimal forrest
> version). We don't want support requests for this so it should be
> confident users only.
>
> This will mean the autodownload will not work for this plugin and the
> user will need to perform all steps manually including downloading the
> plugin manually.

It would be better to do a 0.9 release.

-David

Re: How to merge FOP94-branch

Posted by Ross Gardler <rg...@apache.org>.
Ferdinand Soethe wrote:
> We are almost there. The branch with FOP 94 is running
> smoothly and I'm planning to merge it back by the end of
> this week.

Cool!

> So here is what I'll do:
> 
> - change version number of pdf-plugin in the branch to 0.3

- change required Forrest version number (but see below)

> - merge all changes

You should merge changes from the whole trunk into branch first and then 
test. If all goes well you can merge back into trunk. This step is not 
required but sometimes it sometimes highlights a change in trunk that 
affects your changes in the branch.

> - create an instruction file for using the new fop in 0.8
>   by changing the plugin in properties to 0.3,
>   adding the required libraries and replace the style sheets

If there are manual install steps needed I don't think it's a good idea 
to claim that FOP is supported in 0.8 (hence change the minimal forrest 
version). We don't want support requests for this so it should be 
confident users only.

This will mean the autodownload will not work for this plugin and the 
user will need to perform all steps manually including downloading the 
plugin manually.

Ross