[picketlink-commits] Picketlink SVN: r327 - in integration-tests/trunk: common-dist/jbossws and 2 other directories.
picketlink-commits at lists.jboss.org
picketlink-commits at lists.jboss.org
Mon Jul 5 14:36:56 EDT 2010
Author: sguilhen at redhat.com
Date: 2010-07-05 14:36:56 -0400 (Mon, 05 Jul 2010)
New Revision: 327
Added:
integration-tests/trunk/common-dist/jbossws/
integration-tests/trunk/common-dist/jbossws/3.3.1.GA/
integration-tests/trunk/common-dist/jbossws/3.3.1.GA/jbossws-cxf-3.3.1.GA.zip
integration-tests/trunk/common-dist/jbossws/3.3.1.GA/jbossws-metro-3.3.1.GA.zip
integration-tests/trunk/common-dist/jbossws/ant.properties
Modified:
integration-tests/trunk/picketlink-sts-tests/ant-build.xml
integration-tests/trunk/picketlink-sts-tests/pom.xml
Log:
PLFED-84: PicketLink STS tests now run on top of the three JBoss WS stacks (native, metro, cxf)
Added: integration-tests/trunk/common-dist/jbossws/3.3.1.GA/jbossws-cxf-3.3.1.GA.zip
===================================================================
(Binary files differ)
Property changes on: integration-tests/trunk/common-dist/jbossws/3.3.1.GA/jbossws-cxf-3.3.1.GA.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: integration-tests/trunk/common-dist/jbossws/3.3.1.GA/jbossws-metro-3.3.1.GA.zip
===================================================================
(Binary files differ)
Property changes on: integration-tests/trunk/common-dist/jbossws/3.3.1.GA/jbossws-metro-3.3.1.GA.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: integration-tests/trunk/common-dist/jbossws/ant.properties
===================================================================
--- integration-tests/trunk/common-dist/jbossws/ant.properties (rev 0)
+++ integration-tests/trunk/common-dist/jbossws/ant.properties 2010-07-05 18:36:56 UTC (rev 327)
@@ -0,0 +1,15 @@
+# JBoss Home
+jboss510.home=../jboss-5.1.0.GA
+
+# JBoss WS integration target
+jbossws.integration.target=jboss510
+
+# The JBoss settings
+jboss.server.instance=default
+jboss.bind.address=localhost
+
+# Java Compiler options
+javac.debug=yes
+javac.deprecation=no
+javac.fail.onerror=yes
+javac.verbose=no
Modified: integration-tests/trunk/picketlink-sts-tests/ant-build.xml
===================================================================
--- integration-tests/trunk/picketlink-sts-tests/ant-build.xml 2010-07-01 21:33:41 UTC (rev 326)
+++ integration-tests/trunk/picketlink-sts-tests/ant-build.xml 2010-07-05 18:36:56 UTC (rev 327)
@@ -1,96 +1,72 @@
-<project default="init" name="PicketLink Federation Integration Test Suite">
- <taskdef resource="net/sf/antcontrib/antlib.xml">
- <classpath path="${depclasspath}"/>
- </taskdef>
- <property name="JBAS_DEPLOY" location="${basedir}/target/jboss-5.1.0.GA/server/default/deploy/" />
- <property name="TOMCAT" location="${basedir}/target/apache-tomcat-6.0.26/" />
- <property name="TOMCAT_DEPLOY" location="${basedir}/target/apache-tomcat-6.0.26/webapps/" />
- <property name="TOMCAT_LIB" location="${basedir}/target/apache-tomcat-6.0.26/lib/" />
- <property environment="env" />
+<project default="install-jboss" name="PicketLink Federation Integration Test Suite">
- <target name="init-jboss">
- <!-- Unzip JBoss AS and Tomcat -->
- <echo>Unzip JBOSS AS 5.1.0.GA</echo>
- <unzip src="${basedir}/../common-dist/jbossas/5.1.0.GA/jboss-5.1.0.GA-jdk6.zip"
- dest="${basedir}/target"/>
- </target>
- <target name="init-tomcat">
- <echo>Unzip Apache Tomcat 6.0.26</echo>
- <unzip src="${basedir}/../common-dist/tomcat/6.0.26/apache-tomcat-6.0.26.zip"
- dest="${basedir}/target"/>
- </target>
+ <property name="JBAS_ZIP" location="${basedir}/../common-dist/jbossas/5.1.0.GA/jboss-5.1.0.GA-jdk6.zip"/>
+ <property name="JBAS_DEPLOY" location="${basedir}/target/jboss-5.1.0.GA/server/default/deploy/" />
+ <property name="JBWS_METRO_ZIP" location="${basedir}/../common-dist/jbossws/3.3.1.GA/jbossws-metro-3.3.1.GA.zip"/>
+ <property name="JBWS_METRO_HOME" location="${basedir}/target/jbossws-metro-bin-dist/"/>
+ <property name="JBWS_CXF_ZIP" location="${basedir}/../common-dist/jbossws/3.3.1.GA/jbossws-cxf-3.3.1.GA.zip"/>
+ <property name="JBWS_CXF_HOME" location="${basedir}/target/jbossws-cxf-bin-dist/"/>
+ <target name="install-jboss">
+ <echo>Installing JBOSS AS 5.1.0.GA</echo>
+ <unzip src="${JBAS_ZIP}" dest="${basedir}/target"/>
- <target name="tomcat-thirdparty-deps" depends="init-tomcat" >
- <copy file="${localRepository}/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" todir="${TOMCAT_LIB}"/>
- </target>
-
- <target name="copy-picketlink-tomcat" depends="tomcat-thirdparty-deps" >
- <copy file="${localRepository}/org/picketlink/picketlink-bindings/${version}/picketlink-bindings-${version}.jar" todir="${TOMCAT_LIB}"/>
- <copy file="${localRepository}/org/picketlink/picketlink-bindings-jboss/${version}/picketlink-bindings-jboss-${version}.jar" todir="${TOMCAT_LIB}"/>
- <copy file="${localRepository}/org/picketlink/picketlink-fed/${version}/picketlink-fed-${version}.jar" todir="${TOMCAT_LIB}"/>
-
- <unzip src="${localRepository}/org/picketlink/picketlink-fed-webapps-assembly/${version}/picketlink-fed-webapps-assembly-${version}.zip"
- dest="${TOMCAT_DEPLOY}"/>
-
- <move todir="${TOMCAT_DEPLOY}">
- <fileset dir="${TOMCAT_DEPLOY}/picketlink">
- <include name="**/*.war"/>
- </fileset>
- </move>
-
- <copy file="${basedir}/../common-dist/tomcat/tomcat-users.xml"
- todir="${TOMCAT}/conf" />
- <copy file="${basedir}/../common-dist/tomcat/log4j.xml"
- todir="${TOMCAT}/lib" />
- <chmod dir="${basedir}/target/apache-tomcat-6.0.26/bin" perm="700" includes="**/*.sh"/>
- <chmod dir="${basedir}/target/apache-tomcat-6.0.26/bin" perm="700" includes="**/*.jar"/>
- </target>
-
- <target name="copy-picketlink-jbas" depends="init-jboss" >
- <mkdir dir="${basedir}/target/jboss-5.1.0.GA/server/default/deploy/picketlink" />
+ <!-- Copy PicketLink jars and webapps to JBoss AS -->
+ <mkdir dir="${JBAS_DEPLOY}/picketlink" />
<copy file="${localRepository}/org/picketlink/picketlink-bindings/${version}/picketlink-bindings-${version}.jar" todir="${JBAS_DEPLOY}/picketlink"/>
<copy file="${localRepository}/org/picketlink/picketlink-bindings-jboss/${version}/picketlink-bindings-jboss-${version}.jar" todir="${JBAS_DEPLOY}/picketlink"/>
<copy file="${localRepository}/org/picketlink/picketlink-fed/${version}/picketlink-fed-${version}.jar" todir="${JBAS_DEPLOY}/picketlink"/>
<unzip src="${localRepository}/org/picketlink/picketlink-fed-webapps-assembly/${version}/picketlink-fed-webapps-assembly-${version}.zip"
dest="${JBAS_DEPLOY}"/>
-
<chmod file="${basedir}/target/jboss-5.1.0.GA/bin/run.sh" perm="700"/>
</target>
- <target name="start-jboss" depends="copy-picketlink-jbas" >
- <echo>Starting Local 8080 </echo>
- <exec executable="${basedir}/target/jboss-5.1.0.GA/bin/run.sh"
- osfamily="unix" spawn="true" />
- <waitfor maxwait="1" maxwaitunit="minute"
- checkevery="100" checkeveryunit="millisecond">
- <http url="http://localhost:8080" />
- </waitfor>
- <echo>:Local 8080 Started</echo>
+ <target name="start-jboss">
+ <echo>Starting Local 8080</echo>
+ <exec executable="${basedir}/target/jboss-5.1.0.GA/bin/run.sh"
+ osfamily="unix" spawn="true" />
+ <waitfor maxwait="1" maxwaitunit="minute"
+ checkevery="100" checkeveryunit="millisecond">
+ <http url="http://localhost:8080" />
+ </waitfor>
+ <echo>Local 8080 Started</echo>
</target>
- <target name="start-tomcat" depends="copy-picketlink-tomcat" >
- <echo>Starting Local 8080 </echo>
- <exec executable="${TOMCAT_DEPLOY}/../bin/startup.sh"
- osfamily="unix" spawn="true" />
- <waitfor maxwait="25" maxwaitunit="second"
- checkevery="100" checkeveryunit="millisecond">
- <http url="http://localhost:8080" />
- </waitfor>
- <echo>:Local 8080 Started</echo>
- </target>
-
<target name="stop-jboss">
- <echo>Stopping Local 8080 </echo>
+ <echo>Stopping Local 8080</echo>
<echo>Going to Kill the JBoss Process</echo>
- <exec executable="${basedir}/../common-dist/scripts/stopjboss.sh"
- osfamily="unix" />
+ <exec executable="${basedir}/../common-dist/scripts/stopjboss.sh" osfamily="unix"/>
</target>
- <target name="stop-tomcat">
- <echo>Stopping Local 8080 </echo>
- <echo>Going to stop tomcat</echo>
- <exec executable="${TOMCAT_DEPLOY}/../bin/shutdown.sh"
- osfamily="unix" />
+ <target name="install-jbws-metro">
+ <echo>Installing JBoss WS Metro Stack</echo>
+ <!-- Unzip JBoss WS Metro -->
+ <unzip src="${JBWS_METRO_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_METRO_HOME}"/>
+ <!-- Invoke the installation ant target -->
+ <exec executable="ant">
+ <arg value="-q"/>
+ <arg value="-f"/>
+ <arg value="${JBWS_METRO_HOME}/build.xml"/>
+ <arg value="deploy-jboss510"/>
+ </exec>
+ <!--ant dir="${JBWS_METRO_HOME}" target="deploy-jboss510" output="installation.out"/-->
</target>
+
+ <target name="install-jbws-cxf">
+ <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 -->
+ <exec executable="ant">
+ <arg value="-q"/>
+ <arg value="-f"/>
+ <arg value="${JBWS_CXF_HOME}/build.xml"/>
+ <arg value="deploy-jboss510"/>
+ </exec>
+ <!--ant dir="${JBWS_CXF_HOME}" target="deploy-jboss510" output="installation.out"/-->
+ </target>
</project>
Modified: integration-tests/trunk/picketlink-sts-tests/pom.xml
===================================================================
--- integration-tests/trunk/picketlink-sts-tests/pom.xml 2010-07-01 21:33:41 UTC (rev 326)
+++ integration-tests/trunk/picketlink-sts-tests/pom.xml 2010-07-05 18:36:56 UTC (rev 327)
@@ -21,70 +21,97 @@
<name>JBoss Inc.</name>
<url>http://www.jboss.org</url>
</organization>
- <properties>
- <java.endorsed.dirs>${basedir}/src/test/resources/endorsed</java.endorsed.dirs>
- <SERVICE_1_URL>http://localhost:8080/sales-post/</SERVICE_1_URL>
- <SERVICE_2_URL>http://localhost:8080/employee-post/</SERVICE_2_URL>
- <SERVICE_3_URL>http://localhost:8080/sales/</SERVICE_3_URL>
- <SERVICE_4_URL>http://localhost:8080/employee/</SERVICE_4_URL>
- </properties>
<build>
<plugins>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <phase>test</phase>
- <!-- <skipTests>true</skipTests> -->
- <printSummary>true</printSummary>
- <disableXmlReport>false</disableXmlReport>
- <testFailureIgnore>true</testFailureIgnore>
- <includes>
- <include>**/**TestCase.java</include>
- </includes>
- <forkMode>pertest</forkMode>
- <useFile>false</useFile>
- <trimStackTrace>false</trimStackTrace>
- </configuration>
- <executions>
- <execution>
- <id>surefire-it</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <phase>test</phase>
+ <includes>
+ <include>**/**TestCase.java</include>
+ </includes>
+ <forkMode>pertest</forkMode>
+ <trimStackTrace>false</trimStackTrace>
+ <reportsDirectory>${project.build.directory}/surefire-reports-native</reportsDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <id>surefire-it-metro</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ <reportsDirectory>${project.build.directory}/surefire-reports-metro</reportsDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>surefire-it-cxf</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ <reportsDirectory>${project.build.directory}/surefire-reports-cxf</reportsDirectory>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
- <execution>
- <id>phase-1</id>
- <phase>compile</phase>
- <configuration>
+ <execution>
+ <id>phase-1</id>
+ <phase>compile</phase>
+ <configuration>
<tasks>
+ <property name="version" value="${version}"/>
<property name="depclasspath" refid="maven.dependency.classpath"/>
- <property name="version" value="${version}"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
+ <ant antfile="${basedir}/ant-build.xml" target="install-jboss" />
<ant antfile="${basedir}/ant-build.xml" target="start-jboss" />
</tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>phase-2</id>
+ <phase>test</phase>
+ <configuration>
+ <tasks>
+ <ant antfile="${basedir}/ant-build.xml" target="stop-jboss" />
+ <ant antfile="${basedir}/ant-build.xml" target="install-jbws-metro"/>
+ <ant antfile="${basedir}/ant-build.xml" target="start-jboss" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>phase-3</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <ant antfile="${basedir}/ant-build.xml" target="stop-jboss" />
+ <ant antfile="${basedir}/ant-build.xml" target="install-jbws-cxf"/>
+ <ant antfile="${basedir}/ant-build.xml" target="start-jboss" />
+ </tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
- <id>phase-2</id>
- <phase>integration-test</phase>
+ <id>phase-4</id>
+ <phase>post-integration-test</phase>
<configuration>
<tasks>
- <property name="depclasspath" refid="maven.dependency.classpath"/>
- <property name="version" value="${version}"/>
- <property name="localRepository" value="${user.home}/.m2/repository"/>
<ant antfile="${basedir}/ant-build.xml" target="stop-jboss" />
</tasks>
</configuration>
More information about the picketlink-commits
mailing list