cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r478536 - in /incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca: hello_world_soap_http/README.txt hello_world_soap_http/build.xml inbound/README.txt inbound/build.xml
Date Thu, 23 Nov 2006 11:29:18 GMT
Author: jliu
Date: Thu Nov 23 03:29:13 2006
New Revision: 478536

URL: http://svn.apache.org/viewvc?view=rev&rev=478536
Log:
Apply patch CXF-267 on behalf of Unreal Jiang.

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
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound/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=478536&r1=478535&r2=478536
==============================================================================
--- 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
Thu Nov 23 03:29:13 2006
@@ -12,7 +12,6 @@
 There are a number of steps required to successfully run this demo
 application:
 
-    . Update jboss endorsed jars
     . Set Jboss environment
     . Set CXF environment
     . Build CXF J2EE Connector rar file
@@ -23,26 +22,13 @@
     . Launch the CXF Server
     . Accessing the web application 
 
-Update Jboss endorsed jars
-==========================
- (Unix)  % cd $CXF_HOME/lib/
-         % cp activation-1.1.jar jaxb-api-2.0.jar jaxb-impl-2.0.3.jar
-              jaxb-xjc-2.0.3.jar stax-api-1.0.1.jar
-	      jsr181-api-1.0-MR1.jar
-              saaj-api-1.3.jar saaj-impl-1.3.jar 
-              <jboss-home>/lib/endorsed\
- (Windows) > cd %CXF_HOME%\lib\
-           > copy activation-1.1.jar jaxb-api-2.0.jar jaxb-impl-2.0.3.jar
-              jaxb-xjc-2.0.3.jar stax-api-1.0.1.jar
-	      jsr181-api-1.0-MR1.jar
-              saaj-api-1.3.jar saaj-impl-1.3.jar 
-              <jboss-home>\lib\endorsed\
 
 Set Jboss environment
 =====================
  (Unix) % export JBOSS_HOME=<jboss-home>
  (Windows) > set JBOSS_HOME=<jboss-home>
 
+
 Set CXF environment
 =====================
  (Unix) % export CXF_HOME=<cxf-home>
@@ -51,21 +37,22 @@
 
 Build CXF J2EE Connector rar file
 =================================
-    Before build CXF J2EE Connector, must update value of 
-    <EJBServicePropertiesURL> with abstract path of $CXF_HOME in 
-    <CXF_HOME>/etc/ra.xml file
-
-    Build CXF J2EE Connector file:
   (Unix)    % ant generate.rar
   (Windows) > ant generate.rar
 
+This target will update jboss endorsed directory first,
+it will copy activation-1.1.jar,jaxb-api-2.0.jar,
+jaxb-impl-2.0.3.jar,jaxb-xjc-2.0.3.jar,stax-api-1.0.1.jar,
+jsr181-api-1.0-MR1.jar,saaj-api-1.3.jar saaj-impl-1.3.jar
+ files to $JBOSS_HOME/lib/endorsed directory.
+
+
 Launch the application server
 =============================
 
     The demo requires an application server.  Make sure you have a
     running instance of an application server. 
-
-    
+   
 
 Deploy the Apache CXF J2EE Connector
 ===============================
@@ -81,26 +68,27 @@
     on connector deployment. Here are basic instructions to deploy
     the connector in JBoss application servers.
 
+  (Unix)    % ant deploy.cxf.rar
+  (Windows) > ant deploy.cxf.rar
 
-JBoss
------
-Copy the connector RAR from its location in the Apache CXF installation to
+Or copy the connector RAR from its location in the Apache CXF installation to
 the JBoss deployment directory.
 
-  (Unix)    % cd $CXF_HOME/lib/
-            % cp cxf.rar \ 
-              <jboss-home>/server/default/deploy
+  Copy connector file to deployment directory.
+    (Unix)    % cd $CXF_HOME/lib/
+              % cp cxf.rar \ 
+                 $JBOSS_HOME/server/default/deploy
+
+    (Windows) > cd %CXF_HOME%\lib\
+              > copy cxf.rar 
+                 %JBOSS_HOME%\server\default\deploy
 
