You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cxf.apache.org by Daniel Kulp <dk...@apache.org> on 2009/05/07 16:27:16 UTC
Re: svn commit: r772651 - in /cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl: equinox_distro_config.xslt felix_distro_config.xslt
Eoghan,
Could the version be passed into the xslt via an xslt param? That would
avoid needing to modify it as part of the builds and such.
Dan
On Thu May 7 2009 10:04:10 am eglynn@apache.org wrote:
> Author: eglynn
> Date: Thu May 7 14:04:09 2009
> New Revision: 772651
>
> URL: http://svn.apache.org/viewvc?rev=772651&view=rev
> Log:
> [dOSGi] Update version in distro xslt files
>
> Modified:
>
> cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/equinox_distro_confi
>g.xslt
> cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_distro_config.
>xslt
>
> Modified:
> cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/equinox_distro_confi
>g.xslt URL:
> http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/
>main/xsl/equinox_distro_config.xslt?rev=772651&r1=772650&r2=772651&view=diff
> ===========================================================================
>=== ---
> cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/equinox_distro_confi
>g.xslt (original) +++
> cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/equinox_distro_confi
>g.xslt Thu May 7 14:04:09 2009 @@ -5,7 +5,7 @@
> org.ops4j.pax.web.session.timeout=30
>
> osgi.bundles=org.eclipse.osgi.services@start, \
> -<xsl:for-each
> select="//bundles/bundle">../apache-cxf-dosgi-ri-1.0/dosgi_bundles/<xsl:val
>ue-of select="substring-after(text(),
> '.dir/apache-cxf-dosgi-ri-1.0/dosgi_bundles/')"/><xsl:value-of
> select="string('@start, ')"/></xsl:for-each> +<xsl:for-each
> select="//bundles/bundle">../apache-cxf-dosgi-ri-1.1-SNAPSHOT/dosgi_bundles
>/<xsl:value-of select="substring-after(text(),
> '.dir/apache-cxf-dosgi-ri-1.1-SNAPSHOT/dosgi_bundles/')"/><xsl:value-of
> select="string('@start, ')"/></xsl:for-each> </xsl:template>
> </xsl:transform>
>
>
> Modified:
> cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_distro_config.
>xslt URL:
> http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/
>main/xsl/felix_distro_config.xslt?rev=772651&r1=772650&r2=772651&view=diff
> ===========================================================================
>=== ---
> cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_distro_config.
>xslt (original) +++
> cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_distro_config.
>xslt Thu May 7 14:04:09 2009 @@ -7,7 +7,7 @@
>
> felix.auto.start.2=http://www.apache.org/dist/felix/org.osgi.compendium-1.2
>.0.jar <xsl:for-each select="//bundles/bundle">
> <xsl:variable name="i" select="position() +
> count(//bundles/felix_deps) + 2"/> -felix.auto.start.<xsl:value-of
> select="$i"/>=file:apache-cxf-dosgi-ri-1.0/dosgi_bundles/<xsl:value-of
> select="substring-after(text(),
> '.dir/apache-cxf-dosgi-ri-1.0/dosgi_bundles/')"/>
> +felix.auto.start.<xsl:value-of
> select="$i"/>=file:apache-cxf-dosgi-ri-1.1-SNAPSHOT/dosgi_bundles/<xsl:valu
>e-of select="substring-after(text(),
> '.dir/apache-cxf-dosgi-ri-1.1-SNAPSHOT/dosgi_bundles/')"/> </xsl:for-each>
> </xsl:template>
> </xsl:transform>
--
Daniel Kulp
dkulp@apache.org
http://www.dankulp.com/blog
Re: svn commit: r772651 - in /cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl:
equinox_distro_config.xslt felix_distro_config.xslt
Posted by David Bosschaert <da...@gmail.com>.
2009/5/7 Eoghan Glynn <eo...@gmail.com>:
> 2009/5/7 Daniel Kulp <dk...@apache.org>:
>>
>> Eoghan,
>>
>> Could the version be passed into the xslt via an xslt param? That would
>> avoid needing to modify it as part of the builds and such.
>>
>> Dan
>
>
> Yeah, sure it could.
>
> The literal version in the xslt was just a quick'n'dirty fix for a
> minor issue in the OSGi container config snippets that I noticed right
> on the cusp of cutting the take 2 release.
>
> I'll replace it with something more maintainable.
>
> /Eoghan
>
You could probably take a similar approach to what is done with
http://svn.apache.org/repos/asf/cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml
It uses Maven filtering to put in versions...
David
Re: svn commit: r772651 - in /cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl:
equinox_distro_config.xslt felix_distro_config.xslt
Posted by Eoghan Glynn <eo...@gmail.com>.
2009/5/7 Daniel Kulp <dk...@apache.org>:
>
> Eoghan,
>
> Could the version be passed into the xslt via an xslt param? That would
> avoid needing to modify it as part of the builds and such.
>
> Dan
Yeah, sure it could.
The literal version in the xslt was just a quick'n'dirty fix for a
minor issue in the OSGi container config snippets that I noticed right
on the cusp of cutting the take 2 release.
I'll replace it with something more maintainable.
/Eoghan