Author: eglynn
Date: Thu May 7 11:12:37 2009
New Revision: 772609
URL: http://svn.apache.org/viewvc?rev=772609&view=rev
Log:
[dOSGi] Cleanup of multi-bundle felix.config.properties.append &
equinox.config.ini.append config snippets
Modified:
cxf/dosgi/trunk/distribution/multi-bundle/src/main/release/README
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.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/src/main/release/README
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/main/release/README?rev=772609&r1=772608&r2=772609&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/src/main/release/README (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/src/main/release/README Thu May
7 11:12:37 2009
@@ -14,7 +14,12 @@
Contains the dOSGi implementation and all 3rd party dependencies as
separate bundles within an archive. The current distribution is an
-instance of this type.
+instance of this type. The easiest way to get started is to explode
+this archive into your Felix or Equinox installation tree. Then
+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.
2. Single-bundle distro: cxf-dosgi-ri-singlebundle-distribution-1.0.jar
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=772609&r1=772608&r2=772609&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
Thu May 7 11:12:37 2009
@@ -1,33 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<bundles>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/geronimo-annotation_1.0_spec-1.1.1.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/geronimo-activation_1.1_spec-1.0.2.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/geronimo-javamail_1.4_spec-1.2.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/geronimo-ws-metadata_2.0_spec-1.1.2.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/com.springsource.org.apache.commons.logging-1.1.1.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/com.springsource.org.jdom-1.0.0.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/spring-core-${spring.version}.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/spring-beans-${spring.version}.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/spring-context-${spring.version}.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/com.springsource.org.aopalliance-1.0.0.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/spring-aop-${spring.version}.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/spring-osgi-io-${spring.osgi.version}.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/spring-osgi-core-${spring.osgi.version}.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/spring-osgi-extender-${spring.osgi.version}.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/pax-web-service-0.5.1.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/org.apache.servicemix.bundles.jaxb-impl-${jaxbimpl.bundle.version}.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/org.apache.servicemix.bundles.wsdl4j-${wsdl4j.bundle.version}.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/org.apache.servicemix.bundles.xmlsec-${xmlsec.bundle.version}.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/org.apache.servicemix.bundles.xmlschema-${xmlschema.bundle.version}.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/org.apache.servicemix.bundles.asm-${asm.bundle.version}.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/org.apache.servicemix.bundles.xmlresolver-${xmlresolver.bundle.version}.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/org.apache.servicemix.bundles.neethi-${neethi.bundle.version}.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/org.apache.servicemix.bundles.woodstox-${woodstox.bundle.version}.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/cxf-bundle-minimal-${cxf.version}.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/org.apache.servicemix.specs.saaj-api-1.3-${servicemix.specs.version}.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/org.apache.servicemix.specs.stax-api-1.0-${servicemix.specs.version}.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/org.apache.servicemix.specs.jaxb-api-2.1-${servicemix.specs.version}.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/org.apache.servicemix.specs.jaxws-api-2.1-${servicemix.specs.version}.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/cxf-dosgi-ri-discovery-local-${pom.version}.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/dosgi_bundles/cxf-dosgi-ri-dsw-cxf-${pom.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-annotation_1.0_spec-1.1.1.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-activation_1.1_spec-1.0.2.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-javamail_1.4_spec-1.2.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-ws-metadata_2.0_spec-1.1.2.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.org.apache.commons.logging-1.1.1.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.org.jdom-1.0.0.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-core-${spring.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-beans-${spring.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-context-${spring.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.org.aopalliance-1.0.0.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-aop-${spring.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-osgi-io-${spring.osgi.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-osgi-core-${spring.osgi.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-osgi-extender-${spring.osgi.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/pax-web-service-0.5.1.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.jaxb-impl-${jaxbimpl.bundle.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.wsdl4j-${wsdl4j.bundle.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.xmlsec-${xmlsec.bundle.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.xmlschema-${xmlschema.bundle.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.asm-${asm.bundle.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.xmlresolver-${xmlresolver.bundle.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.neethi-${neethi.bundle.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.woodstox-${woodstox.bundle.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-bundle-minimal-${cxf.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.saaj-api-1.3-${servicemix.specs.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.stax-api-1.0-${servicemix.specs.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.jaxb-api-2.1-${servicemix.specs.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.jaxws-api-2.1-${servicemix.specs.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-discovery-local-${pom.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-dsw-cxf-${pom.version}.jar</bundle>
</bundles>
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=772609&r1=772608&r2=772609&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
Thu May 7 11:12:37 2009
@@ -5,7 +5,7 @@
org.ops4j.pax.web.session.timeout=30
osgi.bundles=org.eclipse.osgi.servi...@start, \
-<xsl:for-each select="//bundles/bundle">../dosgi_bundles/<xsl:value-of
select="substring-after(text(), '.dir/dosgi_bundles/')"/><xsl:value-of
select="string('@start, ')"/></xsl:for-each>
+<xsl:for-each
select="//bundles/bundle">../apache-cxf-dosgi-ri-1.0/dosgi_bundles/<xsl:value-of
select="substring-after(text(),
'.dir/apache-cxf-dosgi-ri-1.0/dosgi_bundles/')"/><xsl:value-of
select="string('@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=772609&r1=772608&r2=772609&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
Thu May 7 11:12:37 2009
@@ -7,7 +7,7 @@
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:dosgi_bundles/<xsl:value-of
select="substring-after(text(), '.dir/dosgi_bundles/')"/>
+felix.auto.start.<xsl:value-of
select="$i"/>=file:apache-cxf-dosgi-ri-1.0/dosgi_bundles/<xsl:value-of
select="substring-after(text(),
'.dir/apache-cxf-dosgi-ri-1.0/dosgi_bundles/')"/>
</xsl:for-each>
</xsl:template>
</xsl:transform>
