cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r531530 - in /incubator/cxf/trunk/distribution: bundle/ manifest/ src/main/assembly/ src/main/release/samples/ src/main/release/samples/integration/JBI/external_provider_external_consumer/service-unit/ src/main/release/samples/integration/J...
Date Mon, 23 Apr 2007 16:44:34 GMT
Author: dkulp
Date: Mon Apr 23 09:44:33 2007
New Revision: 531530

URL: http://svn.apache.org/viewvc?view=rev&rev=531530
Log:
Update to fix JCA/JBI samples
Use wildcards in packaging to simplify (and make it less error prone)
Add "dir" format to make testing easier

Modified:
    incubator/cxf/trunk/distribution/bundle/   (props changed)
    incubator/cxf/trunk/distribution/manifest/   (props changed)
    incubator/cxf/trunk/distribution/src/main/assembly/bin.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/common_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/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/jca/hello_world_soap_http/build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound/build.xml

Propchange: incubator/cxf/trunk/distribution/bundle/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Apr 23 09:44:33 2007
@@ -0,0 +1,10 @@
+.pmd
+.checkstyle
+.ruleset
+target
+.settings
+.classpath
+.project
+.wtpmodules
+
+

Propchange: incubator/cxf/trunk/distribution/manifest/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Apr 23 09:44:33 2007
@@ -0,0 +1,10 @@
+.pmd
+.checkstyle
+.ruleset
+target
+.settings
+.classpath
+.project
+.wtpmodules
+
+

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=531530&r1=531529&r2=531530
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/assembly/bin.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/assembly/bin.xml Mon Apr 23 09:44:33 2007
@@ -24,6 +24,7 @@
 	<formats>
 		<format>tar.gz</format>
 		<format>zip</format>
+    <format>dir</format>
 	</formats>
 
 	<fileSets>
@@ -40,9 +41,7 @@
 			</includes>
 		</fileSet>
 		<fileSet>
-			<directory>
-				target/maven-shared-archive-resources/META-INF
-			</directory>
+			<directory>target/maven-shared-archive-resources/META-INF</directory>
 			<outputDirectory>cxf-${cxf.version}</outputDirectory>
 			<includes>
 				<include>NOTICE</include>
@@ -58,7 +57,6 @@
 			<outputDirectory>cxf-${cxf.version}/etc</outputDirectory>
 			<includes>
 				<include>logging.properties</include>
-				<include>log4j.properties</include>
 				<include>ejb_servants.properties</include>
 				<include>web.xml</include>
 			</includes>
@@ -73,20 +71,18 @@
 		</fileSet>
 		<fileSet>
 			<directory>src/main/release/samples</directory>
-			<outputDirectory>
-				cxf-${cxf.version}/samples
-			</outputDirectory>
+			<outputDirectory>cxf-${cxf.version}/samples</outputDirectory>
 			<excludes>
 				<exclude>**/build</exclude>
 				<exclude>**/build/**/*</exclude>
 				<exclude>integration/JBI/**/build.properties</exclude>
+        <exclude>**/colocated/**/*</exclude>
+        <exclude>**/colocated</exclude>
 			</excludes>
 		</fileSet>
 		<fileSet>
 			<directory>target/javadoc</directory>
