cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r477028 - in /incubator/cxf/trunk/distribution: ./ src/main/assembly/ src/main/release/samples/integration/JBI/external_provider_external_consumer/ src/main/release/samples/integration/JBI/external_provider_external_consumer/service-assembl...
Date Mon, 20 Nov 2006 04:08:36 GMT
Author: ffang
Date: Sun Nov 19 20:08:34 2006
New Revision: 477028

URL: http://svn.apache.org/viewvc?view=rev&rev=477028
Log:
[CXF-250] clean temp file from distribution/src directory
[CXF-252] using enviroment variable CXF_HOME, SERVICEMIX_HOME in JBI demos
                        

Removed:
    incubator/cxf/trunk/distribution/src/main/assembly/build.properties
Modified:
    incubator/cxf/trunk/distribution/pom.xml
    incubator/cxf/trunk/distribution/src/main/assembly/bin.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-assembly/build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-engine/build.xml
    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/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-assembly/build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-engine/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/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-assembly/build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-engine/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/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-assembly/build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-engine/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/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-assembly/build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-engine/build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-unit/build.xml

Modified: incubator/cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/pom.xml?view=diff&rev=477028&r1=477027&r2=477028
==============================================================================
--- incubator/cxf/trunk/distribution/pom.xml (original)
+++ incubator/cxf/trunk/distribution/pom.xml Sun Nov 19 20:08:34 2006
@@ -319,59 +319,11 @@
                                 <property name="output.ext" value="" />
                                 <echo file="${basedir}/target/srcbuild_env${output.ext}"
message="${output.cp}" />
        			        <echo file="${basedir}/target/version.properties" message="cxf.version=${pom.version}"
/>
-                                <copy file="${basedir}/src/main/assembly/jbi.xml" tofile="${basedir}/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-engine/etc/jbi.xml"
overwrite="yes">
+                                <copy file="${basedir}/src/main/assembly/jbi.xml" tofile="${basedir}/target/jbi.xml"
overwrite="yes">
                                             <filterset>
                                                 <filter token="CXF_VERSION" value="${pom.version}"
/>
                                             </filterset>
                                 </copy>
-                                <copy file="${basedir}/src/main/assembly/jbi.xml" tofile="${basedir}/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-engine/etc/jbi.xml"
overwrite="yes">
-                                            <filterset>
-                                                <filter token="CXF_VERSION" value="${pom.version}"
/>
-                                            </filterset>
-                                </copy>
-                                <copy file="${basedir}/src/main/assembly/jbi.xml" tofile="${basedir}/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-engine/etc/jbi.xml"
overwrite="yes">
-                                            <filterset>
-                                                <filter token="CXF_VERSION" value="${pom.version}"
/>
-                                            </filterset>
-                                </copy>
-                                <copy file="${basedir}/src/main/assembly/jbi.xml" tofile="${basedir}/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-engine/etc/jbi.xml"
overwrite="yes">
-                                            <filterset>
-                                                <filter token="CXF_VERSION" value="${pom.version}"
/>
-                                            </filterset>
-                                </copy>
-                                <copy file="${basedir}/src/main/assembly/jbi.xml" tofile="${basedir}/src/main/release/samples/integration/JBI/handlers/service-engine/etc/jbi.xml"
overwrite="yes">
-                                            <filterset>
-                                                <filter token="CXF_VERSION" value="${pom.version}"
/>
-                                            </filterset>
-                                </copy>
-                                
-                                <copy file="${basedir}/src/main/assembly/build.properties"
tofile="${basedir}/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/build.properties"
overwrite="yes">
-                                            <filterset>
-                                                <filter token="CXF_VERSION" value="${pom.version}"
/>
-                                            </filterset>
-                                </copy>
-                                <copy file="${basedir}/src/main/assembly/build.properties"
tofile="${basedir}/src/main/release/samples/integration/JBI/internal_provider_external_consumer/build.properties"
overwrite="yes">
-                                            <filterset>
-                                                <filter token="CXF_VERSION" value="${pom.version}"
/>
-                                            </filterset>
-                                </copy>
-                                <copy file="${basedir}/src/main/assembly/build.properties"
tofile="${basedir}/src/main/release/samples/integration/JBI/external_provider_internal_consumer/build.properties"
overwrite="yes">
-                                            <filterset>
-                                                <filter token="CXF_VERSION" value="${pom.version}"
/>
-                                            </filterset>
-                                </copy>
-                                <copy file="${basedir}/src/main/assembly/build.properties"
tofile="${basedir}/src/main/release/samples/integration/JBI/external_provider_external_consumer/build.properties"
overwrite="yes">
-                                            <filterset>
-                                                <filter token="CXF_VERSION" value="${pom.version}"
/>
-                                            </filterset>
-                                </copy>
-                                <copy file="${basedir}/src/main/assembly/build.properties"
tofile="${basedir}/src/main/release/samples/integration/JBI/handlers/build.properties" overwrite="yes">
-                                            <filterset>
-                                                <filter token="CXF_VERSION" value="${pom.version}"
/>
-                                            </filterset>
-                                </copy>
-
-
                             </tasks>
                         </configuration>
                         <goals>