-  (Windows) > cd %CXF_HOME%\lib\
-            > copy cxf.rar 
-              <jboss-home>\server\default\deploy
+  Copy the cxf_j2ee_1_5-ds.xml file to the JBoss deployment directory.
+    (Unix)    % cp ./etc/cxfj2ee_1_5-ds.xml $JBOSS_HOME/server/default/deploy
 
-Copy the cxf_j2ee_1_5-ds.xml file to the JBoss deployment directory.
+    (Windows) > copy .\etc\cxfj2ee_1_5-ds.xml 
+                   %JBOSS_HOME%\server\default\deploy
 
-  (Unix)    % cp ./etc/cxfj2ee_1_5-ds.xml <jboss-home>/server/default/deploy
-
-  (Windows) > copy .\etc\cxfj2ee_1_5-ds.xml 
-                <jboss-home>\server\default\deploy
 
 Building the Demo
 =================
@@ -123,7 +111,6 @@
   (Windows) > ant
 
 
-
 Launch the Apache CXF Service
 ========================
 
@@ -148,19 +135,18 @@
 How to deploy a WAR archive is dependent on your 
 application server. Please consult your vendor documentation
 on application deployment. Here are basic instructions to deploy
-the demo application for JBoss, WebLogic and WebSphere application 
-servers.
+the demo application for JBoss application servers.
 
-JBoss
------
-Copy the WAR archive ./build/lib/helloworld.war 
+  (Unix)    % ant deploy.war
+  (Windows) > ant deploy.war
+
+Or copy the WAR archive ./build/lib/helloworld.war 
 to the JBoss deployment directory.
   
   (Unix)    % cp ./build/lib/helloworld.war \ 
-              <jboss-home>/server/default/deploy
+              $JBOSS_HOME/server/default/deploy
   (Windows) > copy .\build\lib\helloworld.war 
-              <jboss-home>\server\default\deploy
-
+              %JBOSS_HOME%\server\default\deploy
 
 
 Accessing the web application 

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=478536&r1=478535&r2=478536
==============================================================================
--- 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
Thu Nov 23 03:29:13 2006
@@ -21,21 +21,20 @@
 <project name="HelloWorldSOAPHttpDemo" default="build" basedir=".">
 
  <!-- overload some properties to customize this build -->
+  <property environment="env"/>
   <property name="wsdl.dir" value="${basedir}/etc/wsdl"/>
   <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"/>
   <property name="cxf.home" value="${env.CXF_HOME}"/>
   <property name="jboss.home" value="${env.JBOSS_HOME}"/>
   <property file="${cxf.home}/etc/version.properties"/>
-  <!--property name="thirdparty.classpath" value="${basedir}/../common/common.jar"/-->
+
   
   <path id="thirdParth.classpath">
     <pathelement location="${basedir}/../common/common.jar"/>
   </path>
 
-
   <path id="other.classpath">
     <pathelement location="${cxf.home}/lib/servlet-api-2.4.jar"/>
     <pathelement location="${basedir}/../common/common.jar"/>
@@ -44,8 +43,37 @@
   </path>
 
   <import file="${cxf.home}/samples/common_build.xml"/>
+
+
+  <target name="prepare">
+    <replace file="${cxf.home}/etc/ra.xml" token="CXF_HOME" value="${cxf.home}"/>
+  </target>
+
+  <target name="init">
+   <mkdir dir="${build.classes.dir}"/>
+  </target>
+
+  <target name="update.jboss.endorsed">
+    <copy todir="${jboss.home}/lib/endorsed">
+      <fileset dir="${cxf.home}/lib">
+	<include name="activation*" />            
+	<include name="jaxb*" />
+	<include name="stax*" />
+	<include name="jsr181*" />
+	<include name="saaj*" />
+      </fileset>
+    </copy>
+  </target>
   
-  <target name="generate.rar" depends="init">
+  <target name="deploy.cxf.rar" depends="generate.rar">
+    <copy todir="${jboss.home}/server/default/deploy">
+      <fileset dir="${cxf.home}/lib" includes="cxf.rar"/>
+      <fileset dir="${basedir}/etc" includes="cxfj2ee_1_5-ds.xml"/>
+    </copy>
+  </target>
+
+
+  <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">
       <fileset dir="${cxf.home}/lib">