-			<outputDirectory>
-				cxf-${cxf.version}/docs/api
-			</outputDirectory>
+			<outputDirectory>cxf-${cxf.version}/docs/api</outputDirectory>
 			<includes>
 				<include>**/*</include>
 			</includes>
@@ -108,6 +104,13 @@
 				<include>cxf-manifest-incubator.jar</include>
 			</includes>
 		</fileSet>
+    <fileSet>
+      <directory>manifest/target</directory>
+      <outputDirectory>cxf-${cxf.version}/modules</outputDirectory>
+      <includes>
+        <include>cxf-manifest-incubator.jar</include>
+      </includes>
+    </fileSet>
 		<fileSet>
 			<directory>target</directory>
 			<outputDirectory>cxf-${cxf.version}/etc</outputDirectory>
@@ -116,9 +119,7 @@
 			</includes>
 		</fileSet>
 		<fileSet>
-			<directory>
-				../integration/jca/src/main/rar/META-INF
-			</directory>
+			<directory>../integration/jca/src/main/rar/META-INF</directory>
 			<outputDirectory>cxf-${cxf.version}/etc</outputDirectory>
 			<includes>
 				<include>ra.xml</include>
@@ -126,45 +127,35 @@
 		</fileSet>
 		<fileSet>
 			<directory>target</directory>
-			<outputDirectory>
-				cxf-${cxf.version}/samples/integration/JBI/internal_provider_internal_consumer/service-engine/etc
-			</outputDirectory>
+			<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>
+			<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>
+			<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>
+			<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>
+			<outputDirectory>cxf-${cxf.version}/samples/integration/JBI/handlers/service-engine/etc</outputDirectory>
 			<includes>
 				<include>jbi.xml</include>
 			</includes>
@@ -176,77 +167,19 @@
 			<outputDirectory>cxf-${cxf.version}/lib</outputDirectory>
 			<unpack>false</unpack>
 			<excludes>
-		        <exclude>org.apache.cxf:cxf-api</exclude>
-		        <exclude>org.apache.cxf:cxf-common-utilities</exclude>
-		        <exclude>org.apache.cxf:cxf-common-schemas</exclude>
-		        <exclude>org.apache.cxf:cxf-tools-common</exclude>
-		        <exclude>org.apache.cxf:cxf-tools-validator</exclude>
-		        <exclude>org.apache.cxf:cxf-tools-wsdlto-core</exclude>
-		        <exclude>org.apache.cxf:cxf-tools-misctools</exclude>
-		        <exclude>org.apache.cxf:cxf-tools-wsdlto-databinding-jaxb</exclude>
-		        <exclude>org.apache.cxf:cxf-tools-wsdlto-frontend-jaxws</exclude>
-		        <exclude>org.apache.cxf:cxf-tools-java2wsdl</exclude>
-		        <exclude>org.apache.cxf:cxf-xjc-dv</exclude>
-		        <exclude>org.apache.cxf:cxf-rt-core</exclude>
-		        <exclude>org.apache.cxf:cxf-rt-databinding-jaxb</exclude>
-		        <exclude>org.apache.cxf:cxf-rt-databinding-aegis</exclude>
-		        <exclude>org.apache.cxf:cxf-rt-management</exclude>
-		        <exclude>org.apache.cxf:cxf-rt-transports-local</exclude>
-		        <exclude>org.apache.cxf:cxf-rt-transports-http</exclude>
-		        <exclude>org.apache.cxf:cxf-rt-transports-http-jetty</exclude>
-		        <exclude>org.apache.cxf:cxf-rt-transports-jms</exclude>
-		        <exclude>org.apache.cxf:cxf-rt-bindings-soap</exclude>
-		        <exclude>org.apache.cxf:cxf-rt-bindings-object</exclude>
-		        <exclude>org.apache.cxf:cxf-rt-bindings-coloc</exclude>
-		        <exclude>org.apache.cxf:cxf-rt-bindings-xml</exclude>
-		        <exclude>org.apache.cxf:cxf-rt-bindings-http</exclude>
-		        <exclude>org.apache.cxf:cxf-rt-ws-addr</exclude>
-		        <exclude>org.apache.cxf:cxf-rt-ws-rm</exclude>
-		        <exclude>org.apache.cxf:cxf-rt-ws-policy</exclude>
-		        <exclude>org.apache.cxf:cxf-rt-ws-security</exclude>
-		        <exclude>org.apache.cxf:cxf-rt-frontend-jaxws</exclude>
-		        <exclude>org.apache.cxf:cxf-rt-frontend-js</exclude>
-		        <exclude>org.apache.cxf:cxf-rt-frontend-simple</exclude>
-		        <exclude>org.apache.cxf:cxf-bundle</exclude>
-		    </excludes>
+		        <exclude>org.apache.cxf:*</exclude>
+      </excludes>
 			<scope>runtime</scope>
 		</dependencySet>
         <dependencySet>
 		    <outputDirectory>cxf-${cxf.version}/modules</outputDirectory>
 		    <unpack>false</unpack>
 		    <includes>
-		        <include>org.apache.cxf:cxf-api</include>
-		        <include>org.apache.cxf:cxf-common-utilities</include>
-		        <include>org.apache.cxf:cxf-common-schemas</include>
-		        <include>org.apache.cxf:cxf-tools-common</include>
-		        <include>org.apache.cxf:cxf-tools-validator</include>
-		        <include>org.apache.cxf:cxf-tools-wsdlto-core</include>
-		        <include>org.apache.cxf:cxf-tools-misctools</include>
-		        <include>org.apache.cxf:cxf-tools-wsdlto-databinding-jaxb</include>
-		        <include>org.apache.cxf:cxf-tools-wsdlto-frontend-jaxws</include>
-		        <include>org.apache.cxf:cxf-tools-java2wsdl</include>
-		        <include>org.apache.cxf:cxf-xjc-dv</include>
-		        <include>org.apache.cxf:cxf-rt-core</include>
-		        <include>org.apache.cxf:cxf-rt-databinding-jaxb</include>
-		        <include>org.apache.cxf:cxf-rt-databinding-aegis</include>
-		        <include>org.apache.cxf:cxf-rt-management</include>
-		        <include>org.apache.cxf:cxf-rt-transports-local</include>
-		        <include>org.apache.cxf:cxf-rt-transports-http</include>
-		        <include>org.apache.cxf:cxf-rt-transports-http-jetty</include>
-		        <include>org.apache.cxf:cxf-rt-transports-jms</include>
-		        <include>org.apache.cxf:cxf-rt-bindings-soap</include>
-		        <include>org.apache.cxf:cxf-rt-bindings-object</include>
-		        <include>org.apache.cxf:cxf-rt-bindings-coloc</include>
-		        <include>org.apache.cxf:cxf-rt-bindings-xml</include>
-		        <include>org.apache.cxf:cxf-rt-bindings-http</include>
-		        <include>org.apache.cxf:cxf-rt-ws-addr</include>
-		        <include>org.apache.cxf:cxf-rt-ws-rm</include>
-		        <include>org.apache.cxf:cxf-rt-ws-policy</include>
-		        <include>org.apache.cxf:cxf-rt-ws-security</include>
-		        <include>org.apache.cxf:cxf-rt-frontend-jaxws</include>
-		        <include>org.apache.cxf:cxf-rt-frontend-js</include>
-		        <include>org.apache.cxf:cxf-rt-frontend-simple</include>
+		        <include>org.apache.cxf:*</include>
 		    </includes>
+        <excludes>
+              <exclude>org.apache.cxf:cxf-bundle</exclude>
+        </excludes>
 		    <scope>runtime</scope>
 		</dependencySet>
 		<dependencySet>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml?view=diff&rev=531530&r1=531529&r2=531530
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml Mon Apr 23
09:44:33 2007
@@ -31,12 +31,12 @@
     <property name="port" value="8080"/>
     <property name="base.url" value="http://${host}:${port}"/>
 
-    <available property="wsdl.dir" value="${basedir}/wsdl" 
+    <available property="wsdl.dir" value="${basedir}/wsdl"
         file="${basedir}/wsdl"/>
     <property name="wsdl.dir" location="."/>
 
     <!-- Setup for building in a source build-->
-    <available property="srcbuild_paths.file" 
+    <available property="srcbuild_paths.file"
         value="../../../../target/srcbuild_paths.xml"
         file="target/srcbuild_paths.xml"
         filepath="../../../.."/>
@@ -88,7 +88,9 @@
         <pathelement location="${cxf.home}/lib/cxf-manifest-incubator.jar"/>
     </path>
     <condition property="thirdparty.classpath" value="">
-        <not> <isset property="thirdparty.classpath"/> </not>
+        <not>
+            <isset property="thirdparty.classpath"/>
+        </not>
     </condition>
 
     <target name="maybe.generate.code" unless="codegen.notrequired">
@@ -97,8 +99,8 @@
     </target>
 
     <target name="compile" depends="maybe.generate.code">
-            <mkdir dir="${build.classes.dir}"/>
-            <mkdir dir="${build.src.dir}"/>
+        <mkdir dir="${build.classes.dir}"/>
+        <mkdir dir="${build.src.dir}"/>
 
         <javac destdir="${build.classes.dir}" debug="true">
             <src path="${build.src.dir}"/>
@@ -192,13 +194,13 @@
                 </not>
             </condition>
             <property name="package.arg.@{file}" value=""/>
-	    <condition property="binding.arg" value='-b "@{bindingfile}"'> 
+            <condition property="binding.arg" value='-b "@{bindingfile}"'>
                 <not>
                     <equals arg1="@{bindingfile}" arg2=""/>
                 </not>
             </condition>
             <property name="binding.arg" value=""/>
-            
+
             <java failonerror="true" classname="org.apache.cxf.tools.wsdlto.WSDLToJava"
fork="yes">
                 <classpath>
                     <path refid="cxf.classpath" />
@@ -236,60 +238,59 @@
     </macrodef>
 
     <target name="prepare.tomcat" unless="cxf.jars.present.in.tomcat">
-	<copy todir="${env.CATALINA_HOME}/shared/lib">
-	    <fileset dir="${cxf.home}/modules">
-		<include name="*.jar"/>
-		<exclude name="*jbi*.jar"/>
-	    </fileset>	    
-	</copy>
-	<copy todir="${env.CATALINA_HOME}/shared/lib">
-	    <fileset dir="${cxf.home}/lib">
-		<include name="*.jar"/>
-		<exclude name="*jbi*.jar"/>
-	    </fileset>
-	</copy>
+        <copy todir="${env.CATALINA_HOME}/shared/lib">
+            <fileset dir="${cxf.home}/modules">
+                <include name="*.jar"/>
+            </fileset>
+        </copy>
+        <copy todir="${env.CATALINA_HOME}/shared/lib">
+            <fileset dir="${cxf.home}/lib">
+                <include name="*.jar"/>
+                <exclude name="cxf-*.jar"/>
+            </fileset>
+        </copy>
     </target>
 
     <target name="deploy" depends="war, deploy-tomcat" description="deploy the application
into the container"/>
     <target name="undeploy" depends="undeploy-tomcat" description="undeploy the application
from the container"/>
-    
+
     <target name="deploy-tomcat" if="tomcat">
-	<antcall target="validate-tomcat"/>
-	<antcall target="prepare.tomcat"/>
-	<copy file="${war.dir}/${cxf.war.file.name}.war"
-	      todir="${env.CATALINA_HOME}/webapps"/>
+        <antcall target="validate-tomcat"/>
+        <antcall target="prepare.tomcat"/>
+        <copy file="${war.dir}/${cxf.war.file.name}.war"
+              todir="${env.CATALINA_HOME}/webapps"/>
     </target>
 
     <target name="undeploy-tomcat" if="tomcat">
-	<antcall target="validate-tomcat"/>
-	<delete file="${env.CATALINA_HOME}/webapps/${cxf.war.file.name}.war"/>
-	<delete dir="${env.CATALINA_HOME}/webapps/${cxf.war.file.name}"/>
+        <antcall target="validate-tomcat"/>
+        <delete file="${env.CATALINA_HOME}/webapps/${cxf.war.file.name}.war"/>
+        <delete dir="${env.CATALINA_HOME}/webapps/${cxf.war.file.name}"/>
     </target>
 
     <target name="validate-tomcat">
-	<fail unless="env.CATALINA_HOME" message="You should set the CATALINA_HOME, if you want
to deploy into tomcat"/>
+        <fail unless="env.CATALINA_HOME" message="You should set the CATALINA_HOME, if
you want to deploy into tomcat"/>
 
-	<condition property="cxf.jars.present.in.tomcat">
-	    <and>
-		<available classname="org.apache.cxf.version.Version">
-		    <classpath>
-			<fileset dir="${env.CATALINA_HOME}/shared/lib">
-			    <include name="*.jar"/>
-			</fileset>
-		    </classpath>
-		</available>
-		<available file="${env.CATALINA_HOME}/shared/lib/cxf-manifest-incubator.jar" type="file"/>
-	    </and>
-	</condition>
-
-	<available property="cxf.jbi.present" classname="org.apache.cxf.jbi.transport.JBIConduit">
-	    <classpath>
-		<fileset dir="${env.CATALINA_HOME}/shared/lib">
-		    <include name="*.jar"/>
-		</fileset>
-	    </classpath>
-	</available>
-	<fail if="cxf.jbi.present" message="JBI API is not shipped with Apache CXF, so you should
remove all jars start with the cxf-integration-jbi from ${env.CATALINA_HOME}/shared/lib"/>
+        <condition property="cxf.jars.present.in.tomcat">
+            <and>
+                <available classname="org.apache.cxf.version.Version">
+                    <classpath>
+                        <fileset dir="${env.CATALINA_HOME}/shared/lib">
+                            <include name="*.jar"/>
+                        </fileset>
+                    </classpath>
+                </available>
+                <available file="${env.CATALINA_HOME}/shared/lib/cxf-manifest-incubator.jar"
type="file"/>
+            </and>
+        </condition>
+
+        <available property="cxf.jbi.present" classname="org.apache.cxf.jbi.transport.JBIConduit">
+            <classpath>
+                <fileset dir="${env.CATALINA_HOME}/shared/lib">
+                    <include name="*.jar"/>
+                </fileset>
+            </classpath>
+        </available>
+        <fail if="cxf.jbi.present" message="JBI API is not shipped with Apache CXF, so
you should remove all jars start with the cxf-integration-jbi from ${env.CATALINA_HOME}/shared/lib"/>
     </target>
 
 </project>

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=531530&r1=531529&r2=531530
==============================================================================
--- 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
Mon Apr 23 09:44:33 2007
@@ -32,8 +32,10 @@
   <path id="build.classpath">
     <pathelement location="${build.classes.dir}"/>
     <pathelement location="${env.SERVICEMIX_HOME}/lib/servicemix-jbi-3.0-incubating.jar"/>
-libleset dir="${env.CXF_HOME}/modules">
+    <fileset dir="${env.CXF_HOME}/lib">
       <include name="cxf-manifest-incubator.jar"/>
+    </fileset>
+    <fileset dir="${env.CXF_HOME}/modules/integration">
       <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=531530&r1=531529&r2=531530
==============================================================================
--- 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
Mon Apr 23 09:44:33 2007
@@ -34,8 +34,11 @@
 
   <path id="build.classpath">
     <pathelement location="${build.classes.dir}"/>
-    <pathelement location="${env.SERVICEMIX_HOME}/lib/servicemix-jbi-3.0-incubating.jar"/lib<fileset
dir="${env.CXF_HOME}/modules">
+    <pathelement location="${env.SERVICEMIX_HOME}/lib/servicemix-jbi-3.0-incubating.jar"/>
+    <fileset dir="${env.CXF_HOME}/lib">
       <include name="cxf-manifest-incubator.jar"/>
+    </fileset>
+    <fileset dir="${env.CXF_HOME}/modules/integration">
       <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=531530&r1=531529&r2=531530
==============================================================================
--- 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
Mon Apr 23 09:44:33 2007
@@ -33,8 +33,10 @@
   <path id="build.classpath">
     <pathelement location="${build.classes.dir}"/>
     <pathelement location="${env.SERVICEMIX_HOME}/lib/servicemix-jbi-3.0-incubating.jar"/>
-libileset dir="${env.CXF_HOME}/modules">
+    <fileset dir="${env.CXF_HOME}/lib">
       <include name="cxf-manifest-incubator.jar"/>
+    </fileset>
+    <fileset dir="${env.CXF_HOME}/modules/integration">
       <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=531530&r1=531529&r2=531530
==============================================================================
--- 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
Mon Apr 23 09:44:33 2007
@@ -34,8 +34,11 @@
 
   <path id="build.classpath">
     <pathelement location="${build.classes.dir}"/>
-    <pathelement location="${env.SERVICEMIX_HOME}/lib/servicemix-jbi-3.0-incubating.jar"/lib<fileset
dir="${env.CXF_HOME}/modules">
+    <pathelement location="${env.SERVICEMIX_HOME}/lib/servicemix-jbi-3.0-incubating.jar"/>
+    <fileset dir="${env.CXF_HOME}/lib">
       <include name="cxf-manifest-incubator.jar"/>
+    </fileset>
+    <fileset dir="${env.CXF_HOME}/modules/integration">
       <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=531530&r1=531529&r2=531530
==============================================================================
--- 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
Mon Apr 23 09:44:33 2007
@@ -33,8 +33,10 @@
   <path id="build.classpath">
     <pathelement location="${build.classes.dir}"/>
     <pathelement location="${env.SERVICEMIX_HOME}/lib/servicemix-jbi-3.0-incubating.jar"/>
-libileset dir="${env.CXF_HOME}/modules">
+    <fileset dir="${env.CXF_HOME}/lib">
       <include name="cxf-manifest-incubator.jar"/>
+    </fileset>
+    <fileset dir="${env.CXF_HOME}/modules/integration">
       <include name="cxf-integration-jbi-${cxf.version}.jar"/>
     </fileset>
   </path>

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=531530&r1=531529&r2=531530
==============================================================================
--- 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
Mon Apr 23 09:44:33 2007
@@ -49,7 +49,7 @@
         <pathelement location="${cxf.home}/lib/geronimo-servlet_2.5_spec-1.1-M1.jar"/>
         <pathelement location="${basedir}/../common/common.jar"/>
         <pathelement location="${jboss.home}/client/jboss-j2ee.jar"/>
-        <fileset dir="${cxf.home}/modules" >  
+        <fileset dir="${cxf.home}/modules/integration" >  
              <include name="cxf-integration-jca-*.jar"/>
         </fileset>
     </path>
@@ -91,12 +91,15 @@
         <copy todir="${build.classes.dir}/cxf-rar">
             <fileset dir="${cxf.home}/lib">
                 <include name="*.jar"/>
-                <exclude name="*manifest*.jar"/>
+                <exclude name="cxf*.jar"/>
             </fileset>
             <fileset dir="${cxf.home}/modules">
                 <include name="*.jar"/>
-                <exclude name="*-jbi-*.jar"/>
                 <exclude name="*manifest*.jar"/>
+            </fileset>
+            <fileset dir="${cxf.home}/modules/integration">
+                <include name="*.jar"/>
+                <exclude name="*-jbi-*.jar"/>
             </fileset>
         </copy>
         <jar destfile="${build.classes.dir}/lib/cxf.rar"

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=531530&r1=531529&r2=531530
==============================================================================
--- 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
Mon Apr 23 09:44:33 2007
@@ -20,7 +20,7 @@
 -->
 
 <project name="Inbound Connection Demo" default="build" basedir=".">
-   <property environment="env"/>
+    <property environment="env"/>
     <condition property="jboss.home" value="${env.JBOSS_HOME}">
         <isset property="env.JBOSS_HOME"/>
     </condition>
@@ -42,134 +42,137 @@
     <property name="j2ee.archives" value="j2ee-archives"/>
     <property name="demos.current.dir" value="."/>
     <property name="build.classes.dir" value="${basedir}/build"/>
-  
+
     <import file="../../../common_build.xml"/>
 
 
-  <path id="other.classpath">
-    <fileset dir="${cxf.home}/modules" >
-             <include name="cxf-integration-jca-*.jar"/>
-    </fileset>
-    <pathelement location="${jboss.home}/client/jbossall-client.jar"/>
-  </path>
-
-  <target name="prepare">
-    <replace file="${cxf.home}/etc/ra.xml" token="CXF_HOME" value="${cxf.home}"/>
-  </target>
-
-  <target name="war"/>
-
-  <target name="init"> 
-    <!--mkdir dir="${build.classes.dir}"/-->
-    <mkdir dir="${build.classes.dir}/cxf-rar/META-INF"/>
-    <mkdir dir="${build.classes.dir}/lib"/> 
-    <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" description="deploy cxf.rar" depends="generate.rar">
-    <copy todir="${jboss.home}/server/default/deploy">
-      <fileset dir="${build.classes.dir}/lib" includes="cxf.rar"/>
-      <fileset dir="${basedir}/etc" includes="cxfj2ee_1_5-ds.xml"/>
-    </copy>
-  </target>
+    <path id="other.classpath">
+        <fileset dir="${cxf.home}/modules/integration" >
+            <include name="cxf-integration-jca-*.jar"/>
+        </fileset>
+        <pathelement location="${jboss.home}/client/jbossall-client.jar"/>
+    </path>
+
+    <target name="prepare">
+        <replace file="${cxf.home}/etc/ra.xml" token="CXF_HOME" value="${cxf.home}"/>
+    </target>
+
+    <target name="war"/>
+
+    <target name="init">
+        <!--mkdir dir="${build.classes.dir}"/-->
+        <mkdir dir="${build.classes.dir}/cxf-rar/META-INF"/>
+        <mkdir dir="${build.classes.dir}/lib"/>
+        <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" description="deploy cxf.rar" depends="generate.rar">
+        <copy todir="${jboss.home}/server/default/deploy">
+            <fileset dir="${build.classes.dir}/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"/>
+    <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">
                 <include name="*.jar"/>
-                <exclude name="*manifest*.jar"/>
+                <exclude name="cxf*.jar"/>
             </fileset>
             <fileset dir="${cxf.home}/modules">
                 <include name="*.jar"/>
-                <exclude name="*-jbi-*.jar"/>
                 <exclude name="*manifest*.jar"/>
             </fileset>
+            <fileset dir="${cxf.home}/modules/integration">
+                <include name="*.jar"/>
+                <exclude name="*-jbi-*.jar"/>
+            </fileset>
         </copy>
-    <jar destfile="${build.classes.dir}/lib/cxf.rar"
-	 basedir="${build.classes.dir}/cxf-rar"/>
-  </target>
-    
-
-  <target name="build" description="compile the code" depends="clean,init,j2ee.compile,build.ejb.jar"/>

-
-    
-  <target name="j2ee.compile">
-    <javac srcdir="${basedir}/src" destdir="${build.classes.dir}" debug="true" fork="yes">
-      <include name="**/*.java"/>
-      <classpath>
-	<pathelement location="${cxf.home}/modules/cxf-manifest-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="deploy.ejb.jar" depends="build.ejb.jar" description="deploy the ejb bean"
>
-    <copy todir="${jboss.home}/server/default/deploy">
-      <fileset dir="${j2ee.archives}" includes="greeterejb.jar"/>
-    </copy>
-  </target>
+        <jar destfile="${build.classes.dir}/lib/cxf.rar"
+         basedir="${build.classes.dir}/cxf-rar"/>
+    </target>
+
+
+    <target name="build" description="compile the code" depends="clean,init,j2ee.compile,build.ejb.jar"/>
+
+
+    <target name="j2ee.compile">
+        <javac srcdir="${basedir}/src" destdir="${build.classes.dir}" debug="true" fork="yes">
+            <include name="**/*.java"/>
+            <classpath>
+                <pathelement location="${cxf.home}/modules/cxf-manifest-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="deploy.ejb.jar" depends="build.ejb.jar" description="deploy the ejb
bean" >
+        <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 
-	 to activate the web services facade for the greeterejb.jar application.
+     this target appends the necessary entry to ejb_servants.properties 
+     to activate the web services facade for the greeterejb.jar application.
     -->
     <target name="activate" description="updates ejb_servants.properties for demo " unless="GreeterBean">
