[jboss-svn-commits] JBL Code SVN: r29943 - in labs/jbossesb/trunk/product: install and 2 other directories.

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

Author: beve
Date: 2009-11-04 07:19:51 -0500 (Wed, 04 Nov 2009)
New Revision: 29943

Modified:
   labs/jbossesb/trunk/product/install/build.xml
   labs/jbossesb/trunk/product/ivy.xml
   labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/security_saml/build.xml
Log:
Work for https://jira.jboss.org/jira/browse/JBESB-2896 "AS4 installation overwrites jbossws jars"


Modified: labs/jbossesb/trunk/product/install/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/build.xml	2009-11-04 12:03:39 UTC (rev 29942)
+++ labs/jbossesb/trunk/product/install/build.xml	2009-11-04 12:19:51 UTC (rev 29943)
@@ -223,9 +223,6 @@
 	            </fileset>
 	        </copy>
 		
-	        <copy file="${org.jboss.esb.dist.lib}/jbossws-native-core-3.0.5.GA.jar" tofile="${deploy.dir}/jbossws.sar/jbossws-core.jar"/>
-	        <copy file="${org.jboss.esb.dist.lib}/jbossws-common-1.0.8.GA.jar" tofile="${server.lib.dir}/jbossws-common.jar"/>
-
 	        <ant dir="jbpm-patch" target="replace">
 	            <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
 	            <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>

Modified: labs/jbossesb/trunk/product/ivy.xml
===================================================================
--- labs/jbossesb/trunk/product/ivy.xml	2009-11-04 12:03:39 UTC (rev 29942)
+++ labs/jbossesb/trunk/product/ivy.xml	2009-11-04 12:19:51 UTC (rev 29943)
@@ -169,10 +169,6 @@
         <dependency org="org.jboss.identity" name="jboss-identity-web" rev="1.0.0.beta3"/>
         <dependency org="org.apache" name="xmlsec" rev="1.4.3"/>
 
-		<!-- Needed for WSTrustClient with JBoss AS 4.x :https://jira.jboss.org/jira/browse/JBWS-2346 -->
-        <dependency org="org.jboss.ws.native" name="jbossws-native-core" rev="3.0.5.GA"/>
-        <dependency org="org.jboss.ws" name="jbossws-common" rev="1.0.8.GA"/>
-
 	<!-- JOPR dependencies -->
         <dependency org="org.jboss.jopr" name="jopr-embedded-jbas4" rev="1.2.0.GA">
             <artifact name="jopr-embedded-jbas4" type="war"/>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2009-11-04 12:03:39 UTC (rev 29942)
+++ labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2009-11-04 12:19:51 UTC (rev 29943)
@@ -694,6 +694,30 @@
         <fail unless="jgroups-available" message="Unfortunately this aspect requires jgroups in order to function correctly.  Please target a server instance which contains jgroups.jar"/>
     </target>
 
+    <target name="assert-as5" unless="jbossas5">
+        <fail message="This quickstart can only be run on JBoss AS 5.1.0.GA or higher" />
+    </target>
+
+    <target name="assert-jbossws-identity-version" if="jbossas4">
+		<property name="prefix" value="jbossws."/>
+        <loadproperties>
+           <zipentry zipfile="${org.jboss.esb.server.deploy.dir}/jbossws.sar/jbossws-core.jar" name="META-INF/MANIFEST.MF"/>
+            <filterchain>
+                <prefixlines prefix="${prefix}"/>
+            </filterchain>
+        </loadproperties>
+        <property name="jbossws-version-string" value="${jbossws.Specification-Version}"/>
+
+        <echo message="JBossWS Version String: '${jbossws-version-string}'."/>
+        <condition property="invalid-jbossws-version">
+            <not>
+                <contains string="${jbossws-version-string}" substring="jbossws-3.0" />
+            </not>
+        </condition>
+
+        <fail unless="invalid-jbossws-version" message="Invalid version of JBossWS installed on target server. Please install version 3.0.5.GA or higher: http://repository.jboss.org/maven2/org/jboss/ws/native/jbossws-native-core" />
+	</target>
+
     <!-- ==================================================================== -->
 <!-- This section defines properties/targets to be overridden by the      -->
 <!-- quickstart specific build.xml file.                                  -->

Modified: labs/jbossesb/trunk/product/samples/quickstarts/security_saml/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/security_saml/build.xml	2009-11-04 12:03:39 UTC (rev 29942)
+++ labs/jbossesb/trunk/product/samples/quickstarts/security_saml/build.xml	2009-11-04 12:19:51 UTC (rev 29943)
@@ -8,6 +8,8 @@
 	<!-- additional deploys -->
     <property name="additional.deploys" value="jboss-wsse-client.xml, smooks/*.xml, jboss-sts-client.properties"/>
 
+	<target name="quickstart-specific-checks" depends="assert-ws-available, assert-as5"/>
+
 	<target name="quickstart-specific-predeploys">
 		<copy file="${basedir}/jboss-sts.war" todir="${org.jboss.esb.server.deploy.dir}"/>
     </target>
@@ -19,8 +21,6 @@
 	<!-- Import the base Ant build script... -->
 	<import file="../conf/base-build.xml"/>
 
-    <target name="quickstart-specific-checks" depends="assert-ws-available"/>
-	
     <target name="quickstart-specific-dependencies">
         <path id="quickstart-dependencies-classpath">
             <fileset dir="${org.jboss.esb.server.home}/client" includes="jbossws-client.jar,jboss-remoting.jar" />