Author: mmao
Date: Mon Apr 23 02:08:18 2007
New Revision: 531388
URL: http://svn.apache.org/viewvc?view=rev&rev=531388
Log:
Dont fail the deploy, we will copy jars into tomcat automatically.
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
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=531388&r1=531387&r2=531388
==============================================================================
--- 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 02:08:18 2007
@@ -269,19 +269,19 @@
<target name="validate-tomcat">
<fail unless="env.CATALINA_HOME" message="You should set the
CATALINA_HOME, if you want to deploy into tomcat"/>
- <available property="cxf.jars.present.in.tomcat"
classname="org.apache.cxf.version.Version">
- <classpath>
- <fileset dir="${env.CATALINA_HOME}/shared/lib">
- <include name="*.jar"/>
- </fileset>
- </classpath>
- </available>
+ <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.jars.present.in.tomcat"
file="${env.CATALINA_HOME}/shared/lib/cxf-manifest-incubator.jar" type="file"/>
- <fail unless="cxf.jars.present.in.tomcat" message="In order to run
Apache CXF service under TOMCAT,
- you MUST copy jars
under ${cxf.home}/lib/ into ${env.CATALINA_HOME}/shared/lib/ first"/>
-
-
<available property="cxf.jbi.present"
classname="org.apache.cxf.jbi.transport.JBIConduit">
<classpath>
<fileset dir="${env.CATALINA_HOME}/shared/lib">