-      <property name="servant.definition" 
-		value="GreeterBean={http://apache.org/hello_world_soap_http}Greeter@file:"/>
-      <echo message="updating ${servants.props.file}" />
-
-      <echo file="${servants.props.file}" append="true">
-	# entry for the j2ee inbound demo
-	${servant.definition}
-      </echo>
-      <replace file="${servants.props.file}" token="\" value="/"/> 
+        <property name="servant.definition"
+          value="GreeterBean={http://apache.org/hello_world_soap_http}Greeter@file:"/>
+        <echo message="updating ${servants.props.file}" />
+
+        <echo file="${servants.props.file}" append="true">
+            # entry for the j2ee inbound demo
+            ${servant.definition}
+        </echo>
+        <replace file="${servants.props.file}" token="\" value="/"/>
     </target>
 
 
-    <target name="client" description="run the client side demo " > 
-      <java classname="demo.client.GreeterClient" fork="true"> 
-        <sysproperty key="java.util.logging.config.file" value="${cxf.home}/etc/logging.properties"/>
-	<arg value="${wsdl.location}"/> 
-	<classpath> 
-	  <pathelement location="${build.classes.dir}"/>
-          <path refid="cxf.classpath"/>
-	</classpath>
-      </java> 
-    </target> 
+    <target name="client" description="run the client side demo " >
+        <java classname="demo.client.GreeterClient" fork="true">
+            <sysproperty key="java.util.logging.config.file" value="${cxf.home}/etc/logging.properties"/>
+            <arg value="${wsdl.location}"/>
+            <classpath>
+                <pathelement location="${build.classes.dir}"/>
+                <path refid="cxf.classpath"/>
+            </classpath>
+        </java>
+    </target>
 </project>



Mime
View raw message