Author: eglynn
Date: Wed Nov 25 14:48:39 2009
New Revision: 884121
URL: http://svn.apache.org/viewvc?rev=884121&view=rev
Log:
Fixing generated felix config snippets so that the index ranges don't overlap
Modified:
cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_buildsystem_config.xslt
cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_distro_config.xslt
Modified: cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/pom.xml?rev=884121&r1=884120&r2=884121&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/pom.xml Wed Nov 25 14:48:39 2009
@@ -312,10 +312,12 @@
<xslt processor="trax" in="target/classes/distro_bundles.xml"
out="target/distribution_configs/felix.config.properties.append"
style="src/main/xsl/felix_distro_config.xslt">
<param name="Version" expression="${dosgi.version}" />
+ <param name="Offset" expression="50" />
</xslt>
<xslt processor="trax" in="target/classes/distro_bundles.xml"
out="target/felix.config.properties.append"
style="src/main/xsl/felix_buildsystem_config.xslt">
<param name="TargetDir"
expression="${current.dir}/target/" />
+ <param name="Offset" expression="50" />
</xslt>
<xslt processor="trax" in="target/classes/distro_bundles.xml"
out="target/distribution_configs/equinox.config.ini.append"
style="src/main/xsl/equinox_distro_config.xslt">
@@ -328,10 +330,12 @@
<xslt processor="trax"
in="target/classes/distro_discovery_bundles.xml"
out="target/distribution_configs/felix.discovery.config.properties.append"
style="src/main/xsl/felix_distro_config.xslt">
<param name="Version" expression="${dosgi.version}" />
+ <param name="Offset" expression="100" />
</xslt>
<xslt processor="trax"
in="target/classes/distro_discovery_bundles.xml"
out="target/felix.discovery.config.properties.append"
style="src/main/xsl/felix_buildsystem_config.xslt">
<param name="TargetDir"
expression="${current.dir}/target/" />
+ <param name="Offset" expression="100" />
</xslt>
<xslt processor="trax"
in="target/classes/distro_discovery_bundles.xml"
out="target/distribution_configs/equinox.discovery.config.ini.append"
style="src/main/xsl/equinox_distro_config.xslt">
Modified:
cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_buildsystem_config.xslt
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_buildsystem_config.xslt?rev=884121&r1=884120&r2=884121&view=diff
==============================================================================
---
cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_buildsystem_config.xslt
(original)
+++
cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_buildsystem_config.xslt
Wed Nov 25 14:48:39 2009
@@ -2,12 +2,13 @@
<xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<xsl:output method="text" version="1.0" encoding="UTF-8" indent="yes"/>
<xsl:param name="TargetDir"/>
+ <xsl:param name="Offset"/>
<xsl:template match="/">
org.ops4j.pax.web.session.timeout=30
-org.osgi.framework.startlevel.beginning=<xsl:value-of
select="count(//bundles/felix_deps) + count(//bundles/bundle) + 2"/>
-felix.auto.start.2=http://repo2.maven.org/maven2/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar
+org.osgi.framework.startlevel.beginning=<xsl:value-of
select="count(//bundles/felix_deps) + count(//bundles/bundle) + $Offset"/>
+felix.auto.start.<xsl:value-of
select="$Offset"/>=http://repo2.maven.org/maven2/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar
<xsl:for-each select="//bundles/bundle">
- <xsl:variable name="i" select="position() + count(//bundles/felix_deps)
+ 2"/>
+ <xsl:variable name="i" select="position() + count(//bundles/felix_deps)
+ $Offset"/>
felix.auto.start.<xsl:value-of select="$i"/>=file:/<xsl:value-of
select="$TargetDir"/><xsl:value-of select="text()"/>
</xsl:for-each>
</xsl:template>
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=884121&r1=884120&r2=884121&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
Wed Nov 25 14:48:39 2009
@@ -2,13 +2,14 @@
<xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<xsl:output method="text" version="1.0" encoding="UTF-8" indent="yes"/>
<xsl:param name="Version"/>
+ <xsl:param name="Offset"/>
<xsl:variable name = "Basename">.dir/apache-cxf-dosgi-ri-<xsl:value-of
select="$Version"/>/dosgi_bundles/</xsl:variable>
<xsl:template match="/">
org.ops4j.pax.web.session.timeout=30
-org.osgi.framework.startlevel.beginning=<xsl:value-of
select="count(//bundles/felix_deps) + count(//bundles/bundle) + 2"/>
-felix.auto.start.2=http://repo2.maven.org/maven2/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar
+org.osgi.framework.startlevel.beginning=<xsl:value-of
select="count(//bundles/felix_deps) + count(//bundles/bundle) + $Offset"/>
+felix.auto.start.<xsl:value-of
select="$Offset"/>=http://repo2.maven.org/maven2/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar
<xsl:for-each select="//bundles/bundle">
- <xsl:variable name="i" select="position() + count(//bundles/felix_deps)
+ 2"/>
+ <xsl:variable name="i" select="position() + count(//bundles/felix_deps)
+ $Offset"/>
felix.auto.start.<xsl:value-of
select="$i"/>=file:apache-cxf-dosgi-ri-<xsl:value-of
select="$Version"/>/dosgi_bundles/<xsl:value-of select="substring-after(text(),
$Basename)"/>
</xsl:for-each>
</xsl:template>