Modified: incubator/cxf/trunk/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/assembly/bin.xml?view=diff&rev=477028&r1=477027&r2=477028
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/assembly/bin.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/assembly/bin.xml Sun Nov 19 20:08:34 2006
@@ -104,6 +104,42 @@
 	        <include>ra.xml</include>
             </includes>
 	</fileSet>
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory>cxf-${cxf.version}/samples/integration/JBI/internal_provider_internal_consumer/service-engine/etc</outputDirectory>
+            <includes>
+                <include>jbi.xml</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory>cxf-${cxf.version}/samples/integration/JBI/internal_provider_external_consumer/service-engine/etc</outputDirectory>
+            <includes>
+                <include>jbi.xml</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory>cxf-${cxf.version}/samples/integration/JBI/external_provider_internal_consumer/service-engine/etc</outputDirectory>
+            <includes>
+                <include>jbi.xml</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory>cxf-${cxf.version}/samples/integration/JBI/external_provider_external_consumer/service-engine/etc</outputDirectory>
+            <includes>
+                <include>jbi.xml</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory>cxf-${cxf.version}/samples/integration/JBI/handlers/service-engine/etc</outputDirectory>
+            <includes>
+                <include>jbi.xml</include>
+            </includes>
+        </fileSet>
+
     </fileSets>
     <dependencySets>
         <dependencySet>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/README.txt?view=diff&rev=477028&r1=477027&r2=477028
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/README.txt
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/README.txt
Sun Nov 19 20:08:34 2006
@@ -56,8 +56,6 @@
 
 . export SERVICEMIX_HOME for your shell envirnoment
 
-. Edit build.properties to sepcify cxf.home and jbi.sdk.jar,
-  jbi.sdk.jar=$SERVICEMIX_HOME/lib/servicemix-jbi-3.0-SNAPSHOT.jar
 
 
 . build everything using ant: 'ant build'

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-assembly/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-assembly/build.xml?view=diff&rev=477028&r1=477027&r2=477028
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-assembly/build.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-assembly/build.xml
Sun Nov 19 20:08:34 2006
@@ -24,7 +24,6 @@
   <property name="build.lib.dir" location="${build.dir}/lib"/>
   <property name="src.dir" location="./src"/>
 
-  <property file="../build.properties"/>
   
   <target name="build" depends="build-service-assembly"/>
 

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-engine/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-engine/build.xml?view=diff&rev=477028&r1=477027&r2=477028
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-engine/build.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-engine/build.xml
Sun Nov 19 20:08:34 2006
@@ -24,14 +24,12 @@
   <property name="build.classes.dir" location="${build.dir}/classes"/>
   <property name="build.lib.dir" location="${build.dir}/lib"/>
   <property name="src.dir" location="./src"/>
-
-  <property file="../build.properties"/>
+  <property environment="env"/>
   
   <path id="build.classpath">
