Author: davidb
Date: Mon Apr 6 09:36:04 2009
New Revision: 762265
URL: http://svn.apache.org/viewvc?rev=762265&view=rev
Log:
Added substitution to version numbers for those libraries that have version
numbers specified in the parent pom.
Modified:
cxf/dosgi/trunk/distribution/multi-bundle/pom.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=762265&r1=762264&r2=762265&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/pom.xml Mon Apr 6 09:36:04 2009
@@ -23,7 +23,7 @@
<groupId>org.apache.cxf.dosgi</groupId>
<artifactId>cxf-dosgi-ri-multibundle-distribution</artifactId>
<version>1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
+ <packaging>jar</packaging>
<name>Distributed OSGI Multi-Bundle Distribution</name>
<url>http://cxf.apache.org</url>
@@ -198,8 +198,16 @@
<version>${project.version}</version>
</dependency>
</dependencies>
+
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -276,24 +284,24 @@
<pathconvert targetos="unix" property="current.dir"
refid="current.dir.path"/>
<xslt processor="trax"
- in="src/main/resources/distro_bundles.xml"
+ in="target/classes/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"
+ in="target/classes/distro_bundles.xml"
out="target/felix.config.properties.append"
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"
+ in="target/classes/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"
+ 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/"/>
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=762265&r1=762264&r2=762265&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 Apr 6 09:36:04 2009
@@ -6,30 +6,30 @@
<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.6.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-beans-2.5.6.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-context-2.5.6.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-core-${spring.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-beans-${spring.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-context-${spring.version}.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.6.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-osgi-io-1.2.0-rc2-SNAPSHOT.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-osgi-core-1.2.0-rc2-SNAPSHOT.jar</bundle>
-
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-osgi-extender-1.2.0-rc2-SNAPSHOT.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-aop-${spring.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-osgi-io-${spring.osgi.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-osgi-core-${spring.osgi.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-osgi-extender-${spring.osgi.version}.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.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.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>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.bundles.jaxb-impl-${jaxbimpl.bundle.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.bundles.wsdl4j-${wsdl4j.bundle.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.bundles.xmlsec-${xmlsec.bundle.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.bundles.wss4j-${wss4j.bundle.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.bundles.xmlschema-${xmlschema.bundle.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.bundles.asm-${asm.bundle.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.bundles.xmlresolver-${xmlresolver.bundle.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.bundles.neethi-${neethi.bundle.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.bundles.woodstox-${woodstox.bundle.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/cxf-bundle-minimal-${cxf.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.specs.saaj-api-1.3-${servicemix.specs.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.specs.stax-api-1.0-${servicemix.specs.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.specs.jaxb-api-2.1-${servicemix.specs.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.specs.jaxws-api-2.1-${servicemix.specs.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/cxf-dosgi-ri-discovery-local-${pom.version}.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/cxf-dosgi-ri-dsw-cxf-${pom.version}.jar</bundle>
</bundles>