@@ -77,12 +105,10 @@
 	 basedir="${build.classes.dir}/cxf-rar"/>
   </target>
 
-  <target name="init">
-   <mkdir dir="${build.classes.dir}"/>
-  </target>
 
 
   <target name="compile-j2ee" depends="maybe.generate.code">
+  <!--target name="compile-j2ee"-->
     <javac destdir="${build.classes.dir}" debug="true">
       <src path="${build.src.dir}"/>
       <src path="${basedir}/src"/>
@@ -106,11 +132,11 @@
     <wsdl2java file="hello_world.wsdl"/>
   </target>
 
-  <target name="server" description="run demo server" depends="build">
+  <!--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-->
 
   <target name="build-war">
     <copy file="${wsdl.location}" todir="${basedir}/src" />
@@ -144,16 +170,22 @@
     </war>
   </target>
 
-    <target name="client" description="run demo client" depends="build">
-        <property name="param" value=""/>
-        <cxfrun classname="demo.client.Client" param1="${op}"/>
-    </target>
+  <target name="deploy.war" depends="build-war">
+    <copy todir="${jboss.home}/server/default/deploy">
+      <fileset dir="${basedir}/build/lib" includes="helloworld.war"/>
+    </copy>
+  </target>
 
+  <target name="client" description="run demo client" depends="build">
+    <property name="param" value=""/>
+    <cxfrun classname="demo.client.Client" param1="${op}"/>
+  </target>
+  
   <target name="clean">
-      <delete failonerror="no">
-	<fileset dir="./src" includes="**/*.class"/>
-	<fileset dir="." includes="**/*.war"/>
-      </delete>
+    <delete failonerror="no">
+      <fileset dir="./src" includes="**/*.class"/>
+      <fileset dir="." includes="**/*.war"/>
+    </delete>
   </target>
-    
+  
 </project>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound/README.txt?view=diff&rev=478536&r1=478535&r2=478536
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound/README.txt
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound/README.txt
Thu Nov 23 03:29:13 2006
@@ -13,7 +13,6 @@
 There are a number of steps required to successfully run this demo
 application:
 
-    . Update jboss endorsed jars
     . Set Jboss environment
     . Set CXF environment
     . Build CXF J2EE Connector rar file
@@ -24,42 +23,31 @@
     . Activate the EJB Web Services facade
     . Access the EJB using a Web Services client
 
-Update Jboss endorsed jars
-==========================
- (Unix)  % cd $CXF_HOME/lib/
-         % cp activation-1.1.jar jaxb-api-2.0.jar jaxb-impl-2.0.3.jar
-              jaxb-xjc-2.0.3.jar stax-api-1.0.1.jar
-	      jsr181-api-1.0-MR1.jar
-              saaj-api-1.3.jar saaj-impl-1.3.jar 
-              <jboss-home>/lib/endorsed\
- (Windows) > cd %CXF_HOME%\lib\
-           > copy activation-1.1.jar jaxb-api-2.0.jar jaxb-impl-2.0.3.jar
-              jaxb-xjc-2.0.3.jar stax-api-1.0.1.jar
-	      jsr181-api-1.0-MR1.jar
-              saaj-api-1.3.jar saaj-impl-1.3.jar 
-              <jboss-home>\lib\endorsed\
-
 
 Set Jboss environment
 =====================
  (Unix) % export JBOSS_HOME=<jboss-home>
  (Windows) > set JBOSS_HOME=<jboss-home>
 
+
 Set CXF environment
 =====================
  (Unix) % export CXF_HOME=<cxf-home>
  (Windows) > set CXF_HOME=<cxf-home>
 
+
 Build CXF J2EE Connector rar file
 =================================
-    Before build CXF J2EE Connector, must update value of 
-    <EJBServicePropertiesURL> with abstract path of $CXF_HOME in 
-    <CXF_HOME>/etc/ra.xml file
-
-    Build CXF J2EE Connector file:
   (Unix)    % ant generate.rar
   (Windows) > ant generate.rar
 
