[jboss-svn-commits] JBL Code SVN: r14856 - in labs/jbossesb/trunk/product: samples/quickstarts/conf and 1 other directory.

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

Author: kevin.conner at jboss.com
Date: 2007-09-04 07:30:26 -0400 (Tue, 04 Sep 2007)
New Revision: 14856

Modified:
   labs/jbossesb/trunk/product/install/build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
Log:
Applied stricter checks: JBESB-985

Modified: labs/jbossesb/trunk/product/install/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/build.xml	2007-09-04 11:30:19 UTC (rev 14855)
+++ labs/jbossesb/trunk/product/install/build.xml	2007-09-04 11:30:26 UTC (rev 14856)
@@ -228,7 +228,7 @@
 		<property name="jaxb.intros.jar" value="jboss-jaxb-intros.jar"/>
 		<property name="jbossesb.soap.jar" value="jbossesb-soap.jar"/>
 		
-		<available property="jbossws.exists" file="${jbossws.location}" type="dir"/>
+        <available property="jbossws.exists" file="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib/jbossws-spi.jar"/>
 		<fail unless="jbossws.exists" message="Please install JBossWS into the Application Server"/>
 		
 		<available property="jaxb.intros.exist" file="${jbossws.location}/${jaxb.intros.jar}" type="file"/>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2007-09-04 11:30:19 UTC (rev 14855)
+++ labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2007-09-04 11:30:26 UTC (rev 14856)
@@ -422,8 +422,18 @@
 <!-- ==================================================================== -->
 
     <target name="assert-ws-available">
-        <available property="ws-available" file="${org.jboss.esb.server.deploy.dir}/jbossws.sar/jbossws.beans"/>
-        <fail unless="ws-available">**** DEPLOYMENT FAILED... Sorry, this Quickstart requires the JBoss Webservice container from http://anonsvn.labs.jboss.com/labs/jbossesb/workspace/jbossws2_0_0.  '${org.jboss.esb.server.home}' does not appear to contain that Webservice container.  Check the 'org.jboss.esb.server.home' property in ../quickstarts.properties"</fail>
+        <available property="ws-spi" file="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/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">
+    		<and>
+    			<isset property="ws-spi"/>
+    			<isset property="ws-intros"/>
+    		</and>
+    	</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}'." />
     </target>