-    <fileset dir="${cxf.home}/lib">
+    <fileset dir="${evn.CXF_HOME}/lib">
       <include name="cxf-incubator.jar"/>
     </fileset>
-    <pathelement location="${jbi.sdk.dir}/jbi.jar"/>
     <pathelement location="./build/classes"/>
   </path>
   
@@ -41,7 +39,7 @@
     <mkdir dir="${build.lib.dir}"/>
 
     <jar destfile="${build.lib.dir}/cxf-service-engine.jar">
-      <fileset dir="${cxf.home}/lib">
+      <fileset dir="${env.CXF_HOME}/lib">
 	<include name="*.jar"/>
       </fileset>
       <metainf dir="./etc">

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=477028&r1=477027&r2=477028
==============================================================================
--- 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
Sun Nov 19 20:08:34 2006
@@ -24,16 +24,15 @@
   <property name="build.lib.dir" location="${build.dir}/lib"/>
   <property name="src.dir" location="./src"/>
   <property name="wsdl.dir" location="./wsdl"/>
-
-  <property file="../build.properties"/>
-  <property file="${cxf.home}/etc/version.properties"/>
+  <property environment="env"/>
+  <property file="${env.CXF_HOME}/etc/version.properties"/>
   <!-- reuse the macros defined in cxf samples -->
-  <import file="${cxf.home}/samples/common_build.xml"/>        
+  <import file="${env.CXF_HOME}/samples/common_build.xml"/>        
 
   <path id="build.classpath">
     <pathelement location="${build.classes.dir}"/>
-    <pathelement location="${jbi.sdk.jar}"/>
-    <fileset dir="${cxf.home}/lib">
+    <pathelement location="${env.SERVICEMIX_HOME}/lib/servicemix-jbi-3.0-incubating.jar"/>
+    <fileset dir="${env.CXF_HOME}/lib">
       <include name="cxf-incubator.jar"/>
       <include name="cxf-integration-jbi-${cxf.version}.jar"/>    
     </fileset>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/README.txt?view=diff&rev=477028&r1=477027&r2=477028
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/README.txt
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/README.txt
Sun Nov 19 20:08:34 2006
@@ -54,9 +54,6 @@
 
 . export SERVICEMIX_HOMEfor your shell envirnoment
 
-. Edit build.properties to sepcify cxf.home and jbi.sdk.jar,
-  jbi.sdk.jar=$SERVICEMIX_HOME/lib/servicemix-jbi-3.0-SNAPSHOT.jar
-
 
 . build everything using ant: 'ant build'
 

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-assembly/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-assembly/build.xml?view=diff&rev=477028&r1=477027&r2=477028
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-assembly/build.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-assembly/build.xml
Sun Nov 19 20:08:34 2006
@@ -25,7 +25,6 @@
   <property name="build.lib.dir" location="${build.dir}/lib"/>
   <property name="src.dir" location="./src"/>
 
-  <property file="../build.properties"/>
   
   <target name="build" depends="build-service-assembly"/>
 

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-engine/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-engine/build.xml?view=diff&rev=477028&r1=477027&r2=477028
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-engine/build.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-engine/build.xml
Sun Nov 19 20:08:34 2006
@@ -26,13 +26,11 @@
   <property name="build.lib.dir" location="${build.dir}/lib"/>
   <property name="src.dir" location="./src"/>
 
-  <property file="../build.properties"/>
-  
+  <property environment="env"/>  
   <path id="build.classpath">
-    <fileset dir="${cxf.home}/lib">
+    <fileset dir="${env.CXF_HOME}/lib">
       <include name="cxf-incubator.jar"/>
     </fileset>
-    <pathelement location="${jbi.sdk.dir}/jbi.jar"/>
     <pathelement location="./build/classes"/>
   </path>
   
@@ -42,7 +40,7 @@
     <mkdir dir="${build.lib.dir}"/>
 
     <jar destfile="${build.lib.dir}/cxf-service-engine.jar">
