You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by gm...@apache.org on 2009/01/14 23:38:16 UTC
svn commit: r734537 - in /forrest/trunk/plugins:
org.apache.forrest.plugin.input.OpenOffice.org/
org.apache.forrest.plugin.input.PhotoGallery/
org.apache.forrest.plugin.input.dtdx/
org.apache.forrest.plugin.input.excel/ org.apache.forrest.plugin.input....
Author: gmcdonald
Date: Wed Jan 14 14:38:16 2009
New Revision: 734537
URL: http://svn.apache.org/viewvc?rev=734537&view=rev
Log:
Expand src for windows users - FOR-1108
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/locationmap.xml
forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/locationmap.xml
forrest/trunk/plugins/org.apache.forrest.plugin.input.dtdx/locationmap.xml
forrest/trunk/plugins/org.apache.forrest.plugin.input.excel/locationmap.xml
forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/locationmap.xml
forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/locationmap.xml
forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/locationmap.xml
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/locationmap.xml?rev=734537&r1=734536&r2=734537&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/locationmap.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/locationmap.xml Wed Jan 14 14:38:16 2009
@@ -29,13 +29,22 @@
</components>
<locator>
<match pattern="OOo.transform.xsl.**">
- <location src="resources/stylesheets/{1}.xsl" />
+ <select>
+ <location src="resources/stylesheets/{1}.xsl" />
+ <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.listLocations/resources/stylesheets/{1}.xsl" />
+ </select>
</match>
<match pattern="OOo.transform.*.*">
- <location src="resources/stylesheets/{1}-to-{2}.xsl" />
+ <select>
+ <location src="resources/stylesheets/{1}-to-{2}.xsl" />
+ <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.listLocations/resources/stylesheets/{1}-to-{2}.xsl" />
+ </select>
</match>
<match pattern="OOo.bootstrap">
- <location src="resources/stylesheets/aggregates/openoffice.xml"/>
+ <select>
+ <location src="resources/stylesheets/aggregates/openoffice.xml"/>
+ <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.listLocations/resources/stylesheets/aggregates/openoffice.xml"/>
+ </select>
</match>
</locator>
</locationmap>
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/locationmap.xml?rev=734537&r1=734536&r2=734537&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/locationmap.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/locationmap.xml Wed Jan 14 14:38:16 2009
@@ -31,12 +31,14 @@
<locator>
<match pattern="photoGallery.transform.*.*">
- <location src="resources/stylesheets/{1}-to-{2}.xsl" />
+ <location src="resources/stylesheets/{1}-to-{2}.xsl" />
+ <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.PhotoGallery/resources/stylesheets/{1}-to-{2}.xsl" />
</match>
<match pattern="photoGallery.albuminfo.*">
<select>
<location src="{lm:project.images/gallery/{1}/album.xml}"/>
<location src="resources/default-album-metadata.xml"/>
+ <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.PhotoGallery/resources/default-album-metadata.xml"/>
</select>
</match>
</locator>
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.dtdx/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.dtdx/locationmap.xml?rev=734537&r1=734536&r2=734537&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.dtdx/locationmap.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.dtdx/locationmap.xml Wed Jan 14 14:38:16 2009
@@ -29,7 +29,10 @@
</components>
<locator>
<match pattern="dtdx.transform.*.*">
- <location src="resources/stylesheets/{1}-to-{2}.xsl" />
+ <select>
+ <location src="resources/stylesheets/{1}-to-{2}.xsl" />
+ <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.dtdx/resources/stylesheets/{1}-to{2}.xsl" />
+ </select>
</match>
</locator>
</locationmap>
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.excel/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.excel/locationmap.xml?rev=734537&r1=734536&r2=734537&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.excel/locationmap.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.excel/locationmap.xml Wed Jan 14 14:38:16 2009
@@ -29,7 +29,10 @@
</components>
<locator>
<match pattern="excel.transform.*.*">
- <location src="resources/stylesheets/{1}-to-{2}.xsl" />
+ <select>
+ <location src="resources/stylesheets/{1}-to-{2}.xsl" />
+ <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.excel/resources/stylesheets/{1}-to-{2}.xsl" />
+ </select>
</match>
</locator>
</locationmap>
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/locationmap.xml?rev=734537&r1=734536&r2=734537&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/locationmap.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/locationmap.xml Wed Jan 14 14:38:16 2009
@@ -29,10 +29,16 @@
</components>
<locator>
<match pattern="feeder.transform.*.*">
- <location src="resources/stylesheets/{1}-to-{2}.xsl" />
+ <select>
+ <location src="resources/stylesheets/{1}-to-{2}.xsl" />
+ <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.feeder/resources/stylesheets/{1}-to-{2}.xsl" />
+ </select>
</match>
<match pattern="feeder.tag-*.sources">
- <location src="resources/taggedSources.xml"/>
+ <select>
+ <location src="resources/taggedSources.xml"/>
+ <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.feeder/resources/taggedSources.xml"/>
+ </select>
</match>
</locator>
</locationmap>
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/locationmap.xml?rev=734537&r1=734536&r2=734537&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/locationmap.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/locationmap.xml Wed Jan 14 14:38:16 2009
@@ -29,7 +29,10 @@
</components>
<locator>
<match pattern="listLocations.transform.*.*">
- <location src="resources/stylesheets/{1}-to-{2}.xsl" />
+ <select>
+ <location src="resources/stylesheets/{1}-to-{2}.xsl" />
+ <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.listLocations/resources/stylesheets/{1}-to-{2}.xsl" />
+ </select>
</match>
</locator>
</locationmap>
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/locationmap.xml?rev=734537&r1=734536&r2=734537&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/locationmap.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/locationmap.xml Wed Jan 14 14:38:16 2009
@@ -32,13 +32,20 @@
<match pattern="wiki.grammar.*.*">
<select>
<location src="resources/chaperon/grammars/{1}.{2}"/>
+ <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/{1}.{2}"/>
</select>
</match>
<match pattern="wiki.transform.text4regex">
- <location src="resources/chaperon/stylesheets/text4regex.xsl"/>
+ <select>
+ <location src="resources/chaperon/stylesheets/text4regex.xsl"/>
+ <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/text4regex.xsl"/>
+ </select>
</match>
<match pattern="wiki.transform.*.*">
- <location src="resources/chaperon/stylesheets/{1}2{2}.xsl"/>
+ <select>
+ <location src="resources/chaperon/stylesheets/{1}2{2}.xsl"/>
+ <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/{1}2{2}.xsl"/>
+ </select>
</match>
</locator>
</locationmap>
RE: possible typos in todays changes (Was: svn commit: r734537)
Posted by Gavin <ga...@16degrees.com.au>.
> -----Original Message-----
> From: David Crossley [mailto:crossley@apache.org]
> Sent: Thursday, 15 January 2009 9:52 AM
> To: Forrest Developers List
> Subject: possible typos in todays changes (Was: svn commit: r734537)
>
> I only glanced over this commit - not much time lately.
> However i saw what looks like one typo in the changes
> for the "dtdx" plugin. See below.
Thanks for spotting that.
>
> I know that it is a lot of effort to test each one as you go.
> I have needed to do something similar many times before.
> If we don't test, then we all need to take extra care with
> reviewing the commits.
Yeah, I did test some randomly but admit to not testing them all.
With the dtdx one in particular, I used a perl -p -i -e command to find and
replace, as a test to bulk do them all. However I then abandoned that in
favour of altering each one manually checking for other things along the
way. I guess my typo came from the rather long perl command.
>
> I wonder if we can find a way to test all plugins with
> something akin to the current 'main/build.sh test'.
That would be good, I'm not sure I'm the one to be able to do that but I'll
take a look and see what's involved.
>
> That would then be very useful if ever we get going
> again with Apache Gump and some other continuous integration.
Hopefully soon, Hudson and Buildbot will be in use on 4 new build machines,
I'll certainly try and get forrest included into one of those.
Gav...
>
> > Author: gmcdonald
> > Date: Wed Jan 14 14:38:16 2009
> > New Revision: 734537
> >
> > URL: http://svn.apache.org/viewvc?rev=734537&view=rev
> > Log:
> > Expand src for windows users - FOR-1108
> >
> > Modified:
> >
> forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/locat
> ionmap.xml
> >
> forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/locatio
> nmap.xml
> >
> forrest/trunk/plugins/org.apache.forrest.plugin.input.dtdx/locationmap.xml
> >
> forrest/trunk/plugins/org.apache.forrest.plugin.input.excel/locationmap.xm
> l
> >
> forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/locationmap.x
> ml
> >
> forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/locati
> onmap.xml
> >
> forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/locationmap.xml
> [ snip ]
> > <match pattern="dtdx.transform.*.*">
> > - <location src="resources/stylesheets/{1}-to-{2}.xsl" />
> > + <select>
> > + <location src="resources/stylesheets/{1}-to-{2}.xsl" />
> > + <location
> src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.dtdx/resour
> ces/stylesheets/{1}-to{2}.xsl" />
>
> Should that be "-to-"?
>
> -David
>
>
> --
> No virus found in this incoming message.
> Checked by AVG.
> Version: 7.5.552 / Virus Database: 270.10.7/1893 - Release Date: 1/14/2009
> 6:59 AM
possible typos in todays changes (Was: svn commit: r734537)
Posted by David Crossley <cr...@apache.org>.
I only glanced over this commit - not much time lately.
However i saw what looks like one typo in the changes
for the "dtdx" plugin. See below.
I know that it is a lot of effort to test each one as you go.
I have needed to do something similar many times before.
If we don't test, then we all need to take extra care with
reviewing the commits.
I wonder if we can find a way to test all plugins with
something akin to the current 'main/build.sh test'.
That would then be very useful if ever we get going
again with Apache Gump and some other continuous integration.
> Author: gmcdonald
> Date: Wed Jan 14 14:38:16 2009
> New Revision: 734537
>
> URL: http://svn.apache.org/viewvc?rev=734537&view=rev
> Log:
> Expand src for windows users - FOR-1108
>
> Modified:
> forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/locationmap.xml
> forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/locationmap.xml
> forrest/trunk/plugins/org.apache.forrest.plugin.input.dtdx/locationmap.xml
> forrest/trunk/plugins/org.apache.forrest.plugin.input.excel/locationmap.xml
> forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/locationmap.xml
> forrest/trunk/plugins/org.apache.forrest.plugin.input.listLocations/locationmap.xml
> forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/locationmap.xml
[ snip ]
> <match pattern="dtdx.transform.*.*">
> - <location src="resources/stylesheets/{1}-to-{2}.xsl" />
> + <select>
> + <location src="resources/stylesheets/{1}-to-{2}.xsl" />
> + <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.dtdx/resources/stylesheets/{1}-to{2}.xsl" />
Should that be "-to-"?
-David