You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by da...@apache.org on 2009/02/02 17:58:04 UTC
svn commit: r740037 - in /cxf/dosgi/trunk/distribution/multi-bundle: ./
src/main/assembly/ src/main/resources/ src/main/xsl/
Author: davidb
Date: Mon Feb 2 16:58:03 2009
New Revision: 740037
URL: http://svn.apache.org/viewvc?rev=740037&view=rev
Log:
Additional configuration files for inclusion with the built multibundle distro.
Added:
cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/equinox_buildsystem_config.xslt (props changed)
- copied unchanged from r739951, cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/equinox_config.xslt
cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/equinox_distro_config.xslt
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 (contents, props changed)
- copied, changed from r739951, cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_config.xslt
Removed:
cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/equinox_config.xslt
cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_config.xslt
Modified:
cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
cxf/dosgi/trunk/distribution/multi-bundle/src/main/assembly/assembly.xml
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml
Modified: cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/pom.xml?rev=740037&r1=740036&r2=740037&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/pom.xml Mon Feb 2 16:58:03 2009
@@ -272,7 +272,7 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <phase>package</phase>
+ <phase>compile</phase>
<configuration>
<tasks>
<path id="current.dir.path">
@@ -282,15 +282,25 @@
<xslt processor="trax"
in="src/main/resources/distro_bundles.xml"
+ out="target/distribution_configs/felix.config.properties.append"
+ style="src/main/xsl/felix_distro_config.xslt" />
+
+ <xslt processor="trax"
+ in="src/main/resources/distro_bundles.xml"
out="target/felix.config.properties.append"
- style="src/main/xsl/felix_config.xslt">
+ style="src/main/xsl/felix_buildsystem_config.xslt">
<param name="TargetDir" expression="${current.dir}/target/"/>
</xslt>
<xslt processor="trax"
in="src/main/resources/distro_bundles.xml"
+ out="target/distribution_configs/equinox.config.ini.append"
+ style="src/main/xsl/equinox_distro_config.xslt" />
+
+ <xslt processor="trax"
+ in="src/main/resources/distro_bundles.xml"
out="target/equinox.config.ini.append"
- style="src/main/xsl/equinox_config.xslt">
+ style="src/main/xsl/equinox_buildsystem_config.xslt">
<param name="TargetDir" expression="${current.dir}/target/"/>
</xslt>
</tasks>
Modified: cxf/dosgi/trunk/distribution/multi-bundle/src/main/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/main/assembly/assembly.xml?rev=740037&r1=740036&r2=740037&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/src/main/assembly/assembly.xml (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/src/main/assembly/assembly.xml Mon Feb 2 16:58:03 2009
@@ -25,18 +25,22 @@
<fileSets>
<fileSet>
<directory>target/distribution_bundles</directory>
- <outputDirectory>bundles</outputDirectory>
+ <outputDirectory>dosgi_bundles</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/distribution_configs</directory>
+ <outputDirectory>conf</outputDirectory>
</fileSet>
<fileSet>
<directory>target/maven-shared-archive-resources/META-INF</directory>
- <outputDirectory>.</outputDirectory>
+ <outputDirectory></outputDirectory>
</fileSet>
<fileSet>
<directory>src/main/resources/META-INF</directory>
<includes>
<include>NOTICE.jdom</include>
</includes>
- <outputDirectory>.</outputDirectory>
+ <outputDirectory></outputDirectory>
</fileSet>
</fileSets>
</assembly>
Modified: cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml?rev=740037&r1=740036&r2=740037&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml Mon Feb 2 16:58:03 2009
@@ -1,37 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<bundles>
- <felix_deps>deps/org.osgi.compendium-1.2.0.jar</felix_deps>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/geronimo-annotation_1.0_spec-1.1.1.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/geronimo-activation_1.1_spec-1.0.2.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/geronimo-javamail_1.4_spec-1.2.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/geronimo-ws-metadata_2.0_spec-1.1.2.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/com.springsource.org.apache.commons.logging-1.1.1.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/com.springsource.org.jdom-1.0.0.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/spring-core-2.5.5.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/spring-beans-2.5.5.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/spring-context-2.5.5.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/com.springsource.org.aopalliance-1.0.0.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/spring-aop-2.5.5.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/spring-osgi-io-1.1.2.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/spring-osgi-core-1.1.2.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/spring-osgi-extender-1.1.2.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/pax-web-service-0.5.1.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/org.apache.servicemix.specs.locator-1.1.1.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/org.apache.servicemix.bundles.jaxb-impl-2.1.6_1.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/org.apache.servicemix.bundles.wsdl4j-1.6.1_1.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/org.apache.servicemix.bundles.xmlsec-1.3.0_1.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/org.apache.servicemix.bundles.wss4j-1.5.4_1.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/org.apache.servicemix.bundles.xmlschema-1.4.2_1.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/org.apache.servicemix.bundles.asm-2.2.3_1.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/org.apache.servicemix.bundles.xmlresolver-1.2_1.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/org.apache.servicemix.bundles.neethi-2.0.4_1.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/org.apache.servicemix.bundles.woodstox-3.2.7_1.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/cxf-bundle-minimal-2.2-SNAPSHOT.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/org.apache.servicemix.specs.saaj-api-1.3-1.1.1.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/org.apache.servicemix.specs.stax-api-1.0-1.1.1.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/org.apache.servicemix.specs.jaxb-api-2.1-1.1.1.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/org.apache.servicemix.specs.jaxws-api-2.1-1.1.1.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/cxf-dosgi-ri-discovery-local-1.0-SNAPSHOT.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/cxf-dosgi-ri-dsw-cxf-1.0-SNAPSHOT.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/geronimo-annotation_1.0_spec-1.1.1.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/geronimo-activation_1.1_spec-1.0.2.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/geronimo-javamail_1.4_spec-1.2.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/geronimo-ws-metadata_2.0_spec-1.1.2.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/com.springsource.org.apache.commons.logging-1.1.1.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/com.springsource.org.jdom-1.0.0.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-core-2.5.5.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-beans-2.5.5.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-context-2.5.5.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/com.springsource.org.aopalliance-1.0.0.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-aop-2.5.5.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-osgi-io-1.1.2.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-osgi-core-1.1.2.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-osgi-extender-1.1.2.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/pax-web-service-0.5.1.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.specs.locator-1.1.1.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.bundles.jaxb-impl-2.1.6_1.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.bundles.wsdl4j-1.6.1_1.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.bundles.xmlsec-1.3.0_1.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.bundles.wss4j-1.5.4_1.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.bundles.xmlschema-1.4.2_1.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.bundles.asm-2.2.3_1.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.bundles.xmlresolver-1.2_1.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.bundles.neethi-2.0.4_1.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.bundles.woodstox-3.2.7_1.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/cxf-bundle-minimal-2.2-SNAPSHOT.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.specs.saaj-api-1.3-1.1.1.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.specs.stax-api-1.0-1.1.1.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.specs.jaxb-api-2.1-1.1.1.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.specs.jaxws-api-2.1-1.1.1.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/cxf-dosgi-ri-discovery-local-1.0-SNAPSHOT.jar</bundle>
+ <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/cxf-dosgi-ri-dsw-cxf-1.0-SNAPSHOT.jar</bundle>
</bundles>
Propchange: cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/equinox_buildsystem_config.xslt
------------------------------------------------------------------------------
svn:mergeinfo =
Added: 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=740037&view=auto
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/equinox_distro_config.xslt (added)
+++ cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/equinox_distro_config.xslt Mon Feb 2 16:58:03 2009
@@ -0,0 +1,9 @@
+<?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:template match="/">
+osgi.bundles=org.eclipse.osgi.services@start, \
+<xsl:for-each select="//bundles/bundle">file\:dosgi_bundles/<xsl:value-of select="substring-after(text(), 'cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/')"/><xsl:value-of select="string('@start, ')"/></xsl:for-each>
+ </xsl:template>
+</xsl:transform>
+
Added: 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=740037&view=auto
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_buildsystem_config.xslt (added)
+++ cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_buildsystem_config.xslt Mon Feb 2 16:58:03 2009
@@ -0,0 +1,14 @@
+<?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="TargetDir"/>
+ <xsl:template match="/">
+org.osgi.framework.startlevel=<xsl:value-of select="count(//bundles/felix_deps) + count(//bundles/bundle) + 2"/>
+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:/<xsl:value-of select="$TargetDir"/><xsl:value-of select="text()"/>
+ </xsl:for-each>
+ </xsl:template>
+</xsl:transform>
+
Copied: cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_distro_config.xslt (from r739951, cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_config.xslt)
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_distro_config.xslt?p2=cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_distro_config.xslt&p1=cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_config.xslt&r1=739951&r2=740037&rev=740037&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_config.xslt (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_distro_config.xslt Mon Feb 2 16:58:03 2009
@@ -1,16 +1,12 @@
<?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="TargetDir"/>
<xsl:template match="/">
-org.osgi.framework.startlevel=<xsl:value-of select="count(//bundles/felix_deps) + count(//bundles/bundle) + 1"/>
- <xsl:for-each select="//bundles/felix_deps">
- <xsl:variable name="i" select="position() + 1"/>
-felix.auto.start.<xsl:value-of select="$i"/>=file:/<xsl:value-of select="$TargetDir"/><xsl:value-of select="text()"/>
- </xsl:for-each>
+org.osgi.framework.startlevel=<xsl:value-of select="count(//bundles/felix_deps) + count(//bundles/bundle) + 2"/>
+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) + 1"/>
-felix.auto.start.<xsl:value-of select="$i"/>=file:/<xsl:value-of select="$TargetDir"/><xsl:value-of select="text()"/>
+ <xsl:variable name="i" select="position() + count(//bundles/felix_deps) + 2"/>
+felix.auto.start.<xsl:value-of select="$i"/>=file:dosgi_bundles/<xsl:value-of select="substring-after(text(), 'cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/')"/>
</xsl:for-each>
</xsl:template>
</xsl:transform>
Propchange: cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_distro_config.xslt
------------------------------------------------------------------------------
svn:mergeinfo =