-      <fileset dir="${cxf.home}/lib">
+      <fileset dir="${env.CXF_HOME}/lib">
 	<include name="*.jar"/>
       </fileset>
       <metainf dir="./etc">

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=477028&r1=477027&r2=477028
==============================================================================
--- 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
Sun Nov 19 20:08:34 2006
@@ -27,17 +27,15 @@
   <property name="build.lib.dir" location="${build.dir}/lib"/>
   <property name="src.dir" location="./src"/>
   <property name="wsdl.dir" location="./wsdl"/>
-
-  <property file="../build.properties"/>
-  <property file="${cxf.home}/etc/version.properties"/>
-
+  <property environment="env"/>
+  <property file="${env.CXF_HOME}/etc/version.properties"/>
   <!-- reuse the macros defined in cxf samples -->
-  <import file="${cxf.home}/samples/common_build.xml"/>        
+  <import file="${env.CXF_HOME}/samples/common_build.xml"/>        
 
   <path id="build.classpath">
     <pathelement location="${build.classes.dir}"/>
-    <pathelement location="${jbi.sdk.jar}"/>
-    <fileset dir="${cxf.home}/lib">
+    <pathelement location="${env.SERVICEMIX_HOME}/lib/servicemix-jbi-3.0-incubating.jar"/>
+    <fileset dir="${env.CXF_HOME}/lib">
       <include name="cxf-incubator.jar"/>
       <include name="cxf-integration-jbi-${cxf.version}.jar"/>
     </fileset>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/README.txt?view=diff&rev=477028&r1=477027&r2=477028
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/README.txt
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/README.txt
Sun Nov 19 20:08:34 2006
@@ -46,8 +46,6 @@
   Note: Must isntall the  ServiceMix 3.0 Release.
 . export SERVICEMIX_HOME for your shell envirnoment
 
-. Edit build.properties to sepcify cxf.home and jbi.sdk.jar,
-  jbi.sdk.jar=$SERVICEMIX_HOME/lib/servicemix-jbi-3.0-SNAPSHOT.jar
 
 
 . build everything using ant: 'ant build'

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-assembly/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-assembly/build.xml?view=diff&rev=477028&r1=477027&r2=477028
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-assembly/build.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-assembly/build.xml
Sun Nov 19 20:08:34 2006
@@ -23,7 +23,6 @@
   <property name="build.lib.dir" location="${build.dir}/lib"/>
   <property name="src.dir" location="./src"/>
 
-  <property file="../build.properties"/>
   
   <target name="build" depends="build-service-assembly"/>
 

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-engine/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-engine/build.xml?view=diff&rev=477028&r1=477027&r2=477028
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-engine/build.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-engine/build.xml
Sun Nov 19 20:08:34 2006
@@ -22,14 +22,12 @@
   <property name="build.classes.dir" location="${build.dir}/classes"/>
   <property name="build.lib.dir" location="${build.dir}/lib"/>
   <property name="src.dir" location="./src"/>
-
-  <property file="../build.properties"/>
+  <property environment="env"/>
   
   <path id="build.classpath">
-    <fileset dir="${cxf.home}/lib">
+    <fileset dir="${env.CXF_HOME}/lib">
       <include name="cxf-incubator.jar"/>
     </fileset>
-    <pathelement location="${jbi.sdk.dir}/jbi.jar"/>
     <pathelement location="./build/classes"/>
   </path>
   
@@ -39,7 +37,7 @@
     <mkdir dir="${build.lib.dir}"/>
 
     <jar destfile="${build.lib.dir}/cxf-service-engine.jar">
-      <fileset dir="${cxf.home}/lib">
+      <fileset dir="${env.CXF_HOME}/lib">
 	<include name="*.jar"/>
       </fileset>
       <metainf dir="./etc">

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=477028&r1=477027&r2=477028
==============================================================================
--- 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
Sun Nov 19 20:08:34 2006
@@ -24,17 +24,16 @@
   <property name="build.lib.dir" location="${build.dir}/lib"/>
   <property name="src.dir" location="./src"/>
   <property name="wsdl.dir" location="./wsdl"/>
