You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ul...@apache.org on 2008/09/19 15:21:04 UTC
svn commit: r697087 - in /cxf/branches/2.0.x-fixes: ./
distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-unit/build.xml
Author: ulhasbhole
Date: Fri Sep 19 06:21:04 2008
New Revision: 697087
URL: http://svn.apache.org/viewvc?rev=697087&view=rev
Log:
Merged revisions 697086 via svnmerge from
https://svn.eu.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................
r697086 | ulhasbhole | 2008-09-19 14:19:08 +0100 (Fri, 19 Sep 2008) | 9 lines
Merged revisions 697085 via svnmerge from
https://svn.eu.apache.org/repos/asf/cxf/trunk
........
r697085 | ulhasbhole | 2008-09-19 14:17:47 +0100 (Fri, 19 Sep 2008) | 3 lines
* Fixed build problem in sample.
........
................
Modified:
cxf/branches/2.0.x-fixes/ (props changed)
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-unit/build.xml
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 19 06:21:04 2008
@@ -1,3 +1,3 @@
-/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696721
-/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696433,696720
+/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696721,697086
+/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696433,696720,697085
/incubator/cxf/trunk:434594-651668
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-unit/build.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-unit/build.xml?rev=697087&r1=697086&r2=697087&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-unit/build.xml (original)
+++ cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-unit/build.xml Fri Sep 19 06:21:04 2008
@@ -34,12 +34,14 @@
</condition>
<path id="build.classpath">
<pathelement location="${build.classes.dir}"/>
- <pathelement location="${env.SERVICEMIX_HOME}/lib/servicemix-jbi-3.2.1.jar"/>
+ <fileset dir="${env.SERVICEMIX_HOME}/lib">
+ <include name="servicemix-jbi-*.jar"/>
+ </fileset>
<fileset dir="${env.CXF_HOME}/lib">
<include name="cxf-manifest.jar"/>
</fileset>
<fileset dir="${integration.jar.dir}">
- <include name="cxf-integration-jbi-${cxf.version}.jar"/>
+ <include name="cxf-integration-jbi-*.jar"/>
</fileset>
</path>