Return-Path: 
 <commits-return-29505-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 668FA10F23
	for <apmail-cxf-commits-archive@www.apache.org>;
 Mon, 28 Oct 2013 10:19:35 +0000 (UTC)
Received: (qmail 107 invoked by uid 500); 28 Oct 2013 10:19:35 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 99596 invoked by uid 500); 28 Oct 2013 10:19:31 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 98737 invoked by uid 99); 28 Oct 2013 10:19:30 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Oct 2013 10:19:30 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Oct 2013 10:19:27 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 10A3223888D7;
	Mon, 28 Oct 2013 10:19:06 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: 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
Date: Mon, 28 Oct 2013 10:19:05 -0000
To: commits@cxf.apache.org
From: cschneider@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20131028101906.10A3223888D7@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>