-
-  <property file="../build.properties"/>
-  <property file="${cxf.home}/etc/version.properties"/>
+  <property environment="env"/>
+  <property file="${env.CXF_HOME}/etc/version.properties"/>
 
   <!-- reuse the macros defined in CXF samples -->
-  <import file="${cxf.home}/samples/common_build.xml"/>        
+  <import file="${env.CXF_HOME}/samples/common_build.xml"/>        
 
   <path id="build.classpath">
     <pathelement location="${build.classes.dir}"/>
-    <pathelement location="${jbi.sdk.jar}"/>
-    <fileset dir="${cxf.home}/lib">
+    <pathelement location="${env.SERVICEMIX_HOME}/lib/servicemix-jbi-3.0-incubating.jar"/>
+    <fileset dir="${env.CXF_HOME}/lib">
       <include name="cxf-incubator.jar"/>
       <include name="cxf-integration-jbi-${cxf.version}.jar"/>
     </fileset>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/README.txt?view=diff&rev=477028&r1=477027&r2=477028
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/README.txt
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/README.txt
Sun Nov 19 20:08:34 2006
@@ -56,8 +56,6 @@
 
 . export SERVICEMIX_HOME for your shell envirnoment
 
-. Edit build.properties to sepcify cxf.home and jbi.sdk.jar,
-  jbi.sdk.jar=$SERVICEMIX_HOME/lib/servicemix-jbi-3.0-SNAPSHOT.jar
 
 . build everything using ant: 'ant build'
 

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-assembly/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-assembly/build.xml?view=diff&rev=477028&r1=477027&r2=477028
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-assembly/build.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-assembly/build.xml
Sun Nov 19 20:08:34 2006
@@ -24,7 +24,6 @@
   <property name="build.lib.dir" location="${build.dir}/lib"/>
   <property name="src.dir" location="./src"/>
 
-  <property file="../build.properties"/>
   
   <target name="build" depends="build-service-assembly"/>
 

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-engine/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-engine/build.xml?view=diff&rev=477028&r1=477027&r2=477028
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-engine/build.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-engine/build.xml
Sun Nov 19 20:08:34 2006
@@ -25,13 +25,11 @@
   <property name="build.lib.dir" location="${build.dir}/lib"/>
   <property name="src.dir" location="./src"/>
 
-  <property file="../build.properties"/>
-  
+  <property environment="env"/>  
   <path id="build.classpath">
-    <fileset dir="${cxf.home}/lib">
-      <include name="cxf.jar"/>
+    <fileset dir="${env.CXF_HOME}/lib">
+      <include name="cxf-incubator.jar"/>
     </fileset>
-    <pathelement location="${jbi.sdk.dir}/jbi.jar"/>
     <pathelement location="./build/classes"/>
   </path>
   
@@ -41,7 +39,7 @@
     <mkdir dir="${build.lib.dir}"/>
 
     <jar destfile="${build.lib.dir}/cxf-service-engine.jar">
-      <fileset dir="${cxf.home}/lib">
+      <fileset dir="${env.CXF_HOME}/lib">
 	<include name="*.jar"/>
       </fileset>
       <metainf dir="./etc">

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=477028&r1=477027&r2=477028
==============================================================================
--- 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
Sun Nov 19 20:08:34 2006
@@ -27,16 +27,15 @@
   <property name="src.dir" location="./src"/>
   <property name="wsdl.dir" location="./wsdl"/>
 
-  <property file="../build.properties"/>
-  <property file="${cxf.home}/etc/version.properties"/>
-
+  <property file="${env.CXF_HOME}/etc/version.properties"/>
+  <property environment="env"/>
   <!-- reuse the macros defined in CXF samples -->
-  <import file="${cxf.home}/samples/common_build.xml"/>        
+  <import file="${env.CXF_HOME}/samples/common_build.xml"/>        
 
   <path id="build.classpath">
     <pathelement location="${build.classes.dir}"/>
