Author: eglynn
Date: Wed Nov 25 11:08:58 2009
New Revision: 884039
URL: http://svn.apache.org/viewvc?rev=884039&view=rev
Log:
Munging discovery-multi-bundle and multi-bundle distros
Added:
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_discovery_bundles.xml
Modified:
cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
cxf/dosgi/trunk/distribution/multi-bundle/src/main/release/README
Modified: cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/pom.xml?rev=884039&r1=884038&r2=884039&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/pom.xml Wed Nov 25 11:08:58 2009
@@ -196,6 +196,34 @@
<artifactId>cxf-dosgi-ri-dsw-cxf</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <!-- Discovery dependencies -->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.0.10</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.fileinstall</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.log4j</groupId>
+ <artifactId>com.springsource.org.apache.log4j</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.dosgi</groupId>
+
<artifactId>cxf-dosgi-ri-discovery-distributed-zookeeper-wrapper</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.dosgi</groupId>
+ <artifactId>cxf-dosgi-ri-discovery-distributed</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
@@ -297,6 +325,22 @@
<xslt processor="trax" in="target/classes/distro_bundles.xml"
out="target/equinox.config.ini.append"
style="src/main/xsl/equinox_buildsystem_config.xslt">
<param name="TargetDir"
expression="${current.dir}/target/" />
</xslt>
+
+ <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}" />
+ </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/" />
+ </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">
+ <param name="Version" expression="${dosgi.version}" />
+ </xslt>
+
+ <xslt processor="trax"
in="target/classes/distro_discovery_bundles.xml"
out="target/equinox.discovery.config.ini.append"
style="src/main/xsl/equinox_buildsystem_config.xslt">
+ <param name="TargetDir"
expression="${current.dir}/target/" />
+ </xslt>
</tasks>
</configuration>
<goals>
Modified: cxf/dosgi/trunk/distribution/multi-bundle/src/main/release/README
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/main/release/README?rev=884039&r1=884038&r2=884039&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/src/main/release/README (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/src/main/release/README Wed Nov
25 11:08:58 2009
@@ -19,7 +19,11 @@
append the contents of the felix.config.properties.append or
equinox.config.ini.append snippets found in the conf directory to
your felix.config.properties or equinox.config.ini. This will cause
-all the required bundles to be loaded on start-up.
+all the required bundles to be loaded on start-up. The bundles required
+for the Zookeeper-based Discovery Service implementation are also provided
+in this distribution, and similarly may be automatically loaded by
+appending the felix.discovery.config.properties.append or
+equinox.discovery.config.ini.append snippets as appropriate.
2. Single-bundle distro: cxf-dosgi-ri-singlebundle-distribution-1.1.jar
Added:
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_discovery_bundles.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_discovery_bundles.xml?rev=884039&view=auto
==============================================================================
---
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_discovery_bundles.xml
(added)
+++
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_discovery_bundles.xml
Wed Nov 25 11:08:58 2009
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bundles>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.felix.configadmin-1.0.10.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.felix.fileinstall-1.0.0.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.org.apache.log4j-${log4j.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-discovery-distributed-zookeeper-wrapper-${project.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-discovery-distributed-${project.version}.jar</bundle>
+</bundles>
