cxf-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Jeff Zhang" <jeff.zh...@iona.com>
Subject patch for CXF jca integration demo
Date Wed, 04 Jul 2007 02:40:52 GMT
Hi,

I create JIRA bug and submit the bugfix for jca integration demo.
https://issues.apache.org/jira/browse/CXF-761

This patch modified build.xml for package files and some changes in Readme.txt.

Could you review it and apply this patch?
Thanks
Jeff


Index: hello_world_soap_http/README.txt
===================================================================
--- hello_world_soap_http/README.txt    (revision 553028)
+++ hello_world_soap_http/README.txt    (working copy)
@@ -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
Index: hello_world_soap_http/build.xml
===================================================================
--- hello_world_soap_http/build.xml     (revision 553028)
+++ hello_world_soap_http/build.xml     (working copy)
@@ -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/resource
s"/>
+
+    <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/in
tegration" 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}/c
xf-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>
@@ -142,13 +155,6 @@
         </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" />




Mime
View raw message