-    <pathelement location="${jbi.sdk.jar}"/>
-    <fileset dir="${cxf.home}/lib">
+    <pathelement location="${env.SERVICEMIX_HOME}/lib/servicemix-jbi-3.0-incubating.jar"/>
+    <fileset dir="${env.CXF_HOME}/lib">
       <include name="cxf-incubator.jar"/>
       <include name="cxf-integration-jbi-${cxf.version}.jar"/>
     </fileset>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/README.txt?view=diff&rev=477028&r1=477027&r2=477028
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/README.txt
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/README.txt
Sun Nov 19 20:08:34 2006
@@ -50,8 +50,6 @@
   Note: Must isntall the  ServiceMix 3.0 Release.
 . export SERVICEMIX_HOME for your shell envirnoment
 
-. Edit build.properties to sepcify cxf.home and jbi.sdk.jar,
-  jbi.sdk.jar=$SERVICEMIX_HOME/lib/servicemix-jbi-3.0-SNAPSHOT.jar
 
 
 . build everything using ant: 'ant build'

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-assembly/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-assembly/build.xml?view=diff&rev=477028&r1=477027&r2=477028
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-assembly/build.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-assembly/build.xml
Sun Nov 19 20:08:34 2006
@@ -24,7 +24,6 @@
   <property name="build.lib.dir" location="${build.dir}/lib"/>
   <property name="src.dir" location="./src"/>
 
-  <property file="../build.properties"/>
   
   <target name="build" depends="build-service-assembly"/>
 

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-engine/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-engine/build.xml?view=diff&rev=477028&r1=477027&r2=477028
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-engine/build.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-engine/build.xml
Sun Nov 19 20:08:34 2006
@@ -24,13 +24,11 @@
   <property name="build.lib.dir" location="${build.dir}/lib"/>
   <property name="src.dir" location="./src"/>
 
-  <property file="../build.properties"/>
-  
+  <property environment="env"/> 
   <path id="build.classpath">
-    <fileset dir="${cxf.home}/lib">
+    <fileset dir="${env.CXF_HOME}/lib">
       <include name="cxf-incubator.jar"/>
     </fileset>
-    <pathelement location="${jbi.sdk.dir}/jbi.jar"/>
     <pathelement location="./build/classes"/>
   </path>
   
@@ -40,7 +38,7 @@
     <mkdir dir="${build.lib.dir}"/>
 
     <jar destfile="${build.lib.dir}/cxf-service-engine.jar">
-      <fileset dir="${cxf.home}/lib">
+      <fileset dir="${env.CXF_HOME}/lib">
 	<include name="*.jar"/>
       </fileset>
       <metainf dir="./etc">

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=477028&r1=477027&r2=477028
==============================================================================
--- 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
Sun Nov 19 20:08:34 2006
@@ -25,17 +25,15 @@
   <property name="build.lib.dir" location="${build.dir}/lib"/>
   <property name="src.dir" location="./src"/>
   <property name="wsdl.dir" location="./wsdl"/>
-
-  <property file="../build.properties"/>
-  <property file="${cxf.home}/etc/version.properties"/>
-
+  <property environment="env"/>
+  <property file="${env.CXF_HOME}/etc/version.properties"/>
   <!-- reuse the macros defined in CXF samples -->
-  <import file="${cxf.home}/samples/common_build.xml"/>        
+  <import file="${env.CXF_HOME}/samples/common_build.xml"/>        
 
   <path id="build.classpath">
     <pathelement location="${build.classes.dir}"/>
-    <pathelement location="${jbi.sdk.jar}"/>
-    <fileset dir="${cxf.home}/lib">
+    <pathelement location="${env.SERVICEMIX_HOME}/lib/servicemix-jbi-3.0-incubating.jar"/>
+    <fileset dir="${env.CXF_HOME}/lib">
       <include name="cxf-incubator.jar"/>
       <include name="cxf-integration-jbi-${cxf.version}.jar"/>
     </fileset>



Mime
View raw message