+This target will update jboss endorsed directory first,
+it will copy activation-1.1.jar,jaxb-api-2.0.jar,
+jaxb-impl-2.0.3.jar,jaxb-xjc-2.0.3.jar,stax-api-1.0.1.jar,
+jsr181-api-1.0-MR1.jar,saaj-api-1.3.jar saaj-impl-1.3.jar
+ files to $JBOSS_HOME/lib/endorsed directory.
+
+
 Launch the application server
 =============================
 
@@ -81,27 +69,26 @@
     the connector in JBoss application 
     servers.
 
+  (Unix)    % ant deploy.cxf.rar
+  (Windows) > ant deploy.cxf.rar
 
-
-JBoss
------
-Copy the connector RAR from its location in the CXF installation to
+Or copy the connector RAR from its location in the CXF installation to
 the JBoss deployment directory.
 
   (Unix)    % cd $CXF_HOME/lib/
             % cp cxf.rar \ 
-              <jboss-home>/server/default/deploy
+              $JBOSS_HOME/server/default/deploy
 
   (Windows) > cd %CXF_HOME%\lib\
             > copy cxf.rar 
-              <jboss-home>\server\default\deploy
+              %JBOSS_HOME%\server\default\deploy
 
 Copy the cxf_j2ee_1_5-ds.xml file to the JBoss deployment directory.
 
-  (Unix)    % cp ./etc/cxfj2ee_1_5-ds.xml <jboss-home>/server/default/deploy
+  (Unix)    % cp ./etc/cxfj2ee_1_5-ds.xml $JBOSS_HOME/server/default/deploy
 
   (Windows) > copy .\etc\cxfj2ee_1_5-ds.xml 
-                <jboss-home>\server\default\deploy
+                %JBOSS_HOME%\server\default\deploy
 
 
 Building the Demo
@@ -128,15 +115,16 @@
 application deployment. Here are basic instructions to deploy the
 demo application for JBoss application servers.
 
-JBoss
------
-Copy the EJB archive ./j2ee-archives/greeterejb.jar 
+  (Unix)    % ant deploy.ejb.jar
+  (Windows) > ant deploy.ejb.jar
+
+Or copy the EJB archive ./j2ee-archives/greeterejb.jar 
 to the JBoss deployment directory.
   
   (Unix)    % cp ./j2ee-archives/greeterejb.jar \ 
-              <jboss-home>/server/default/deploy
+              $JBOSS_HOME/server/default/deploy
   (Windows) > copy .\j2ee-archives\greeterejb.jar 
-              <jboss-home>\server\default\deploy
+              %JBOSS_HOME%\server\default\deploy
 
 Activate the EJB Web Services facade
 ====================================

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound/build.xml?view=diff&rev=478536&r1=478535&r2=478536
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound/build.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound/build.xml
Thu Nov 23 03:29:13 2006
@@ -44,7 +44,37 @@
     <pathelement location="${jboss.home}/client/jbossall-client.jar"/>
   </path>
 
-  <target name="generate.rar" depends="init">
+  <target name="prepare">
+    <replace file="${cxf.home}/etc/ra.xml" token="CXF_HOME" value="${cxf.home}"/>
+  </target>
+
+  <target name="init"> 
+    <!--mkdir dir="${build.classes.dir}"/-->
+    <mkdir dir="${build.classes.dir}/cxf-rar/META-INF"/>
+    
+    <mkdir dir="${j2ee.archives}"/>
+  </target>
+  
+  <target name="update.jboss.endorsed">
+    <copy todir="${jboss.home}/lib/endorsed">
+      <fileset dir="${cxf.home}/lib">
+	<include name="activation*" />            
+	<include name="jaxb*" />
+	<include name="stax*" />
+	<include name="jsr181*" />
+	<include name="saaj*" />
+      </fileset>
+    </copy>
+  </target>
+
+  <target name="deploy.cxf.rar" depends="generate.rar">
+    <copy todir="${jboss.home}/server/default/deploy">
+      <fileset dir="${cxf.home}/lib" includes="cxf.rar"/>
+      <fileset dir="${basedir}/etc" includes="cxfj2ee_1_5-ds.xml"/>
+    </copy>
+  </target>
+
+  <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">
       <fileset dir="${cxf.home}/lib">
