You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by cs...@apache.org on 2013/10/28 11:19:05 UTC
svn commit: r1536301 - in /cxf/dosgi/trunk/distribution/multi-bundle:
pom.xml src/main/xsl/equinox_distro_config.xslt
src/main/xsl/felix_distro_config.xslt
Author: cschneider
Date: Mon Oct 28 10:19:05 2013
New Revision: 1536301
URL: http://svn.apache.org/r1536301
Log:
Introduce a filter step to enable easier customization. Remove some unnecessary parameters for xsl
Modified:
cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/equinox_distro_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=1536301&r1=1536300&r2=1536301&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/pom.xml Mon Oct 28 10:19:05 2013
@@ -73,7 +73,7 @@
<repository>target/distribution_bundles</repository>
<resolveDefinedRepositoriesRecursively>true</resolveDefinedRepositoriesRecursively>
<flatRepoLayout>true</flatRepoLayout>
- <exportMetaData>true</exportMetaData>
+ <mergedFeature>true</mergedFeature>
<karafVersion>2.3.2</karafVersion>
</configuration>
</execution>
@@ -87,19 +87,9 @@
<phase>package</phase>
<configuration>
<target>
- <path id="current.dir.path">
- <pathelement location="." />
- </path>
- <pathconvert targetos="unix" property="current.dir" refid="current.dir.path" />
-
- <xslt processor="trax" in="target/features.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/features.xml" out="target/distribution_configs/config.ini" style="src/main/xsl/equinox_distro_config.xslt">
- <param name="TargetDir" expression="${current.dir}/target/" />
- </xslt>
+ <xslt processor="trax" in="target/features.xml" out="target/filtered-features.xml" style="src/main/xsl/filter_features.xslt"/>
+ <xslt processor="trax" in="target/filtered-features.xml" out="target/distribution_configs/felix.config.properties.append" style="src/main/xsl/felix_distro_config.xslt"/>
+ <xslt processor="trax" in="target/filtered-features.xml" out="target/distribution_configs/config.ini" style="src/main/xsl/equinox_distro_config.xslt"/>
</target>
</configuration>
<goals>
Modified: cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/equinox_distro_config.xslt
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/equinox_distro_config.xslt?rev=1536301&r1=1536300&r2=1536301&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/equinox_distro_config.xslt (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/equinox_distro_config.xslt Mon Oct 28 10:19:05 2013
@@ -10,7 +10,7 @@ osgi.bundles=org.eclipse.osgi.services@s
../plugins/org.apache.felix.gogo.shell_0.8.0.v201110170705.jar@start, \
../plugins/org.apache.felix.gogo.command_0.8.0.v201108120515.jar@start, \
../plugins/org.apache.felix.gogo.runtime_0.8.0.v201108120515.jar@start, \
-<xsl:for-each select="//bundle[not(contains(@name,'cxf-karaf-commands'))]">../dosgi_bundles/<xsl:value-of select="@name"/>@start, \
+<xsl:for-each select="//bundle"><xsl:sort select="@start-level" data-type="number" order="ascending"/>../dosgi_bundles/<xsl:value-of select="@name"/>@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=1536301&r1=1536300&r2=1536301&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 Mon Oct 28 10:19:05 2013
@@ -1,15 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<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:template match="/">
org.ops4j.pax.web.session.timeout=30
org.osgi.framework.startlevel.beginning=200
-<xsl:for-each select="//bundle[not(contains(@name,'cxf-karaf-commands'))]">
-<xsl:sort select="@start-level" data-type="number"/>
-<xsl:variable name="i" select="position() + count(//bundles/felix_deps) + $Offset"/>
+<xsl:for-each select="//bundle">
+<xsl:sort select="@start-level" data-type="number" order="ascending"/>
+<xsl:variable name="i" select="position() + count(//bundles/felix_deps) + 50"/>
felix.auto.start.<xsl:value-of select="$i"/>=file:dosgi_bundles/<xsl:value-of select="@name"/>
</xsl:for-each>