You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2007/06/14 10:32:53 UTC
svn commit: r547168 - in
/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI:
external_provider_external_consumer/service-unit/
external_provider_internal_consumer/service-unit/ handlers/service-unit/
internal_provider_external_c...
Author: ffang
Date: Thu Jun 14 01:32:49 2007
New Revision: 547168
URL: http://svn.apache.org/viewvc?view=rev&rev=547168
Log:
add directory exist check for JBI samples
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-unit/build.xml
incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-unit/build.xml
incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-unit/build.xml
incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-unit/build.xml
incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-unit/build.xml
incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-unit/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-unit/build.xml?view=diff&rev=547168&r1=547167&r2=547168
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-unit/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-unit/build.xml Thu Jun 14 01:32:49 2007
@@ -28,14 +28,17 @@
<property file="${env.CXF_HOME}/etc/version.properties"/>
<!-- reuse the macros defined in cxf samples -->
<import file="${env.CXF_HOME}/samples/common_build.xml"/>
-
+
+ <condition property="integration.jar.dir" value="${env.CXF_HOME}/modules/integration" else="${env.CXF_HOME}/lib">
+ <available file="${env.CXF_HOME}/modules/integration" type="dir"/>
+ </condition>
<path id="build.classpath">
<pathelement location="${build.classes.dir}"/>
<pathelement location="${env.SERVICEMIX_HOME}/lib/servicemix-jbi-3.1-incubating.jar"/>
<fileset dir="${env.CXF_HOME}/lib">
<include name="cxf-manifest-incubator.jar"/>
</fileset>
- <fileset dir="${env.CXF_HOME}/modules/integration">
+ <fileset dir="${integration.jar.dir}">
<include name="cxf-integration-jbi-${cxf.version}.jar"/>
</fileset>
</path>
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-unit/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-unit/build.xml?view=diff&rev=547168&r1=547167&r2=547168
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-unit/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-unit/build.xml Thu Jun 14 01:32:49 2007
@@ -31,14 +31,17 @@
<property file="${env.CXF_HOME}/etc/version.properties"/>
<!-- reuse the macros defined in cxf samples -->
<import file="${env.CXF_HOME}/samples/common_build.xml"/>
-
+
+ <condition property="integration.jar.dir" value="${env.CXF_HOME}/modules/integration" else="${env.CXF_HOME}/lib">
+ <available file="${env.CXF_HOME}/modules/integration" type="dir"/>
+ </condition>
<path id="build.classpath">
<pathelement location="${build.classes.dir}"/>
<pathelement location="${env.SERVICEMIX_HOME}/lib/servicemix-jbi-3.1-incubating.jar"/>
<fileset dir="${env.CXF_HOME}/lib">
<include name="cxf-manifest-incubator.jar"/>
</fileset>
- <fileset dir="${env.CXF_HOME}/modules/integration">
+ <fileset dir="${integration.jar.dir}">
<include name="cxf-integration-jbi-${cxf.version}.jar"/>
</fileset>
</path>
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-unit/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-unit/build.xml?view=diff&rev=547168&r1=547167&r2=547168
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-unit/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-unit/build.xml Thu Jun 14 01:32:49 2007
@@ -29,14 +29,16 @@
<!-- reuse the macros defined in CXF samples -->
<import file="${env.CXF_HOME}/samples/common_build.xml"/>
-
+ <condition property="integration.jar.dir" value="${env.CXF_HOME}/modules/integration" else="${env.CXF_HOME}/lib">
+ <available file="${env.CXF_HOME}/modules/integration" type="dir"/>
+ </condition>
<path id="build.classpath">
<pathelement location="${build.classes.dir}"/>
<pathelement location="${env.SERVICEMIX_HOME}/lib/servicemix-jbi-3.1-incubating.jar"/>
<fileset dir="${env.CXF_HOME}/lib">
<include name="cxf-manifest-incubator.jar"/>
</fileset>
- <fileset dir="${env.CXF_HOME}/modules/integration">
+ <fileset dir="${integration.jar.dir}">
<include name="cxf-integration-jbi-${cxf.version}.jar"/>
</fileset>
</path>
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-unit/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-unit/build.xml?view=diff&rev=547168&r1=547167&r2=547168
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-unit/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-unit/build.xml Thu Jun 14 01:32:49 2007
@@ -31,6 +31,9 @@
<property file="${env.CXF_HOME}/etc/version.properties"/>
<!-- reuse the macros defined in CXF samples -->
<import file="${env.CXF_HOME}/samples/common_build.xml"/>
+ <condition property="integration.jar.dir" value="${env.CXF_HOME}/modules/integration" else="${env.CXF_HOME}/lib">
+ <available file="${env.CXF_HOME}/modules/integration" type="dir"/>
+ </condition>
<path id="build.classpath">
<pathelement location="${build.classes.dir}"/>
@@ -38,7 +41,7 @@
<fileset dir="${env.CXF_HOME}/lib">
<include name="cxf-manifest-incubator.jar"/>
</fileset>
- <fileset dir="${env.CXF_HOME}/modules/integration">
+ <fileset dir="${integration.jar.dir}">
<include name="cxf-integration-jbi-${cxf.version}.jar"/>
</fileset>
</path>
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-unit/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-unit/build.xml?view=diff&rev=547168&r1=547167&r2=547168
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-unit/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-unit/build.xml Thu Jun 14 01:32:49 2007
@@ -29,14 +29,16 @@
<property file="${env.CXF_HOME}/etc/version.properties"/>
<!-- reuse the macros defined in CXF samples -->
<import file="${env.CXF_HOME}/samples/common_build.xml"/>
-
+ <condition property="integration.jar.dir" value="${env.CXF_HOME}/modules/integration" else="${env.CXF_HOME}/lib">
+ <available file="${env.CXF_HOME}/modules/integration" type="dir"/>
+ </condition>
<path id="build.classpath">
<pathelement location="${build.classes.dir}"/>
<pathelement location="${env.SERVICEMIX_HOME}/lib/servicemix-jbi-3.1-incubating.jar"/>
<fileset dir="${env.CXF_HOME}/lib">
<include name="cxf-manifest-incubator.jar"/>
</fileset>
- <fileset dir="${env.CXF_HOME}/modules/integration">
+ <fileset dir="${integration.jar.dir}">
<include name="cxf-integration-jbi-${cxf.version}.jar"/>
</fileset>
</path>
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml?view=diff&rev=547168&r1=547167&r2=547168
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml Thu Jun 14 01:32:49 2007
@@ -25,22 +25,17 @@
<property name="src.dir" location="./src"/>
<property environment="env"/>
- <path id="build.classpath">
- <fileset dir="${env.CXF_HOME}/modules">
- <include name="cxf-manifest-incubator.jar"/>
- </fileset>
- <pathelement location="./build/classes"/>
- </path>
-
<target name="build" depends="build-service-engine"/>
-
+ <condition property="integration.jar.dir" value="${env.CXF_HOME}/modules/integration" else="${env.CXF_HOME}/lib">
+ <available file="${env.CXF_HOME}/modules/integration" type="dir"/>
+ </condition>
+ <echo message="the integration jar is in ${integration.jar.dir}"/>
<target name="build-service-engine">
<mkdir dir="${build.lib.dir}"/>
- <jar destfile="${build.lib.dir}/cxf-service-engine.jar">
+ <jar destfile="${build.lib.dir}/cxf-service-engine.jar" duplicate="preserve">
<fileset dir="${env.CXF_HOME}/lib">
- <include name="cxf-2.0-incubator-SNAPSHOT.jar"/>
- <include name="cxf-manifest-incubator.jar"/>
+ <include name="cxf*.jar"/>
<include name="jaxb*.jar"/>
<include name="neethi-2.0.jar"/>
<include name="jaxws-api-2.0.jar"/>
@@ -51,8 +46,8 @@
<include name="XmlSchema-1.2.jar"/>
<include name="wstx-asl-3.2.1.jar"/>
</fileset>
- <fileset dir="${env.CXF_HOME}/modules/integration">
- <include name="*.jar"/>
+ <fileset dir="${integration.jar.dir}">
+ <include name="cxf*.jar"/>
</fileset>
<metainf dir="./etc">
<include name="jbi.xml"/>