[jboss-cvs] Picketlink SVN: r1267 - in integration-tests/branches/product: parent and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Sep 27 12:04:06 EDT 2011
Author: pskopek at redhat.com
Date: 2011-09-27 12:04:06 -0400 (Tue, 27 Sep 2011)
New Revision: 1267
Modified:
integration-tests/branches/product/ant-scripts/ant-build.xml
integration-tests/branches/product/parent/pom.xml
integration-tests/branches/product/picketlink-saml-eap5/pom.xml
integration-tests/branches/product/picketlink-sts-eap5-cxf/pom.xml
integration-tests/branches/product/picketlink-sts-eap5-native/pom.xml
integration-tests/branches/product/picketlink-trust-eap5-cxf/pom.xml
integration-tests/branches/product/picketlink-trust-eap5-native/pom.xml
Log:
fixed webapps-assebbly dep
Modified: integration-tests/branches/product/ant-scripts/ant-build.xml
===================================================================
--- integration-tests/branches/product/ant-scripts/ant-build.xml 2011-09-27 13:25:32 UTC (rev 1266)
+++ integration-tests/branches/product/ant-scripts/ant-build.xml 2011-09-27 16:04:06 UTC (rev 1267)
@@ -75,18 +75,24 @@
<!-- install PicketLink in versions prior to 5.1.2 -->
<!-- later as we have EAP 5.1.2 build it has to be build in -->
- <copy file="${localRepository}/org/picketlink/product/picketlink-core/${version}/picketlink-core-${version}.jar"
+ <copy file="${jboss.dist}/picketlink/picketlink-federation/picketlink-core-${version}.jar"
todir="${basedir}/target/${EAP_DIR}/jboss-as/common/lib"/>
<mkdir dir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink"/>
-
- <copy file="${localRepository}/org/picketlink/product/idp/${version}/idp-${version}.war"
- tofile="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink/idp.war"/>
- <copy file="${localRepository}/org/picketlink/product/picketlink-sts/${version}/picketlink-sts-${version}.war"
- tofile="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink/picketlink-sts.war"/>
- <copy file="${localRepository}/org/picketlink/product/pdp/${version}/pdp-${version}.war"
- tofile="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink/pdp.war"/>
+ <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">
@@ -111,40 +117,6 @@
</target>
-
-
- <target name="copy-picketlink-jboss">
- <mkdir dir="${deploy}/picketlink" />
- <copy file="${localRepository}/org/picketlink/picketlink-bindings/${version}/picketlink-bindings-${version}.jar" todir="${deploy}/picketlink"/>
- <copy file="${localRepository}/org/picketlink/picketlink-bindings-jboss/${version}/picketlink-bindings-jboss-${version}.jar" todir="${deploy}/picketlink"/>
- <copy file="${localRepository}/org/picketlink/picketlink-fed/${version}/picketlink-fed-${version}.jar" todir="${deploy}/picketlink"/>
- <unzip src="${localRepository}/org/picketlink/picketlink-fed-webapps-assembly/${version}/picketlink-fed-webapps-assembly-${version}.zip"
- dest="${deploy}"/>
- <copy file="${localRepository}/org/openid4java/openid4java-nodeps/0.9.5/openid4java-nodeps-0.9.5.jar" todir="${deploy}/picketlink"/>
-
- <chmod file="${jbossas}/bin/run.sh" perm="700"/>
-
- </target>
-
-
- <target name="copy-picketlink-jbas5">
- <antcall target="copy-picketlink-jboss">
- <param name="deploy" value="${JBAS5_DEPLOY}"/>
- <param name="jbossas" value="${basedir}/target/jboss-5.1.0.GA"/>
- </antcall>
- <copy file="${basedir}/../common-dist/files/jboss-log4j.xml" todir="${JBAS5_DEPLOY}/../conf"/>
- <copy file="${basedir}/../picketlink-int-webapps/claims/target/claims.war" todir="${JBAS5_DEPLOY}/picketlink/"/>
-
- </target>
-
- <target name="copy-picketlink-jbas6">
- <antcall target="copy-picketlink-jboss">
- <param name="deploy" value="${JBAS6_DEPLOY}"/>
- <param name="jbossas" value="${basedir}/target/jboss-6.0.0.Final"/>
- </antcall>
- <copy file="${basedir}/../picketlink-int-webapps/claims/target/claims.war" todir="${JBAS6_DEPLOY}/picketlink/"/>
- </target>
-
<target name="copy-sts-props-eap5">
<copy file="${basedir}/../picketlink-sts-tests/src/test/resources/sts-config.properties"
todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/conf/"/>
@@ -199,11 +171,6 @@
-->
</target>
- <target name="start-jboss6" depends="copy-picketlink-jbas6" >
- <antcall target="start-jboss">
- <param name="jbossas" value="${basedir}/target/jboss-6.0.0.Final"/>
- </antcall>
- </target>
<target name="stop-jboss">
<echo>Stopping Local 8080 </echo>
@@ -216,28 +183,6 @@
<antcall target="stop-jboss"/>
</target>
- <target name="stop-jboss6">
- <antcall target="stop-jboss"/>
- </target>
- <target name="install-jbws-cxf-jbas5">
- <echo>Installing JBoss WS CXF Stack</echo>
- <!-- Unzip JBoss WS CXF -->
- <unzip src="${JBWS_CXF_ZIP}" dest="${basedir}/target"/>
- <!-- Copy the ant.properties file that will be used by JBoss WS installation -->
- <copy file="${basedir}/../common-dist/jbossws/ant.properties" todir="${JBWS_CXF_HOME}"/>
- <!-- Invoke the installation ant target -->
- <ant dir="${JBWS_CXF_HOME}" target="deploy-jboss510" />
- </target>
- <target name="install-jbws-cxf-jbas6">
- <echo>Installing JBoss WS CXF Stack</echo>
- <!-- Unzip JBoss WS CXF -->
- <unzip src="${JBWS_CXF_ZIP}" dest="${basedir}/target"/>
- <!-- Copy the ant.properties file that will be used by JBoss WS installation -->
- <copy file="${basedir}/../common-dist/jbossws/ant.properties.jbas6" tofile="${JBWS_CXF_HOME}/ant.properties"/>
- <!-- Invoke the installation ant target -->
- <ant dir="${JBWS_CXF_HOME}" target="deploy-jboss600" />
- </target>
-
</project>
Modified: integration-tests/branches/product/parent/pom.xml
===================================================================
--- integration-tests/branches/product/parent/pom.xml 2011-09-27 13:25:32 UTC (rev 1266)
+++ integration-tests/branches/product/parent/pom.xml 2011-09-27 16:04:06 UTC (rev 1267)
@@ -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-SNAPSHOT</pl-fed-webapps-assembly-version>
+ <pl-fed-webapps-assembly-version>2.0.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>
Modified: integration-tests/branches/product/picketlink-saml-eap5/pom.xml
===================================================================
--- integration-tests/branches/product/picketlink-saml-eap5/pom.xml 2011-09-27 13:25:32 UTC (rev 1266)
+++ integration-tests/branches/product/picketlink-saml-eap5/pom.xml 2011-09-27 16:04:06 UTC (rev 1267)
@@ -67,6 +67,7 @@
<property name="version" value="${pl-version}"/>
<property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
+ <property name="jboss.dist" value="${jboss.dist}" />
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-eap5" />
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-eap5" />
</tasks>
Modified: integration-tests/branches/product/picketlink-sts-eap5-cxf/pom.xml
===================================================================
--- integration-tests/branches/product/picketlink-sts-eap5-cxf/pom.xml 2011-09-27 13:25:32 UTC (rev 1266)
+++ integration-tests/branches/product/picketlink-sts-eap5-cxf/pom.xml 2011-09-27 16:04:06 UTC (rev 1267)
@@ -76,6 +76,7 @@
<property name="version" value="${pl-version}"/>
<property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
+ <property name="jboss.dist" value="${jboss.dist}" />
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-eap5-cxf" />
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="copy-sts-props-eap5" />
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-eap5" />
Modified: integration-tests/branches/product/picketlink-sts-eap5-native/pom.xml
===================================================================
--- integration-tests/branches/product/picketlink-sts-eap5-native/pom.xml 2011-09-27 13:25:32 UTC (rev 1266)
+++ integration-tests/branches/product/picketlink-sts-eap5-native/pom.xml 2011-09-27 16:04:06 UTC (rev 1267)
@@ -77,6 +77,7 @@
<property name="version" value="${pl-version}"/>
<property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
+ <property name="jboss.dist" value="${jboss.dist}" />
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-eap5" />
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="copy-sts-props-eap5" />
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-eap5" />
Modified: integration-tests/branches/product/picketlink-trust-eap5-cxf/pom.xml
===================================================================
--- integration-tests/branches/product/picketlink-trust-eap5-cxf/pom.xml 2011-09-27 13:25:32 UTC (rev 1266)
+++ integration-tests/branches/product/picketlink-trust-eap5-cxf/pom.xml 2011-09-27 16:04:06 UTC (rev 1267)
@@ -75,6 +75,7 @@
<property name="version" value="${pl-version}"/>
<property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
+ <property name="jboss.dist" value="${jboss.dist}" />
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-eap5-cxf" />
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="copy-sts-props-eap5" />
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="copy-trust-settings-eap5" />
Modified: integration-tests/branches/product/picketlink-trust-eap5-native/pom.xml
===================================================================
--- integration-tests/branches/product/picketlink-trust-eap5-native/pom.xml 2011-09-27 13:25:32 UTC (rev 1266)
+++ integration-tests/branches/product/picketlink-trust-eap5-native/pom.xml 2011-09-27 16:04:06 UTC (rev 1267)
@@ -74,6 +74,7 @@
<property name="version" value="${pl-version}"/>
<property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
+ <property name="jboss.dist" value="${jboss.dist}" />
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-eap5" />
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="copy-sts-props-eap5" />
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="copy-trust-settings-eap5" />
More information about the jboss-cvs-commits
mailing list