Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: cxf-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r553057 - in
 /incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/hello_world_soap_http:
 README.txt build.xml
Date: Wed, 04 Jul 2007 03:25:28 -0000
To: cxf-commits@incubator.apache.org
From: ffang@apache.org
Message-Id: <20070704032529.242911A981A@eris.apache.org>

Author: ffang
Date: Tue Jul  3 20:25:28 2007
New Revision: 553057

URL: http://svn.apache.org/viewvc?view=rev&rev=553057
Log:
[CXF-761] patch for jca sample provided by Jeff Zhang

Modified:
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/hello_world_soap_http/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/hello_world_soap_http/build.xml

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/hello_world_soap_http/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/hello_world_soap_http/README.txt?view=diff&rev=553057&r1=553056&r2=553057
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/hello_world_soap_http/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/hello_world_soap_http/README.txt Tue Jul  3 20:25:28 2007
@@ -62,7 +62,9 @@
     deployment will be shared by all of the demos, so this step need
     only be completed once.  
 
-
+    If you embed CXF in software product which have license, please copy
+    the license file into $CXF_HOME/etc/ and save name with licenses.txt
+    
     How to deploy the Apache CXF J2EE Connector is dependent on your 
     application server. Please consult your vendor documentation
     on connector deployment. Here are basic instructions to deploy

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/hello_world_soap_http/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/hello_world_soap_http/build.xml?view=diff&rev=553057&r1=553056&r2=553057
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/hello_world_soap_http/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/hello_world_soap_http/build.xml Tue Jul  3 20:25:28 2007
@@ -38,6 +38,14 @@
     <property name="wsdl.location" value="${wsdl.dir}/hello_world.wsdl"/>
     <property name="war.name" value="helloworld.war"/>
     <property name="j2ee.resources.dir" location="${basedir}/../common/resources"/>
+
+    <property environment="env"/>
+    <condition property="module.jar.dir" value="${env.CXF_HOME}/modules" else="${env.CXF_HOME}/lib">
+        <available file="${env.CXF_HOME}/modules" type="dir"/>
+    </condition>
+    <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>
     
     <import file="../../../common_build.xml"/>
  
@@ -90,17 +98,22 @@
 
     <target name="generate.rar" depends="prepare,update.jboss.endorsed,init">
         <copy file="${cxf.home}/etc/ra.xml" todir="${build.classes.dir}/cxf-rar/META-INF"/>
-        <copy todir="${build.classes.dir}/cxf-rar">
+        <copy file="${cxf.home}/etc/licenses.txt" todir="${build.classes.dir}/cxf-rar" failonerror="no"/>
+
+        <copy todir="${build.classes.dir}/cxf-rar" failonerror="no">
             <fileset dir="${cxf.home}/lib">
                 <include name="*.jar"/>
                 <exclude name="cxf*.jar"/>
+                <exclude name="*manifest*.jar"/>
+                <exclude name="*-jbi-*.jar"/>
             </fileset>
-            <fileset dir="${cxf.home}/modules">
-                <include name="*.jar"/>
+            <fileset dir="${module.jar.dir}">
+                <include name="cxf*.jar"/>
                 <exclude name="*manifest*.jar"/>
+                <exclude name="*-jbi-*.jar"/>
             </fileset>
-            <fileset dir="${cxf.home}/modules/integration">
-                <include name="*.jar"/>
+            <fileset dir="${integration.jar.dir}">
+                <include name="*-jca-*.jar"/>
                 <exclude name="*-jbi-*.jar"/>
             </fileset>
         </copy>
@@ -141,13 +154,6 @@
             <fileset dir="${build.classes.dir}/cxf-rar" includes="**/*"/>
         </delete>
     </target>
-
-
-    <!--target name="server" description="run demo server" depends="build">
-      <property name="param" value=""/>
-      <cxfrun classname="demo.hw.server.Server"
-                 param1="${wsdl.dir}/hello_world.wsdl"/>
-    </target-->
 
     <target name="build-war">
         <copy file="${wsdl.location}" todir="${basedir}/src" />