Hi,
Le 22/04/10 23:13, Paul Libbrecht a écrit :
Ludovic,
this sounds like a greeeeat addition but let me get more details:
- in what forms are the pages committed? In xwiki-document-xml? Without an external source linking for the body of the content? (e.g. an entity definition using the relative file xxx.vm when it's obviously a velocity source?).
XWiki xml at this point including attachments and content. No the body of the content is not extracted.. To do so we would need an xwiki xar plugin that can rebuild the xar from an extracted source, as we want to be able to generate a xar with maven also
+ now most (ideally all) documents have xwiki/2.0 syntax content, which is not HTML/velocity mix, so extracting the content has a bit less value - until there are more tools around xwiki 2.0 syntax, that is :) It would mostly provide nicer, not XML-encoded, diffs The maven plugin to inject the content from an external source is not very hard to do, we just have to define some conventions/ default configuration (for example it could be : if there is a file named MyDoc.xwiki20 or MyDoc.vm then its content is injected when loading MyDoc.xml) Very useful app already, anyway. Jerome
- Is there a place where I can see it in action?
No because this would let people commit stuff
Ludovic
thanks in advance
paul
Le 22-avr.-10 à 19:42, Ludovic Dubost a écrit :
Hi,
If you are following the xwiki comments, you might have seen that I've been working on an SVN application for XWiki.
I've published this application here: http://code.xwiki.org/xwiki/bin/view/Applications/SVNApplication
The objective of this application is to bring to XWiki Applications more professional development practices. One of them is the ability to do version management of XWiki applications. Of course XWiki contains versioning but this versioning does not apply accross wikis and makes it difficult to contribute code back to the community.
With the SVN application you can now directly contribute code and code updates to the XWiki SVN contrib repository or to any other SVN repository. You can even commit in multiple SVN repositories in the same Wiki.
The SVN Application supports:
1/ Compare the Wiki (limited to a list of spaces) with the SVN repository listing - added pages in the wiki - modified pages in the wiki - new pages in SVN - modified pages in SVN - conflicting pages modified in both SVN and the Wiki 2/ Commit in the SVN Repository 3/ Update from the SVN Repostory 4/ Show differences between SVN and the Wiki (in XML)
The SVN Application does not provide merging and conflict resolution. The SVN Application normalizes XWiki XML allowing the cleanup the XML to not have the user, the dates, comments. This is necessary to provide concurrent development on multiple XWiki server without telling you that the pages have changed all the time.
The source code is of course in SVN at http://svn.xwiki.org/svnroot/xwiki/contrib/sandbox/xwiki-svn/
Ludovic
-- Ludovic Dubost Blog: http://blog.ludovic.org/ XWiki: http://www.xwiki.com Skype: ldubost GTalk: ldubost
<ludovic.vcf>_______________________________________________ devs mailing list [email protected] http://lists.xwiki.org/mailman/listinfo/devs
_______________________________________________ devs mailing list [email protected] http://lists.xwiki.org/mailman/listinfo/devs
-- Ludovic Dubost Blog: http://blog.ludovic.org/ XWiki: http://www.xwiki.com Skype: ldubost GTalk: ldubost _______________________________________________ devs mailing list [email protected] http://lists.xwiki.org/mailman/listinfo/devs