[jboss-cvs] Picketlink SVN: r1263 - in integration-tests/branches/product: ant-scripts and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Sep 26 13:29:46 EDT 2011
Author: pskopek at redhat.com
Date: 2011-09-26 13:29:45 -0400 (Mon, 26 Sep 2011)
New Revision: 1263
Added:
integration-tests/branches/product/picketlink-trust-eap5-cxf/
integration-tests/branches/product/picketlink-trust-eap5-cxf/pom.xml
integration-tests/branches/product/picketlink-trust-tests/src/test/resources/org/
integration-tests/branches/product/picketlink-trust-tests/src/test/resources/org/picketlink/
integration-tests/branches/product/picketlink-trust-tests/src/test/resources/org/picketlink/test/
integration-tests/branches/product/picketlink-trust-tests/src/test/resources/org/picketlink/test/trust/
integration-tests/branches/product/picketlink-trust-tests/src/test/resources/org/picketlink/test/trust/ws/
integration-tests/branches/product/picketlink-trust-tests/src/test/resources/org/picketlink/test/trust/ws/authorize-handlers.xml
integration-tests/branches/product/picketlink-trust-tests/src/test/resources/org/picketlink/test/trust/ws/handlers.xml
integration-tests/branches/product/picketlink-trust-tests/src/test/resources/org/picketlink/test/trust/ws/test-binary-handlers.xml
Removed:
integration-tests/branches/product/picketlink-trust-tests/src/test/resources/authorize-handlers.xml
integration-tests/branches/product/picketlink-trust-tests/src/test/resources/handlers.xml
integration-tests/branches/product/picketlink-trust-tests/src/test/resources/test-binary-handlers.xml
Modified:
integration-tests/branches/product/ant-scripts/ant-build.xml
integration-tests/branches/product/pom.xml
Log:
WS-trust CXF integration tests added.
Modified: integration-tests/branches/product/ant-scripts/ant-build.xml
===================================================================
--- integration-tests/branches/product/ant-scripts/ant-build.xml 2011-09-26 17:28:45 UTC (rev 1262)
+++ integration-tests/branches/product/ant-scripts/ant-build.xml 2011-09-26 17:29:45 UTC (rev 1263)
@@ -13,10 +13,10 @@
<property name="JBWS_CXF_HOME" location="${basedir}/target/jbossws-cxf-bin-dist/"/>
<property environment="env" />
- <property name="EAP_ZIP" value="jboss-eap-noauth-5.1.1.zip" />
- <property name="CXF_INSTALLER_ZIP" value="jboss-ep-ws-cxf-5.1.1-installer.zip" />
- <property name="EAP_URL" value="file:///opt/jboss-zips/${EAP_ZIP}" />
- <property name="CXF_INSTALLER_URL" value="file:///opt/jboss-zips/${CXF_INSTALLER_ZIP}" />
+ <property name="EAP_ZIP" value="jboss-eap-noauth-5.1.2-ER1.zip" />
+ <property name="CXF_INSTALLER_ZIP" value="jboss-ep-ws-cxf-5.1.2-ER1-installer.zip" />
+ <property name="EAP_URL" value="file:///mnt/jqa/eap/5.1.2.ER1/${EAP_ZIP}" />
+ <property name="CXF_INSTALLER_URL" value="file:///mnt/jqa/eap/5.1.2.ER1/${CXF_INSTALLER_ZIP}" />
<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 changes on: integration-tests/branches/product/picketlink-trust-eap5-cxf
___________________________________________________________________
Added: svn:ignore
+ target
.classpath
.project
.settings
Added: integration-tests/branches/product/picketlink-trust-eap5-cxf/pom.xml
===================================================================
--- integration-tests/branches/product/picketlink-trust-eap5-cxf/pom.xml (rev 0)
+++ integration-tests/branches/product/picketlink-trust-eap5-cxf/pom.xml 2011-09-26 17:29:45 UTC (rev 1263)
@@ -0,0 +1,227 @@
+<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.product</groupId>
+ <artifactId>picketlink-integration-tests-parent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../parent</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>picketlink-integration-trust-eap5-cxf</artifactId>
+ <packaging>jar</packaging>
+ <name>PicketLink Integration Tests for WS-Trust (STS) - Trust - EAP5 - WS CXF Stack</name>
+ <url>http://labs.jboss.org/portal/picketlink/</url>
+ <description>PicketLink Federation Tests to be run in a continuous integration environment such as Hudson</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <phase>test</phase>
+ <!-- <skipTests>true</skipTests> -->
+ <testClassesDirectory>${basedir}/../picketlink-trust-tests/target/test-classes</testClassesDirectory>
+ <testResourcesDirectory>${basedir}/../picketlink-trust-tests/target/test-classes</testResourcesDirectory>
+ <printSummary>true</printSummary>
+ <disableXmlReport>false</disableXmlReport>
+ <includes>
+ <include>**/ServletToWSTestCase.java</include>
+ <include>**/*XXTestCase.java</include>
+ </includes>
+ <forkMode>pertest</forkMode>
+ <argLine>-Djava.endorsed.dirs=${basedir}/target/jboss-5.1.0.GA/lib/endorsed</argLine>
+ <useFile>false</useFile>
+ <trimStackTrace>false</trimStackTrace>
+ <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
+ <classpathDependencyScopeExclude>compile</classpathDependencyScopeExclude>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${eap-home}/client/jbosssx-client.jar</additionalClasspathElement>
+ <additionalClasspathElement>${eap-home}/client/jmx-invoker-adaptor-client.jar</additionalClasspathElement>
+ <additionalClasspathElement>${eap-home}/client/jbossall-client.jar</additionalClasspathElement>
+ <additionalClasspathElement>${eap-home}/client/jbossws-common.jar</additionalClasspathElement>
+ <additionalClasspathElement>${eap-home}/common/lib/picketlink-core-${pl-version}.jar</additionalClasspathElement>
+ <additionalClasspathElement>${eap-home}/lib/endorsed/xercesImpl.jar</additionalClasspathElement>
+
+ <additionalClasspathElement>${eap-home}/client/jbossws-cxf-client.jar</additionalClasspathElement>
+
+ <additionalClasspathElement>${eap-home}/client/jbossws-spi.jar</additionalClasspathElement>
+ <additionalClasspathElement>${eap-home}/client/jbossws-common.jar</additionalClasspathElement>
+ <additionalClasspathElement>${eap-home}/client/jboss-xml-binding.jar</additionalClasspathElement>
+ <additionalClasspathElement>${eap-home}/client/mail.jar</additionalClasspathElement>
+ <additionalClasspathElement>${eap-home}/client/wsdl4j.jar</additionalClasspathElement>
+ <additionalClasspathElement>${eap-home}/client/wstx.jar</additionalClasspathElement>
+ <additionalClasspathElement>${eap-home}/common/lib/servlet-api.jar</additionalClasspathElement>
+
+ </additionalClasspathElements>
+ </configuration>
+ </plugin>
+ <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="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" />
+ <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-eap5" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>phase-2</id>
+ <phase>test</phase>
+ <configuration>
+ <tasks>
+ <property name="depclasspath" refid="maven.dependency.classpath"/>
+ <property name="version" value="${pl-version}"/>
+ <property name="localRepository" value="${user.home}/.m2/repository"/>
+ <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-eap5" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.picketlink.product</groupId>
+ <artifactId>picketlink-core</artifactId>
+ <version>${pl-version}</version>
+ <scope>compile</scope>
+ </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>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <classifier>jmx-invoker-adaptor-client</classifier>
+ <version>5.1.0.GA</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>wutka-dtdparser</groupId>
+ <artifactId>dtdparser121</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <classifier>client</classifier>
+ <version>5.1.0.GA</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ <version>1.7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.6R7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ <dependency>
+ <groupId>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <doclet>org.jboss.apiviz.APIviz</doclet>
+ <docletArtifact>
+ <groupId>org.jboss.apiviz</groupId>
+ <artifactId>apiviz</artifactId>
+ <version>1.2.5.GA</version>
+ </docletArtifact>
+ <additionalparam>
+ -charset UTF-8
+ -docencoding UTF-8
+ -version
+ -author
+ -breakiterator
+ -windowtitle "${project.name} ${project.version} API Reference"
+ -doctitle "${project.name} ${project.version} API Reference"
+ -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved."
+ -link http://java.sun.com/javase/6/docs/api/
+ -sourceclasspath ${project.build.outputDirectory}
+ </additionalparam>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Deleted: integration-tests/branches/product/picketlink-trust-tests/src/test/resources/authorize-handlers.xml
===================================================================
--- integration-tests/branches/product/picketlink-trust-tests/src/test/resources/authorize-handlers.xml 2011-09-26 17:28:45 UTC (rev 1262)
+++ integration-tests/branches/product/picketlink-trust-tests/src/test/resources/authorize-handlers.xml 2011-09-26 17:29:45 UTC (rev 1263)
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<handler-chains xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd">
-
- <handler-chain>
-
-
- <handler>
- <handler-name>WSAuthorizationHandler</handler-name>
- <handler-class>org.picketlink.trust.jbossws.handler.WSAuthorizationHandler</handler-class>
- </handler>
-
- <handler>
- <handler-name>WSAuthenticationHandler</handler-name>
- <handler-class>org.picketlink.trust.jbossws.handler.WSAuthenticationHandler</handler-class>
- </handler>
-
- <handler>
- <handler-name>SAML2Handler</handler-name>
- <handler-class>org.picketlink.trust.jbossws.handler.SAML2Handler</handler-class>
- </handler>
-
-
- </handler-chain>
-
-
-</handler-chains>
\ No newline at end of file
Deleted: integration-tests/branches/product/picketlink-trust-tests/src/test/resources/handlers.xml
===================================================================
--- integration-tests/branches/product/picketlink-trust-tests/src/test/resources/handlers.xml 2011-09-26 17:28:45 UTC (rev 1262)
+++ integration-tests/branches/product/picketlink-trust-tests/src/test/resources/handlers.xml 2011-09-26 17:29:45 UTC (rev 1263)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<handler-chains xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd">
-
-
-
- <handler-chain>
- <handler>
- <handler-name>SAML2Handler</handler-name>
- <handler-class>org.picketlink.trust.jbossws.handler.SAML2Handler</handler-class>
- </handler>
- </handler-chain>
-
-
-</handler-chains>
\ No newline at end of file
Copied: integration-tests/branches/product/picketlink-trust-tests/src/test/resources/org/picketlink/test/trust/ws/authorize-handlers.xml (from rev 1194, integration-tests/branches/product/picketlink-trust-tests/src/test/resources/authorize-handlers.xml)
===================================================================
--- integration-tests/branches/product/picketlink-trust-tests/src/test/resources/org/picketlink/test/trust/ws/authorize-handlers.xml (rev 0)
+++ integration-tests/branches/product/picketlink-trust-tests/src/test/resources/org/picketlink/test/trust/ws/authorize-handlers.xml 2011-09-26 17:29:45 UTC (rev 1263)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<handler-chains xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd">
+
+ <handler-chain>
+
+
+ <handler>
+ <handler-name>WSAuthorizationHandler</handler-name>
+ <handler-class>org.picketlink.trust.jbossws.handler.WSAuthorizationHandler</handler-class>
+ </handler>
+
+ <handler>
+ <handler-name>WSAuthenticationHandler</handler-name>
+ <handler-class>org.picketlink.trust.jbossws.handler.WSAuthenticationHandler</handler-class>
+ </handler>
+
+ <handler>
+ <handler-name>SAML2Handler</handler-name>
+ <handler-class>org.picketlink.trust.jbossws.handler.SAML2Handler</handler-class>
+ </handler>
+
+
+ </handler-chain>
+
+
+</handler-chains>
\ No newline at end of file
Copied: integration-tests/branches/product/picketlink-trust-tests/src/test/resources/org/picketlink/test/trust/ws/handlers.xml (from rev 1194, integration-tests/branches/product/picketlink-trust-tests/src/test/resources/handlers.xml)
===================================================================
--- integration-tests/branches/product/picketlink-trust-tests/src/test/resources/org/picketlink/test/trust/ws/handlers.xml (rev 0)
+++ integration-tests/branches/product/picketlink-trust-tests/src/test/resources/org/picketlink/test/trust/ws/handlers.xml 2011-09-26 17:29:45 UTC (rev 1263)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<handler-chains xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd">
+
+
+
+ <handler-chain>
+ <handler>
+ <handler-name>SAML2Handler</handler-name>
+ <handler-class>org.picketlink.trust.jbossws.handler.SAML2Handler</handler-class>
+ </handler>
+ </handler-chain>
+
+
+</handler-chains>
\ No newline at end of file
Copied: integration-tests/branches/product/picketlink-trust-tests/src/test/resources/org/picketlink/test/trust/ws/test-binary-handlers.xml (from rev 1194, integration-tests/branches/product/picketlink-trust-tests/src/test/resources/test-binary-handlers.xml)
===================================================================
--- integration-tests/branches/product/picketlink-trust-tests/src/test/resources/org/picketlink/test/trust/ws/test-binary-handlers.xml (rev 0)
+++ integration-tests/branches/product/picketlink-trust-tests/src/test/resources/org/picketlink/test/trust/ws/test-binary-handlers.xml 2011-09-26 17:29:45 UTC (rev 1263)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<handler-chains xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd">
+
+
+
+ <handler-chain>
+ <handler>
+ <handler-name>TestBinaryHandler</handler-name>
+ <handler-class>org.picketlink.test.trust.ws.handlers.TestBinaryHandler</handler-class>
+ </handler>
+ </handler-chain>
+
+
+</handler-chains>
\ No newline at end of file
Deleted: integration-tests/branches/product/picketlink-trust-tests/src/test/resources/test-binary-handlers.xml
===================================================================
--- integration-tests/branches/product/picketlink-trust-tests/src/test/resources/test-binary-handlers.xml 2011-09-26 17:28:45 UTC (rev 1262)
+++ integration-tests/branches/product/picketlink-trust-tests/src/test/resources/test-binary-handlers.xml 2011-09-26 17:29:45 UTC (rev 1263)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<handler-chains xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd">
-
-
-
- <handler-chain>
- <handler>
- <handler-name>TestBinaryHandler</handler-name>
- <handler-class>org.picketlink.test.trust.ws.handlers.TestBinaryHandler</handler-class>
- </handler>
- </handler-chain>
-
-
-</handler-chains>
\ No newline at end of file
Modified: integration-tests/branches/product/pom.xml
===================================================================
--- integration-tests/branches/product/pom.xml 2011-09-26 17:28:45 UTC (rev 1262)
+++ integration-tests/branches/product/pom.xml 2011-09-26 17:29:45 UTC (rev 1263)
@@ -27,6 +27,7 @@
<module>picketlink-trust-tests</module>
<module>picketlink-trust-eap5-native</module>
+ <module>picketlink-trust-eap5-cxf</module>
</modules>
</project>
More information about the jboss-cvs-commits
mailing list