@@ -77,46 +107,47 @@
   </target>
     
 
-    <target name="build" depends="clean,init,j2ee.compile,build.ejb.jar"/> 
+  <target name="build" depends="clean,init,j2ee.compile,build.ejb.jar"/> 
 
-    <target name="init"> 
-      <!--mkdir dir="${build.classes.dir}"/-->
-      <mkdir dir="${build.classes.dir}/cxf-rar/META-INF"/>
-
-      <mkdir dir="${j2ee.archives}"/>
-    </target>
     
-    <target name="j2ee.compile">
-      <javac srcdir="${basedir}/src" destdir="${build.classes.dir}" debug="true" fork="yes">
-	<include name="**/*.java"/>
-	<classpath>
-	  <pathelement location="${cxf.home}/lib/cxf-incubator.jar"/>
-	  <pathelement location="${build.classes.dir}"/>
-	  <!--path refid="cxf.classpath"/-->
-	  <path refid="other.classpath"/>
-	</classpath>
-      </javac>
-    </target>
-    <target name="clean">
-      <delete failonerror="no">
-	<fileset dir="./src" includes="**/*.class"/>
-	<fileset dir="." includes="**/*.jar"/>
-	<fileset dir="." includes="**/*.rar"/>
-	<fileset dir="${build.classes.dir}/cxf-rar" includes="**/*"/>
-      </delete>
-    </target>
+  <target name="j2ee.compile">
+    <javac srcdir="${basedir}/src" destdir="${build.classes.dir}" debug="true" fork="yes">
+      <include name="**/*.java"/>
+      <classpath>
+	<pathelement location="${cxf.home}/lib/cxf-incubator.jar"/>
+	<pathelement location="${build.classes.dir}"/>
+	<!--path refid="cxf.classpath"/-->
+	<path refid="other.classpath"/>
+      </classpath>
+    </javac>
+  </target>
+
+  <target name="clean">
+    <delete failonerror="no">
+      <fileset dir="./src" includes="**/*.class"/>
+      <fileset dir="." includes="**/*.jar"/>
+      <fileset dir="." includes="**/*.rar"/>
+      <fileset dir="${build.classes.dir}/cxf-rar" includes="**/*"/>
+    </delete>
+  </target>
     
-    <target name="build.ejb.jar"> 
-      <jar destfile="${j2ee.archives}/greeterejb.jar"> 
-	<metainf dir="./etc"> 
-	    <include name="*ejb*.xml"/>
-	</metainf>
-	<fileset dir="${build.classes.dir}/" includes="org/**/*.class"/>
-	<fileset dir="${build.classes.dir}">
-	  <include name="**/ejb/*.class"/>
-	</fileset>
-      </jar>
-    </target> 
+  <target name="build.ejb.jar"> 
+    <jar destfile="${j2ee.archives}/greeterejb.jar"> 
+      <metainf dir="./etc"> 
+	<include name="*ejb*.xml"/>
+      </metainf>
+      <fileset dir="${build.classes.dir}/" includes="org/**/*.class"/>
+      <fileset dir="${build.classes.dir}">
+	<include name="**/ejb/*.class"/>
+      </fileset>
+    </jar>
+  </target> 
+
+  <target name="deploy.ejb.jar" depends="build.ejb.jar">
+    <copy todir="${jboss.home}/server/default/deploy">
+      <fileset dir="${j2ee.archives}" includes="greeterejb.jar"/>
+    </copy>
+  </target>
 
     <!-- 
 	 this target appends the necessary entry to ejb_servants.properties 
@@ -133,6 +164,7 @@
       </echo>
       <replace file="${servants.props.file}" token="\" value="/"/> 
     </target>
+
 
     <target name="client"> 
       <java classname="demo.client.GreeterClient" fork="true"> 



Mime
View raw message