Author: pskopek(a)redhat.com Date: 2011-09-27 09:25:32 -0400 (Tue, 27 Sep 2011) New Revision: 1266 Added: integration-tests/branches/product/product-preparation/ integration-tests/branches/product/product-preparation/pom.xml Modified: integration-tests/branches/product/ant-scripts/ant-build.xml integration-tests/branches/product/parent/pom.xml integration-tests/branches/product/picketlink-pdp-tests/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-sts-tests/pom.xml integration-tests/branches/product/picketlink-trust-eap5-cxf/pom.xml integration-tests/branches/product/picketlink-trust-eap5-native/pom.xml integration-tests/branches/product/picketlink-trust-tests/pom.xml integration-tests/branches/product/pom.xml Log: removed unnecessary dependency from product perspective Modified: integration-tests/branches/product/ant-scripts/ant-build.xml =================================================================== --- integration-tests/branches/product/ant-scripts/ant-build.xml 2011-09-26 18:50:16 UTC (rev 1265) +++ integration-tests/branches/product/ant-scripts/ant-build.xml 2011-09-27 13:25:32 UTC (rev 1266) @@ -52,6 +52,16 @@ </else> </if> </target> + + <target name="unzip-jboss-distributed-test-deps" depends="download-eap"> + <unzip src="${DIST_DIR}/${EAP_ZIP}" + dest="${basedir}/target"> + <patternset> + <include name="jboss-eap-5.1/picketlink/**"/> + </patternset> + </unzip> + + </target> <target name="init-eap5" depends="download-eap"> <!-- Unzip JBoss EAP --> @@ -154,8 +164,10 @@ todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/conf" /> <copy file="${basedir}/../picketlink-trust-tests/src/test/resources/props/sts-roles.properties" todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/conf" /> - <copy file="${localRepository}/org/picketlink/picketlink-trust-jbossws/${pl-trust-version}/picketlink-trust-jbossws-${pl-trust-version}.jar" - todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink"/> + + <!-- copy file="${localRepository}/org/picketlink/picketlink-trust-jbossws/${pl-trust-version}/picketlink-trust-jbossws-${pl-trust-version}.jar" + todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink"/ --> + <copy file="${basedir}/../common-dist/files/eap/5.1.1/war-deployers-jboss-beans.xml" todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deployers/jbossweb.deployer/META-INF" /> </target> Modified: integration-tests/branches/product/parent/pom.xml =================================================================== --- integration-tests/branches/product/parent/pom.xml 2011-09-26 18:50:16 UTC (rev 1265) +++ integration-tests/branches/product/parent/pom.xml 2011-09-27 13:25:32 UTC (rev 1266) @@ -39,6 +39,7 @@ <EAP_URL>${downloadURL.prefix}/${EAP_ZIP}</EAP_URL> <CXF_INSTALLER_URL>${downloadURL.prefix}/${CXF_INSTALLER_ZIP}</CXF_INSTALLER_URL> <jboss.profile>default</jboss.profile> + <jboss.dist>${basedir}/../product-preparation/target/jboss-eap-5.1</jboss.dist> </properties> Modified: integration-tests/branches/product/picketlink-pdp-tests/pom.xml =================================================================== --- integration-tests/branches/product/picketlink-pdp-tests/pom.xml 2011-09-26 18:50:16 UTC (rev 1265) +++ integration-tests/branches/product/picketlink-pdp-tests/pom.xml 2011-09-27 13:25:32 UTC (rev 1266) @@ -96,7 +96,8 @@ <groupId>org.picketlink.product</groupId> <artifactId>picketlink-core</artifactId> <version>${pl-version}</version> - <scope>compile</scope> + <scope>system</scope> + <systemPath>${jboss.dist}/picketlink/picketlink-federation/picketlink-core-${pl-version}.jar</systemPath> </dependency> <dependency> <groupId>junit</groupId> Modified: integration-tests/branches/product/picketlink-saml-eap5/pom.xml =================================================================== --- integration-tests/branches/product/picketlink-saml-eap5/pom.xml 2011-09-26 18:50:16 UTC (rev 1265) +++ integration-tests/branches/product/picketlink-saml-eap5/pom.xml 2011-09-27 13:25:32 UTC (rev 1266) @@ -133,7 +133,8 @@ <groupId>org.picketlink.product</groupId> <artifactId>picketlink-core</artifactId> <version>${pl-version}</version> - <scope>compile</scope> + <scope>system</scope> + <systemPath>${jboss.dist}/picketlink/picketlink-federation/picketlink-core-${pl-version}.jar</systemPath> </dependency> <dependency> <groupId>org.picketlink</groupId> Modified: integration-tests/branches/product/picketlink-sts-eap5-cxf/pom.xml =================================================================== --- integration-tests/branches/product/picketlink-sts-eap5-cxf/pom.xml 2011-09-26 18:50:16 UTC (rev 1265) +++ integration-tests/branches/product/picketlink-sts-eap5-cxf/pom.xml 2011-09-27 13:25:32 UTC (rev 1266) @@ -106,11 +106,12 @@ </build> <dependencies> - <dependency> + <dependency> <groupId>org.picketlink.product</groupId> <artifactId>picketlink-core</artifactId> <version>${pl-version}</version> - <scope>compile</scope> + <scope>system</scope> + <systemPath>${jboss.dist}/picketlink/picketlink-federation/picketlink-core-${pl-version}.jar</systemPath> </dependency> <dependency> <groupId>org.jboss.security</groupId> Modified: integration-tests/branches/product/picketlink-sts-eap5-native/pom.xml =================================================================== --- integration-tests/branches/product/picketlink-sts-eap5-native/pom.xml 2011-09-26 18:50:16 UTC (rev 1265) +++ integration-tests/branches/product/picketlink-sts-eap5-native/pom.xml 2011-09-27 13:25:32 UTC (rev 1266) @@ -111,7 +111,8 @@ <groupId>org.picketlink.product</groupId> <artifactId>picketlink-core</artifactId> <version>${pl-version}</version> - <scope>compile</scope> + <scope>system</scope> + <systemPath>${jboss.dist}/picketlink/picketlink-federation/picketlink-core-${pl-version}.jar</systemPath> </dependency> <dependency> <groupId>org.jboss.security</groupId> Modified: integration-tests/branches/product/picketlink-sts-tests/pom.xml =================================================================== --- integration-tests/branches/product/picketlink-sts-tests/pom.xml 2011-09-26 18:50:16 UTC (rev 1265) +++ integration-tests/branches/product/picketlink-sts-tests/pom.xml 2011-09-27 13:25:32 UTC (rev 1266) @@ -49,7 +49,8 @@ <groupId>org.picketlink.product</groupId> <artifactId>picketlink-core</artifactId> <version>${pl-version}</version> - <scope>test</scope> + <scope>system</scope> + <systemPath>${jboss.dist}/picketlink/picketlink-federation/picketlink-core-${pl-version}.jar</systemPath> </dependency> <dependency> <groupId>org.jboss.security</groupId> Modified: integration-tests/branches/product/picketlink-trust-eap5-cxf/pom.xml =================================================================== --- integration-tests/branches/product/picketlink-trust-eap5-cxf/pom.xml 2011-09-26 18:50:16 UTC (rev 1265) +++ integration-tests/branches/product/picketlink-trust-eap5-cxf/pom.xml 2011-09-27 13:25:32 UTC (rev 1266) @@ -107,18 +107,13 @@ <dependencies> <dependency> - <groupId>org.picketlink.product</groupId> - <artifactId>picketlink-core</artifactId> - <version>${pl-version}</version> - <scope>compile</scope> + <groupId>org.picketlink.product</groupId> + <artifactId>picketlink-core</artifactId> + <version>${pl-version}</version> + <scope>system</scope> + <systemPath>${jboss.dist}/picketlink/picketlink-federation/picketlink-core-${pl-version}.jar</systemPath> </dependency> <dependency> - <groupId>org.picketlink</groupId> - <artifactId>picketlink-trust-jbossws</artifactId> - <version>${pl-trust-version}</version> - <scope>compile</scope> - </dependency> - <dependency> <groupId>org.jboss.security</groupId> <artifactId>jbosssx-client</artifactId> <version>2.0.4.SP6</version> Modified: integration-tests/branches/product/picketlink-trust-eap5-native/pom.xml =================================================================== --- integration-tests/branches/product/picketlink-trust-eap5-native/pom.xml 2011-09-26 18:50:16 UTC (rev 1265) +++ integration-tests/branches/product/picketlink-trust-eap5-native/pom.xml 2011-09-27 13:25:32 UTC (rev 1266) @@ -106,18 +106,13 @@ <dependencies> <dependency> - <groupId>org.picketlink.product</groupId> - <artifactId>picketlink-core</artifactId> - <version>${pl-version}</version> - <scope>compile</scope> + <groupId>org.picketlink.product</groupId> + <artifactId>picketlink-core</artifactId> + <version>${pl-version}</version> + <scope>system</scope> + <systemPath>${jboss.dist}/picketlink/picketlink-federation/picketlink-core-${pl-version}.jar</systemPath> </dependency> <dependency> - <groupId>org.picketlink</groupId> - <artifactId>picketlink-trust-jbossws</artifactId> - <version>${pl-trust-version}</version> - <scope>compile</scope> - </dependency> - <dependency> <groupId>org.jboss.security</groupId> <artifactId>jbosssx-client</artifactId> <version>2.0.4.SP6</version> Modified: integration-tests/branches/product/picketlink-trust-tests/pom.xml =================================================================== --- integration-tests/branches/product/picketlink-trust-tests/pom.xml 2011-09-26 18:50:16 UTC (rev 1265) +++ integration-tests/branches/product/picketlink-trust-tests/pom.xml 2011-09-27 13:25:32 UTC (rev 1266) @@ -144,30 +144,18 @@ <dependencies> <dependency> - <groupId>org.picketlink.product</groupId> - <artifactId>picketlink-core</artifactId> - <version>${pl-version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.jboss.spec.javax.servlet</groupId> - <artifactId>jboss-servlet-api_3.0_spec</artifactId> - </exclusion> - </exclusions> + <groupId>org.picketlink.product</groupId> + <artifactId>picketlink-core</artifactId> + <version>${pl-version}</version> + <scope>system</scope> + <systemPath>${jboss.dist}/picketlink/picketlink-federation/picketlink-core-${pl-version}.jar</systemPath> </dependency> <dependency> - <groupId>org.picketlink</groupId> - <artifactId>picketlink-trust-jbossws</artifactId> - <version>${pl-trust-version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.5</version> - <scope>test</scope> + <scope>compile</scope> </dependency> - <dependency> <groupId>org.jboss.security</groupId> <artifactId>jbosssx-client</artifactId> Modified: integration-tests/branches/product/pom.xml =================================================================== --- integration-tests/branches/product/pom.xml 2011-09-26 18:50:16 UTC (rev 1265) +++ integration-tests/branches/product/pom.xml 2011-09-27 13:25:32 UTC (rev 1266) @@ -1,6 +1,6 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <groupId>org.picketlink</groupId> + <groupId>org.picketlink.product</groupId> <artifactId>picketlink-integration-tests-parent</artifactId> <version>2.0.0-SNAPSHOT</version> <relativePath>parent</relativePath> @@ -12,8 +12,11 @@ <url>http://jboss.org/picketlink/</url> <description>PicketLink is the identity project for Java projects</description> + <modules> <module>parent</module> + <module>product-preparation</module> + <module>picketlink-int-webapps</module> <module>picketlink-saml-tests</module> @@ -28,6 +31,6 @@ <module>picketlink-trust-tests</module> <module>picketlink-trust-eap5-native</module> <module>picketlink-trust-eap5-cxf</module> - + </modules> </project> Property changes on: integration-tests/branches/product/product-preparation ___________________________________________________________________ Added: svn:ignore + .settings target .project Added: integration-tests/branches/product/product-preparation/pom.xml =================================================================== --- integration-tests/branches/product/product-preparation/pom.xml (rev 0) +++ integration-tests/branches/product/product-preparation/pom.xml 2011-09-27 13:25:32 UTC (rev 1266) @@ -0,0 +1,45 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>picketlink-integration-tests-pom</artifactId> + <groupId>org.picketlink.product</groupId> + <version>2.0.0-SNAPSHOT</version> + <relativePath>..</relativePath> + </parent> + <artifactId>product-preparation</artifactId> + <packaging>pom</packaging> + <name>product-prepare</name> + <description>Prepare product installation</description> + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>phase-1</id> + <phase>compile</phase> + <configuration> + <tasks> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <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"/> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="unzip-jboss-distributed-test-deps" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>ant-contrib</groupId> + <artifactId>ant-contrib</artifactId> + <version>1.0b2</version> + </dependency> + </dependencies> +</project> \ No newline at end of file