[jboss-cvs] Picketlink SVN: r1275 - in integration-tests/branches/product: parent and 1 other directory.

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

Author: pskopek at redhat.com
Date: 2011-09-30 07:23:35 -0400 (Fri, 30 Sep 2011)
New Revision: 1275

Modified:
   integration-tests/branches/product/ant-scripts/ant-build.xml
   integration-tests/branches/product/parent/pom.xml
Log:
Fixing test failures due to wrong test artifact dependency. 

Modified: integration-tests/branches/product/ant-scripts/ant-build.xml
===================================================================
--- integration-tests/branches/product/ant-scripts/ant-build.xml	2011-09-30 10:04:02 UTC (rev 1274)
+++ integration-tests/branches/product/ant-scripts/ant-build.xml	2011-09-30 11:23:35 UTC (rev 1275)
@@ -20,7 +20,7 @@
   <property name="DIST_DIR" value="${basedir}/../common-dist/target" />	
   <property name="EAP_DIR" value="jboss-eap-5.1" />
   <property name="jboss.profile" value="default" />	
-  <property name="pl-fed-webapps-assembly-version" value="2.0.1.final" />	
+  <property name="pl-fed-webapps-assembly-version" value="2.0.1.1.final" />	
 	
   <target name="download-eap">
     <if>
@@ -80,27 +80,29 @@
   	
   	<mkdir dir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink"/>
 
-  	<copy todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink">
-  	    <dirset dir="${jboss.dist}/picketlink/picketlink-federation-webapps/idp.war" >
-  	    	<include name="**/*"/>
-  		</dirset>
-  	    <dirset dir="${jboss.dist}/picketlink/picketlink-federation-webapps/pdp.war" >
-  	    	<include name="**/*"/>
-  		</dirset>
-  	    <dirset dir="${jboss.dist}/picketlink/picketlink-federation-webapps/picketlink-sts.war" >
-  	    	<include name="**/*"/>
-  		</dirset>
-    </copy>
-
-
   	<!-- deploy test apps -->
     <unzip src="${localRepository}/org/picketlink/picketlink-fed-webapps-assembly/${pl-fed-webapps-assembly-version}/picketlink-fed-webapps-assembly-${pl-fed-webapps-assembly-version}.zip"
            dest="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy">
   	    <patternset id="pl-fed-webapps-assembly-files" 
-  	        excludes="pdp.war,idp.war,picketlink-sts.war"/> 
+  	        excludes="**/pdp.war,**/idp.war,**/picketlink-sts.war"/> 
   	</unzip>
   	
   	<copy file="${basedir}/../picketlink-int-webapps/claims/target/claims.war" todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink/"/>
+
+  	<!-- copy webapps from distribution -->
+  	<copy todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink">
+  	    <fileset dir="${jboss.dist}/picketlink/picketlink-federation-webapps" >
+  	    	<include name="idp.war/**/*"/>
+  		</fileset>
+  	    <fileset dir="${jboss.dist}/picketlink/picketlink-federation-webapps" >
+  	    	<include name="pdp.war/**/*"/>
+  		</fileset>
+  	    <fileset dir="${jboss.dist}/picketlink/picketlink-federation-webapps" >
+  	    	<include name="picketlink-sts.war/**/*"/>
+  		</fileset>
+    </copy>
+
+
   </target>
 
   <target name="init-eap5-cxf" depends="init-eap5,download-cxf">

Modified: integration-tests/branches/product/parent/pom.xml
===================================================================
--- integration-tests/branches/product/parent/pom.xml	2011-09-30 10:04:02 UTC (rev 1274)
+++ integration-tests/branches/product/parent/pom.xml	2011-09-30 11:23:35 UTC (rev 1275)
@@ -30,7 +30,7 @@
    <properties>
      <pl-version>2.0.0</pl-version>
      <pl-trust-version>2.0.0.final</pl-trust-version>
-     <pl-fed-webapps-assembly-version>2.0.1.final</pl-fed-webapps-assembly-version>
+     <pl-fed-webapps-assembly-version>2.0.1.1.final</pl-fed-webapps-assembly-version>
      <maven.compiler.target>1.6</maven.compiler.target>
      <eap-home>${basedir}/target/jboss-eap-5.1/jboss-as</eap-home>
      <EAP_ZIP>jboss-eap-noauth-5.1.2-ER1.zip</EAP_ZIP>