[jboss-svn-commits] JBL Code SVN: r26188 - labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/conf.

[jboss-svn-commits at lists.jboss.org]

Author: beve
Date: 2009-04-21 10:43:54 -0400 (Tue, 21 Apr 2009)
New Revision: 26188

Modified:
   labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/conf/base-build.xml
Log:
Modified the check for webserice support to apply to AS 5


Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/conf/base-build.xml	2009-04-21 14:24:21 UTC (rev 26187)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/conf/base-build.xml	2009-04-21 14:43:54 UTC (rev 26188)
@@ -632,14 +632,31 @@
     <target name="assert-ws-available" depends="jbossesb-dependencies-as4, jbossesb-dependencies-as5">
         <available property="ws-spi" file="${org.jboss.esb.server.server}/lib/jbossws-spi.jar"/>
     	<available property="ws-intros" file="${org.jboss.esb.server.deploy.dir}/jbossws.sar/jboss-jaxb-intros.jar"/>
-    	
-    	<condition property="ws-available">
+    	<condition property="ws-available-as4">
     		<and>
     			<isset property="ws-spi"/>
     			<isset property="ws-intros"/>
     		</and>
     	</condition>
     	
+        <available property="ws-spi-as5" file="${org.jboss.esb.server.home}/common/lib/jbossws-spi.jar"/>
+    	<available property="ws-intros-as5" file="${org.jboss.esb.server.server}/deployers/jbossws.deployer/jboss-jaxb-intros.jar"/>
+    	
+    	<condition property="ws-available-as5">
+    		<and>
+    			<isset property="ws-spi-as5"/>
+    			<isset property="ws-intros-as5"/>
+    		</and>
+    	</condition>
+    	
+    	<condition property="ws-available">
+    		<or>
+    			<isset property="ws-available-as4"/>
+    			<isset property="ws-available-as5"/>
+    		</or>
+    	</condition>
+    	
+    	
         <fail unless="ws-available">**** DEPLOYMENT FAILED... Sorry, this Quickstart requires a modified JBoss Webservice container, please refer to the 'Configuring Webservice Integration' section of the Administration Guide.</fail>
 
         <echo message="JBoss Webservice container found on target '${org.jboss.esb.server.deploy.dir}'." />