Picketlink SVN: r1202 - integration-tests/trunk/picketlink-trust-jbas51-native.
by picketlink-commits＠lists.jboss.org
Author: pskopek(a)redhat.com
Date: 2011-09-06 14:23:23 -0400 (Tue, 06 Sep 2011)
New Revision: 1202
Modified:
integration-tests/trunk/picketlink-trust-jbas51-native/pom.xml
Log:
Fix: Missing dependency commons-httpclient caused org.picketlink.test.trust.tests.ServletToWSTestCase
Modified: integration-tests/trunk/picketlink-trust-jbas51-native/pom.xml
===================================================================
--- integration-tests/trunk/picketlink-trust-jbas51-native/pom.xml 2011-09-06 12:52:23 UTC (rev 1201)
+++ integration-tests/trunk/picketlink-trust-jbas51-native/pom.xml 2011-09-06 18:23:23 UTC (rev 1202)
@@ -177,7 +177,12 @@
<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>
12 years, 12 months
- 1
- 0
Picketlink SVN: r1201 - in integration-tests/branches/product: picketlink-saml-eap5 and 1 other directories.
by picketlink-commits＠lists.jboss.org
Author: pskopek(a)redhat.com
Date: 2011-09-06 08:52:23 -0400 (Tue, 06 Sep 2011)
New Revision: 1201
Modified:
integration-tests/branches/product/picketlink-pdp-tests/.classpath
integration-tests/branches/product/picketlink-saml-eap5/
integration-tests/branches/product/picketlink-sts-eap5-native/
Log:
update of existing .classpath files
Modified: integration-tests/branches/product/picketlink-pdp-tests/.classpath
===================================================================
--- integration-tests/branches/product/picketlink-pdp-tests/.classpath 2011-09-06 12:37:25 UTC (rev 1200)
+++ integration-tests/branches/product/picketlink-pdp-tests/.classpath 2011-09-06 12:52:23 UTC (rev 1201)
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Property changes on: integration-tests/branches/product/picketlink-saml-eap5
___________________________________________________________________
Modified: svn:ignore
- target
.settings
+ target
.settings
.externalToolBuilders
.project
Property changes on: integration-tests/branches/product/picketlink-sts-eap5-native
___________________________________________________________________
Modified: svn:ignore
- target
+ target
.classpath
.project
.settings
12 years, 12 months
- 1
- 0
Picketlink SVN: r1200 - integration-tests/branches/product.
by picketlink-commits＠lists.jboss.org
Author: pskopek(a)redhat.com
Date: 2011-09-06 08:37:25 -0400 (Tue, 06 Sep 2011)
New Revision: 1200
Removed:
integration-tests/branches/product/picketlink-saml-jbas51/
integration-tests/branches/product/picketlink-saml-jbas6/
integration-tests/branches/product/picketlink-saml-standalone/
integration-tests/branches/product/picketlink-saml-tomcat6/
integration-tests/branches/product/picketlink-sts-jbas51-cxf/
integration-tests/branches/product/picketlink-sts-jbas51-native/
integration-tests/branches/product/picketlink-sts-jbas6-cxf/
integration-tests/branches/product/picketlink-trust-jbas51-native/
Log:
delete submodules not relevant for product integration testing
12 years, 12 months
- 1
- 0
Picketlink SVN: r1199 - in integration-tests/branches/product: ant-scripts and 16 other directories.
by picketlink-commits＠lists.jboss.org
Author: pskopek(a)redhat.com
Date: 2011-09-06 08:29:57 -0400 (Tue, 06 Sep 2011)
New Revision: 1199
Added:
integration-tests/branches/product/common-dist/files/eap/
integration-tests/branches/product/common-dist/files/eap/5.1.1/
integration-tests/branches/product/common-dist/files/eap/5.1.1/war-deployers-jboss-beans.xml
integration-tests/branches/product/picketlink-saml-eap5/
integration-tests/branches/product/picketlink-saml-eap5/.classpath
integration-tests/branches/product/picketlink-saml-eap5/pom.xml
integration-tests/branches/product/picketlink-sts-eap5-cxf/
integration-tests/branches/product/picketlink-sts-eap5-cxf/.classpath
integration-tests/branches/product/picketlink-sts-eap5-cxf/.externalToolBuilders/
integration-tests/branches/product/picketlink-sts-eap5-cxf/.externalToolBuilders/org.maven.ide.eclipse.maven2Builder (3).launch
integration-tests/branches/product/picketlink-sts-eap5-cxf/.project
integration-tests/branches/product/picketlink-sts-eap5-cxf/.settings/
integration-tests/branches/product/picketlink-sts-eap5-cxf/.settings/org.eclipse.jdt.core.prefs
integration-tests/branches/product/picketlink-sts-eap5-cxf/.settings/org.eclipse.m2e.core.prefs
integration-tests/branches/product/picketlink-sts-eap5-cxf/pom.xml
integration-tests/branches/product/picketlink-sts-eap5-native/
integration-tests/branches/product/picketlink-sts-eap5-native/pom.xml
integration-tests/branches/product/picketlink-trust-eap5-native/
integration-tests/branches/product/picketlink-trust-eap5-native/.classpath
integration-tests/branches/product/picketlink-trust-eap5-native/.externalToolBuilders/
integration-tests/branches/product/picketlink-trust-eap5-native/.externalToolBuilders/org.maven.ide.eclipse.maven2Builder.launch
integration-tests/branches/product/picketlink-trust-eap5-native/.project
integration-tests/branches/product/picketlink-trust-eap5-native/.settings/
integration-tests/branches/product/picketlink-trust-eap5-native/.settings/org.eclipse.jdt.core.prefs
integration-tests/branches/product/picketlink-trust-eap5-native/.settings/org.eclipse.m2e.core.prefs
integration-tests/branches/product/picketlink-trust-eap5-native/pom.xml
Removed:
integration-tests/branches/product/picketlink-openid-tests/
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-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2PostSignatureGLOUnitTestCase.java
integration-tests/branches/product/picketlink-sts-tests/pom.xml
integration-tests/branches/product/picketlink-trust-tests/pom.xml
integration-tests/branches/product/pom.xml
Log:
basic changes to make product integration test suite working.
Modified: integration-tests/branches/product/ant-scripts/ant-build.xml
===================================================================
--- integration-tests/branches/product/ant-scripts/ant-build.xml 2011-09-05 11:24:13 UTC (rev 1198)
+++ integration-tests/branches/product/ant-scripts/ant-build.xml 2011-09-06 12:29:57 UTC (rev 1199)
@@ -2,6 +2,7 @@
<taskdef resource="net/sf/antcontrib/antlib.xml">
<classpath path="${depclasspath}"/>
</taskdef>
+
<property name="JBAS5_DEPLOY" location="${basedir}/target/jboss-5.1.0.GA/server/default/deploy/" />
<property name="JBAS5_DEPLOYER" location="${basedir}/target/jboss-5.1.0.GA/server/default/deployers/" />
<property name="JBAS6_DEPLOY" location="${basedir}/target/jboss-6.0.0.Final/server/default/deploy/" />
@@ -12,66 +13,96 @@
<property name="JBWS_CXF_HOME" location="${basedir}/target/jbossws-cxf-bin-dist/"/>
<property environment="env" />
- <target name="init-jboss5">
- <!-- Unzip JBoss AS5 -->
- <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>
+ <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="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" />
+
+ <target name="download-eap">
+ <if>
+ <available file="${DIST_DIR}/${EAP_ZIP}"/>
+ <then>
+ <echo>${EAP_ZIP} is already in place skipping download.</echo>
+ </then>
+ <else>
+ <mkdir dir="${DIST_DIR}" />
+ <get dest="${DIST_DIR}">
+ <url url="${EAP_URL}"/>
+ </get>
+ </else>
+ </if>
+
+ </target>
+
+ <target name="download-cxf">
+ <if>
+ <available file="${DIST_DIR}/${CXF_INSTALLER_ZIP}"/>
+ <then>
+ <echo>${CXF_INSTALLER_ZIP} is already in place skipping download.</echo>
+ </then>
+ <else>
+ <mkdir dir="${DIST_DIR}" />
+ <get dest="${DIST_DIR}">
+ <url url="${CXF_INSTALLER_URL}"/>
+ </get>
+ </else>
+ </if>
+ </target>
+
+ <target name="init-eap5" depends="download-eap">
+ <!-- Unzip JBoss EAP -->
+ <echo>Unzip JBOSS EAP: ${EAP_ZIP}</echo>
- <target name="init-jboss6">
- <!-- Unzip JBoss AS6 -->
- <echo>Unzip JBOSS AS 6.0.0.Final</echo>
- <unzip src="${basedir}/../common-dist/jbossas/6.0/jboss-as-distribution-6.0.0.Final.zip"
+ <unzip src="${DIST_DIR}/${EAP_ZIP}"
dest="${basedir}/target"/>
- <copy file="${basedir}/../common-dist/files/jboss-logging.xml" todir="${basedir}/target/jboss-6.0.0.Final/server/default/deploy"/>
- </target>
+
+ <chmod file="${basedir}/target/${EAP_DIR}/jboss-as/bin/run.sh" perm="775"/>
- <target name="init-tomcat6">
- <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>
+
+ <!-- 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"
+ 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"/>
- <target name="tomcat6-thirdparty-deps" depends="init-tomcat6" >
- <copy file="${localRepository}/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" todir="${TOMCAT6_LIB}"/>
+ <!-- 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"/>
+ </unzip>
+
+ <copy file="${basedir}/../picketlink-int-webapps/claims/target/claims.war" todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink/"/>
</target>
- <target name="copy-picketlink-tomcat6" depends="tomcat6-thirdparty-deps" >
- <copy file="${localRepository}/org/picketlink/picketlink-bindings/${version}/picketlink-bindings-${version}.jar" todir="${TOMCAT6_LIB}"/>
- <copy file="${localRepository}/org/picketlink/picketlink-bindings-jboss/${version}/picketlink-bindings-jboss-${version}.jar" todir="${TOMCAT6_LIB}"/>
- <copy file="${localRepository}/org/picketlink/picketlink-fed/${version}/picketlink-fed-${version}.jar" todir="${TOMCAT6_LIB}"/>
+ <target name="init-eap5-cxf" depends="init-eap5,download-cxf">
+ <!-- Unzip JBoss EAP CXF -->
+ <echo>Unzip JBOSS EAP CXF: ${CXF_INSTALLER_ZIP}</echo>
+ <unzip src="${DIST_DIR}/${CXF_INSTALLER_ZIP}"
+ dest="${basedir}/target/${EAP_DIR}/jboss-as"/>
+
+ <!-- Install CXF into EAP -->
+ <ant target="install-noauth"
+ antfile="${basedir}/target/${EAP_DIR}/jboss-as/jbossws-cxf-installer/build.xml"
+ dir="${basedir}/target/${EAP_DIR}/jboss-as/jbossws-cxf-installer"
+ />
- <copy file="${localRepository}/org/openid4java/openid4java-nodeps/0.9.5/openid4java-nodeps-0.9.5.jar" todir="${TOMCAT6_LIB}"/>
- <unzip src="${localRepository}/org/picketlink/picketlink-fed-webapps-assembly/${version}/picketlink-fed-webapps-assembly-${version}.zip"
- dest="${TOMCAT6_DEPLOY}"/>
+ </target>
- <move todir="${TOMCAT6_DEPLOY}">
- <fileset dir="${TOMCAT6_DEPLOY}/picketlink">
- <include name="**/*.war"/>
- </fileset>
- </move>
- <copy file="${basedir}/../picketlink-int-webapps/claims/target/claims.war" todir="${TOMCAT6_DEPLOY}"/>
-
- <copy file="${basedir}/../common-dist/tomcat/tomcat-users.xml"
- todir="${TOMCAT6}/conf" />
- <copy file="${basedir}/../common-dist/tomcat/log4j.xml"
- todir="${TOMCAT6}/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-standalone-tomcat6" depends="copy-picketlink-tomcat6">
- <copy file="${localRepository}/org/picketlink/idp-standalone/${version}/idp-standalone-${version}.war" todir="${TOMCAT6_DEPLOY}"/>
- <move file="${TOMCAT6_DEPLOY}/idp-standalone-${version}.war" tofile="${TOMCAT6_DEPLOY}/idp-standalone.war"/>
- <copy file="${localRepository}/org/picketlink/sales-standalone/${version}/sales-standalone-${version}.war" todir="${TOMCAT6_DEPLOY}"/>
- <move file="${TOMCAT6_DEPLOY}/sales-standalone-${version}.war" tofile="${TOMCAT6_DEPLOY}/sales-standalone.war"/>
- <copy file="${localRepository}/org/picketlink/employee-standalone/${version}/employee-standalone-${version}.war" todir="${TOMCAT6_DEPLOY}"/>
- <move file="${TOMCAT6_DEPLOY}/employee-standalone-${version}.war" tofile="${TOMCAT6_DEPLOY}/employee-standalone.war"/>
- </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"/>
@@ -104,23 +135,29 @@
<copy file="${basedir}/../picketlink-int-webapps/claims/target/claims.war" todir="${JBAS6_DEPLOY}/picketlink/"/>
</target>
- <target name="copy-sts-props-jbas5">
- <copy file="${basedir}/../picketlink-sts-tests/src/test/resources/sts-config.properties" todir="${JBAS5_DEPLOY}/../conf/"/>
+ <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/"/>
</target>
- <target name="copy-sts-props-jbas6">
- <copy file="${basedir}/../picketlink-sts-tests/src/test/resources/sts-config.properties" todir="${JBAS6_DEPLOY}/../conf/"/>
- </target>
- <target name="copy-trust-settings-jbas5">
- <copy file="${basedir}/../picketlink-trust-tests/src/test/resources/domains/sts-jboss-beans.xml" todir="${JBAS5_DEPLOY}/picketlink" />
- <copy file="${basedir}/../picketlink-trust-tests/target/picketlink-wstest-tests.jar" todir="${JBAS5_DEPLOY}/picketlink" />
- <copy file="${basedir}/../picketlink-trust-tests/target/pojo-test.war" todir="${JBAS5_DEPLOY}/picketlink" />
- <copy file="${basedir}/../picketlink-trust-tests/target/binary-test.war" todir="${JBAS5_DEPLOY}/picketlink" />
- <copy file="${basedir}/../picketlink-trust-tests/src/test/resources/props/sts-users.properties" todir="${JBAS5_DEPLOY}/../conf" />
- <copy file="${basedir}/../picketlink-trust-tests/src/test/resources/props/sts-roles.properties" todir="${JBAS5_DEPLOY}/../conf" />
- <copy file="${localRepository}/org/picketlink/picketlink-trust-jbossws/${version}/picketlink-trust-jbossws-${version}.jar" todir="${JBAS5_DEPLOY}/picketlink"/>
- <copy file="${basedir}/../common-dist/files/war-deployers-jboss-beans.xml" todir="${JBAS5_DEPLOYER}/jbossweb.deployer/META-INF" />
+ <target name="copy-trust-settings-eap5">
+ <copy file="${basedir}/../picketlink-trust-tests/src/test/resources/domains/sts-jboss-beans.xml"
+ todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink" />
+ <copy file="${basedir}/../picketlink-trust-tests/target/picketlink-wstest-tests.jar"
+ todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink" />
+ <copy file="${basedir}/../picketlink-trust-tests/target/pojo-test.war"
+ todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink" />
+ <copy file="${basedir}/../picketlink-trust-tests/target/binary-test.war"
+ todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink" />
+ <copy file="${basedir}/../picketlink-trust-tests/src/test/resources/props/sts-users.properties"
+ 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="${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>
<target name="start-jboss" depends="stop-jboss">
@@ -134,9 +171,9 @@
<echo>:Local 8080 Started</echo>
</target>
- <target name="start-jboss5" depends="copy-picketlink-jbas5" >
+ <target name="start-eap5" >
<antcall target="start-jboss">
- <param name="jbossas" value="${basedir}/target/jboss-5.1.0.GA"/>
+ <param name="jbossas" value="${basedir}/target/${EAP_DIR}/jboss-as"/>
</antcall>
<!--
<echo>Starting Local 8080 </echo>
@@ -156,19 +193,6 @@
</antcall>
</target>
- <target name="start-tomcat6" depends="copy-picketlink-tomcat6,stop-tomcat6" >
- <echo>Starting Local 8080 </echo>
- <exec executable="${TOMCAT6_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="start-tomcat6-standalone" depends="copy-standalone-tomcat6,start-tomcat6"/>
-
<target name="stop-jboss">
<echo>Stopping Local 8080 </echo>
<echo>Going to Kill the JBoss Process</echo>
@@ -176,7 +200,7 @@
osfamily="unix" />
</target>
- <target name="stop-jboss5">
+ <target name="stop-eap5">
<antcall target="stop-jboss"/>
</target>
@@ -184,13 +208,6 @@
<antcall target="stop-jboss"/>
</target>
- <target name="stop-tomcat6">
- <echo>Stopping Local 8080 </echo>
- <echo>Going to stop tomcat</echo>
- <exec executable="${TOMCAT6_DEPLOY}/../bin/shutdown.sh"
- osfamily="unix" />
- </target>
-
<target name="install-jbws-cxf-jbas5">
<echo>Installing JBoss WS CXF Stack</echo>
<!-- Unzip JBoss WS CXF -->
Added: integration-tests/branches/product/common-dist/files/eap/5.1.1/war-deployers-jboss-beans.xml
===================================================================
--- integration-tests/branches/product/common-dist/files/eap/5.1.1/war-deployers-jboss-beans.xml (rev 0)
+++ integration-tests/branches/product/common-dist/files/eap/5.1.1/war-deployers-jboss-beans.xml 2011-09-06 12:29:57 UTC (rev 1199)
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Web application deployers
+$Id: war-deployers-jboss-beans.xml 111247 2011-04-26 08:34:28Z jaikiran $
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- WAR Structure -->
+ <bean name="WARStructure" class="org.jboss.web.deployers.WARStructure">
+ <property name="webInfLibFilter">
+ <!-- We accept all .jar files in WEB-INF/lib -->
+ <bean name="WebInfLibFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixMatchFilter">
+ <constructor><parameter class="java.lang.String">.jar</parameter></constructor>
+ </bean>
+ </property>
+ <property name="includeWebInfInClasspath">true</property>
+ <property name="contextInfoOrder">1000</property>
+ </bean>
+
+ <!-- web.xml parsing deployer -->
+ <bean name="WebAppParsingDeployer" class="org.jboss.deployment.WebAppParsingDeployer">
+ <property name="relativeOrder">2000</property>
+ </bean>
+ <bean name="JBossWebAppParsingDeployer" class="org.jboss.deployment.JBossWebAppParsingDeployer">
+ <property name="relativeOrder">2001</property>
+ </bean>
+
+ <!--
+ Checks for the presence of JSF managed beans in WEB-INF/faces-config.xml and META-INF/faces-config.xml files
+ See https://issues.jboss.org/browse/JBAS-8318 for more details
+ -->
+ <bean name="FacesConfigParsingDeployer" class="org.jboss.web.deployers.FacesConfigParsingDeployer"/>
+
+ <!--
+ Checks for the presence of JSF managed beans in the files specified as context param values of
+ javax.faces.CONFIG_FILES context param of a web application.
+ See https://issues.jboss.org/browse/JBAS-8318 for more details
+ -->
+ <bean name="WebContextParamFacesConfigParsingDeployer" class="org.jboss.web.deployers.WebContextParamFacesConfigParsingDeployer"/>
+
+ <!-- See JBAS-6062 -->
+ <bean name="WebXmlLessDeployer" class="org.jboss.deployment.LegacyWebXmlLessDeployer"/>
+
+ <!-- Allow for war local class loaders: in testing -->
+ <bean name="WarClassLoaderDeployer" class="org.jboss.web.tomcat.service.deployers.WarClassLoaderDeployer">
+ <property name="relativeOrder">-1</property>
+ <property name="filteredPackages">javax.servlet,org.apache.commons.logging</property>
+ </bean>
+
+ <!--
+ Injects default clustering metadata.
+ TODO. A better approach is to use a jboss-web.xml equivalent to conf/web.xml
+ and conf/standardjboss.xml as the source for defaults.
+ -->
+ <bean name="WebAppClusteringDefaultsDeployer"
+ class="org.jboss.web.tomcat.service.deployers.ClusteringDefaultsDeployer">
+
+ <!-- Default session cache config used by distributable webapps -->
+ <property name="cacheName">standard-session-cache</property>
+ <!-- Default session cache config used by FIELD granularity distributable webapps -->
+ <property name="fieldGranularityCacheName">field-granularity-session-cache</property>
+
+ <!--
+ The following two properties define when sessions are replicated to
+ the other nodes.
+ The default value, "instant", uses the request thread to replicate changes
+ to the other nodes at the end of requests. In this case, the
+ "SnapshotInterval" property is not used.
+ The "interval" mode uses a background thread that periodically checks for
+ modified sessions and replicates them. The "SnapshotInterval"
+ property controls how often (in milliseconds) the background thread
+ should run.
+
+ Note that this property is not in effect if the replication-granularity
+ is set to FIELD. If it is FIELD, it will be per http request (that is,
+ "instant" mode.)
+ -->
+ <property name="snapshotMode">INSTANT</property>
+ <property name="snapshotInterval">1000</property>
+
+ <property name="replicationGranularity">SESSION</property>
+ <property name="replicationTrigger">SET_AND_NON_PRIMITIVE_GET</property>
+ <property name="replicationFieldBatchMode">true</property>
+
+ <!--
+ Whether by default to add special session handling to coordinate use
+ with mod_jk or other JK connector variants.
+ If a JK connector is used, you will need to set the JvmRoute inside
+ JBossWeb, e.g. configure,
+ Engine name="jboss.web" jvmRoute="Node1" defaultHost="localhost"
+ in server.xml.
+
+ This value can be configured per webapp in the webapp's jboss.xml.
+
+ If not set, the default will be to add the special session handling
+ if a jvmRoute is configured on the Engine. So, generally the only reason
+ to configure this overall default is to set it to 'false' and thus force
+ per webapp configuration.
+ -->
+ <!--
+ <property name="useJK">false</property>
+
+ <property name="useSessionPassivation">false</property>
+ <property name="passivationMaxIdleTime">-1</property>
+ <property name="passivationMinIdleTime">-1</property>
+ -->
+
+ <!--
+ Determines the maximum interval between requests, in seconds, after
+ which a request will trigger replication of the session's timestamp
+ regardless of whether the request has otherwise made the session dirty.
+ Such replication ensures that other nodes in the cluster are aware of
+ the most recent value for the session's timestamp and won't incorrectly
+ expire an unreplicated session upon failover. It also results in correct
+ values for HttpSession.getLastAccessedTime() calls following failover.
+
+ The cost of timestamp replication is considerably lower in JBoss AS 5
+ than it is in earlier versions since replicating a timestamp does not
+ necessitate replicating any other data.
+
+ A value of 0 means the metadata will be replicated whenever the session is
+ accessed. A value of -1 means the metadata will be replicated only if some
+ other activity during the request (e.g. modifying an attribute) has
+ resulted in other replication work involving the session. A positive value
+ greater than the HttpSession.getMaxInactiveInterval() value will be treated
+ as a likely misconfiguration and converted to 0; i.e. replicate the
+ metadata on every request.
+ -->
+ <property name="maxUnreplicatedInterval">60</property>
+
+ </bean>
+
+ <!-- The WebMetaData to service mbean deployer -->
+ <bean name="WarDeployer" class="org.jboss.web.tomcat.service.deployers.TomcatDeployer">
+ <install bean="ManagedDeploymentCreator" method="addAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.web.jboss.JBossWebMetaData</value>
+ </parameter>
+ <parameter>
+ <value>war</value>
+ </parameter>
+ </install>
+ <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.web.jboss.JBossWebMetaData</value>
+ </parameter>
+ </uninstall>
+
+ <!-- Inject the MainDeployer for resolving cross deployment refs -->
+ <property name="mainDeployer"><inject bean="MainDeployer" /></property>
+
+ <property name="relativeOrder">2003</property>
+
+ <!-- FIXME Get this moved to TomcatService in deploy -->
+ <property name="configFile">
+ <value-factory bean="ServiceBindingManager" method="getResourceBinding">
+ <parameter>jboss.web:service=WebServer</parameter>
+ <parameter>${jboss.server.home.url}${/}deploy${/}jbossweb.sar${/}server.xml</parameter>
+ </value-factory>
+ </property>
+
+ <!-- You can configure a set of authenticators keyed by http-auth method
+ used. This will apply the same set of authenticators across all web
+ applications. You can override the set of authenticators at the web
+ application level by adding <authenticators> element to the respective
+ jboss-web.xml
+ -->
+ <property name="authenticators">
+ <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry>
+ <key>BASIC</key>
+ <value>org.apache.catalina.authenticator.BasicAuthenticator</value>
+ </entry>
+ <entry>
+ <key>CLIENT-CERT</key>
+ <value>org.apache.catalina.authenticator.SSLAuthenticator</value>
+ </entry>
+ <entry>
+ <key>DIGEST</key>
+ <value>org.apache.catalina.authenticator.DigestAuthenticator</value>
+ </entry>
+ <entry>
+ <key>FORM</key>
+ <value>org.apache.catalina.authenticator.FormAuthenticator</value>
+ </entry>
+ <entry>
+ <key>NONE</key>
+ <value>org.apache.catalina.authenticator.NonLoginAuthenticator</value>
+ </entry>
+ <entry>
+ <key>SECURITY_DOMAIN</key>
+ <value>org.picketlink.identity.federation.bindings.tomcat.PicketLinkAuthenticator</value>
+ </entry>
+ </map>
+ </property>
+
+ <!-- The JAAS security domain to use in the absense of an explicit
+ security-domain specification in the war WEB-INF/jboss-web.xml
+ -->
+ <property name="defaultSecurityDomain">java:/jaas/jboss-web-policy</property>
+
+ <!-- Get the flag indicating if the normal Java2 parent first class
+ loading model should be used over the servlet 2.3 web container first
+ model.
+ -->
+ <property name="java2ClassLoadingCompliance">false</property>
+
+ <!-- This is NO LONGER supported this way and it will be completely removed for 6.x.
+ See JBAS-6914 for how you can achieve the same in 5.x with new MC JBossCL layer.
+
+ A flag indicating if the JBoss Loader should be used. This loader
+ uses a unified class loader as the class loader rather than the tomcat
+ specific class loader.
+ The default is false to ensure that wars have isolated class loading
+ for duplicate jars and jsp files.
+ <property name="useJBossWebLoader">false</property>
+ -->
+
+ <!-- The list of package prefixes that should not be loaded without
+ delegating to the parent class loader before trying the web app
+ class loader. The packages listed here are those tha are used by
+ the web container implementation and cannot be overriden. The format
+ is a comma separated list of the package names. There cannot be any
+ whitespace between the package prefixes.
+ This setting only applies when UseJBossWebLoader=false.
+ -->
+ <property name="filteredPackages">javax.servlet,org.apache.commons.logging</property>
+
+ <property name="lenientEjbLink">true</property>
+
+ <!--Flag to delete the Work Dir on Context Destroy -->
+ <property name="deleteWorkDirOnContextDestroy">false</property>
+
+ <!--
+ Class of the session manager (used if context is marked as 'distributable'. Currently allowed values:
+ - org.jboss.web.tomcat.service.session.JBossCacheManager
+ -->
+ <property name="managerClass">org.jboss.web.tomcat.service.session.JBossCacheManager</property>
+
+ <!-- The name of the request property under with the authenticated JAAS
+ Subject is stored on successful authentication. If null or empty then
+ the Subject will not be stored.
+ -->
+ <!--
+ <property name="subjectAttributeName">j_subject</property>
+ -->
+
+ <!-- The SessionIdAlphabet is the set of characters used to create a session Id
+ It must be made up of exactly 65 unique characters
+ <property name="sessionIdAlphabet">ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-_</property>
+ -->
+
+ <property name="domain">jboss.web</property>
+ <!-- Specify a Bean for JBoss Security PolicyRegistration -->
+ <property name="policyRegistrationName">JBossSecurityPolicyRegistration</property>
+
+ <!-- Specify a SecurityManagement Wrapper -->
+ <property name="securityManagementName">JNDIBasedSecurityManagement</property>
+
+ <!-- Specify a SecurityContext FQN class name -->
+ <property name="securityContextClassName">org.jboss.security.plugins.JBossSecurityContext</property>
+ </bean>
+
+ <bean name="MergedJBossWebMetaDataDeployer"
+ class="org.jboss.web.deployers.MergedJBossWebMetaDataDeployer">
+ </bean>
+
+</deployment>
Modified: integration-tests/branches/product/parent/pom.xml
===================================================================
--- integration-tests/branches/product/parent/pom.xml 2011-09-05 11:24:13 UTC (rev 1198)
+++ integration-tests/branches/product/parent/pom.xml 2011-09-06 12:29:57 UTC (rev 1199)
@@ -9,7 +9,7 @@
<artifactId>picketlink-integration-tests-parent</artifactId>
<packaging>pom</packaging>
<version>2.0.0-SNAPSHOT</version>
- <name>PicketLink Integration Tests- Parent</name>
+ <name>PicketLink Integration Tests - Parent</name>
<url>http://labs.jboss.org/portal/picketlink/</url>
<description>PicketLink is a cross-cutting project that handles identity needs for the JEMS projects</description>
<licenses>
@@ -28,7 +28,10 @@
</scm>
<properties>
- <pl-version>2.0.0.final</pl-version>
+ <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>
+ <maven.compiler.target>1.6</maven.compiler.target>
</properties>
@@ -96,6 +99,16 @@
</pluginManagement>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.9</version>
+ </plugin>
+ </plugins>
+ </reporting>
+
<repositories>
<repository>
<id>jboss-public-repository-group</id>
Modified: integration-tests/branches/product/picketlink-pdp-tests/pom.xml
===================================================================
--- integration-tests/branches/product/picketlink-pdp-tests/pom.xml 2011-09-05 11:24:13 UTC (rev 1198)
+++ integration-tests/branches/product/picketlink-pdp-tests/pom.xml 2011-09-06 12:29:57 UTC (rev 1199)
@@ -10,7 +10,7 @@
<packaging>jar</packaging>
<name>PicketLink Integration Tests for PDP</name>
<url>http://labs.jboss.org/portal/picketlink/</url>
- <description>PicketLink Federation Tests to be run in a continous integration environment such as Hudson</description>
+ <description>PicketLink Federation Tests to be run in a continuous integration environment such as Hudson</description>
<licenses>
<license>
<name>lgpl</name>
@@ -44,11 +44,12 @@
<phase>compile</phase>
<configuration>
<tasks>
+ <property name="depclasspath" refid="maven.dependency.classpath"/>
<property name="version" value="${pl-version}"/>
- <property name="depclasspath" refid="maven.dependency.classpath"/>
+ <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-build.xml" target="install-jboss" />
- <ant antfile="${basedir}/ant-build.xml" target="start-jboss" />
+ <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-eap5" />
+ <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-eap5" />
</tasks>
</configuration>
<goals>
@@ -60,7 +61,10 @@
<phase>test</phase>
<configuration>
<tasks>
- <ant antfile="${basedir}/ant-build.xml" target="stop-jboss" />
+ <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>
@@ -80,10 +84,10 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.picketlink</groupId>
- <artifactId>picketlink-fed</artifactId>
- <version>${pl-version}</version>
- <scope>test</scope>
+ <groupId>org.picketlink.product</groupId>
+ <artifactId>picketlink-core</artifactId>
+ <version>${pl-version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
Property changes on: integration-tests/branches/product/picketlink-saml-eap5
___________________________________________________________________
Added: svn:ignore
+ target
.settings
Added: integration-tests/branches/product/picketlink-saml-eap5/.classpath
===================================================================
--- integration-tests/branches/product/picketlink-saml-eap5/.classpath (rev 0)
+++ integration-tests/branches/product/picketlink-saml-eap5/.classpath 2011-09-06 12:29:57 UTC (rev 1199)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: integration-tests/branches/product/picketlink-saml-eap5/pom.xml
===================================================================
--- integration-tests/branches/product/picketlink-saml-eap5/pom.xml (rev 0)
+++ integration-tests/branches/product/picketlink-saml-eap5/pom.xml 2011-09-06 12:29:57 UTC (rev 1199)
@@ -0,0 +1,172 @@
+<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>
+ <artifactId>picketlink-integration-tests-parent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../parent</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>picketlink-integration-saml-tests-EAP5</artifactId>
+ <packaging>jar</packaging>
+ <name>PicketLink Integration Tests for SAML - EAP 5.1</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>
+ <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> -->
+ <testClassesDirectory>${basedir}/../picketlink-saml-tests/target/test-classes</testClassesDirectory>
+ <printSummary>true</printSummary>
+ <disableXmlReport>false</disableXmlReport>
+ <excludes>
+ <exclude>**/Standalone**TestCase.java</exclude>
+ </excludes>
+ <includes>
+ <include>**/**TestCase.java</include>
+ </includes>
+ <forkMode>pertest</forkMode>
+ <argLine>-Djava.endorsed.dirs=${basedir}/../picketlink-saml-tests/src/test/resources/endorsed</argLine>
+ <useFile>false</useFile>
+ <trimStackTrace>false</trimStackTrace>
+ </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" />
+ <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>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>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink.product</groupId>
+ <artifactId>picketlink-core</artifactId>
+ <version>${pl-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-fed-webapps-assembly</artifactId>
+ <version>${pl-fed-webapps-assembly-version}</version>
+ <type>zip</type>
+ <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>
Modified: integration-tests/branches/product/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2PostSignatureGLOUnitTestCase.java
===================================================================
--- integration-tests/branches/product/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2PostSignatureGLOUnitTestCase.java 2011-09-05 11:24:13 UTC (rev 1198)
+++ integration-tests/branches/product/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2PostSignatureGLOUnitTestCase.java 2011-09-06 12:29:57 UTC (rev 1199)
@@ -28,8 +28,8 @@
*/
public class SAML2PostSignatureGLOUnitTestCase extends SAML2PostBindingGlobalLogOutUnitTestCase
{
- String SERVICE_5_URL = System.getProperty( "SERVICE_3_URL", "http://localhost:8080/sales-post-sig/" );
- String SERVICE_6_URL = System.getProperty( "SERVICE_4_URL", "http://localhost:8080/employee-post-sig/" );
+ String SERVICE_5_URL = System.getProperty( "SERVICE_5_URL", "http://localhost:8080/sales-post-sig/" );
+ String SERVICE_6_URL = System.getProperty( "SERVICE_6_URL", "http://localhost:8080/employee-post-sig/" );
@Override
public String getService1URL()
{
Property changes on: integration-tests/branches/product/picketlink-sts-eap5-cxf
___________________________________________________________________
Added: svn:ignore
+ target
Added: integration-tests/branches/product/picketlink-sts-eap5-cxf/.classpath
===================================================================
--- integration-tests/branches/product/picketlink-sts-eap5-cxf/.classpath (rev 0)
+++ integration-tests/branches/product/picketlink-sts-eap5-cxf/.classpath 2011-09-06 12:29:57 UTC (rev 1199)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: integration-tests/branches/product/picketlink-sts-eap5-cxf/.externalToolBuilders/org.maven.ide.eclipse.maven2Builder (3).launch
===================================================================
--- integration-tests/branches/product/picketlink-sts-eap5-cxf/.externalToolBuilders/org.maven.ide.eclipse.maven2Builder (3).launch (rev 0)
+++ integration-tests/branches/product/picketlink-sts-eap5-cxf/.externalToolBuilders/org.maven.ide.eclipse.maven2Builder (3).launch 2011-09-06 12:29:57 UTC (rev 1199)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.maven.ide.eclipse.maven2Builder"/>
+<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>
Added: integration-tests/branches/product/picketlink-sts-eap5-cxf/.project
===================================================================
--- integration-tests/branches/product/picketlink-sts-eap5-cxf/.project (rev 0)
+++ integration-tests/branches/product/picketlink-sts-eap5-cxf/.project 2011-09-06 12:29:57 UTC (rev 1199)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>picketlink-integration-sts-eap5-cxf</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: integration-tests/branches/product/picketlink-sts-eap5-cxf/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- integration-tests/branches/product/picketlink-sts-eap5-cxf/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ integration-tests/branches/product/picketlink-sts-eap5-cxf/.settings/org.eclipse.jdt.core.prefs 2011-09-06 12:29:57 UTC (rev 1199)
@@ -0,0 +1,6 @@
+#Tue Aug 30 08:24:27 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
Added: integration-tests/branches/product/picketlink-sts-eap5-cxf/.settings/org.eclipse.m2e.core.prefs
===================================================================
--- integration-tests/branches/product/picketlink-sts-eap5-cxf/.settings/org.eclipse.m2e.core.prefs (rev 0)
+++ integration-tests/branches/product/picketlink-sts-eap5-cxf/.settings/org.eclipse.m2e.core.prefs 2011-09-06 12:29:57 UTC (rev 1199)
@@ -0,0 +1,5 @@
+#Thu Aug 25 13:56:05 CEST 2011
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
Added: integration-tests/branches/product/picketlink-sts-eap5-cxf/pom.xml
===================================================================
--- integration-tests/branches/product/picketlink-sts-eap5-cxf/pom.xml (rev 0)
+++ integration-tests/branches/product/picketlink-sts-eap5-cxf/pom.xml 2011-09-06 12:29:57 UTC (rev 1199)
@@ -0,0 +1,210 @@
+<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>
+ <artifactId>picketlink-integration-tests-parent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../parent</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>picketlink-integration-sts-eap5-cxf</artifactId>
+ <packaging>jar</packaging>
+ <name>PicketLink Integration Tests for WS-Trust (STS) - EAP5 - 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>
+ <version>2.4.3</version>
+ <configuration>
+ <phase>test</phase>
+ <!-- <skipTests>true</skipTests> -->
+ <testClassesDirectory>${basedir}/../picketlink-sts-tests/target/test-classes</testClassesDirectory>
+ <printSummary>true</printSummary>
+ <disableXmlReport>false</disableXmlReport>
+ <includes>
+ <include>**/**TestCase.java</include>
+ </includes>
+ <forkMode>pertest</forkMode>
+ <argLine>-Djava.endorsed.dirs=${basedir}/../picketlink-sts-tests/src/test/resources/endorsed</argLine>
+ <useFile>false</useFile>
+ <trimStackTrace>false</trimStackTrace>
+ <reportsDirectory>${project.build.directory}/surefire-reports-cxf</reportsDirectory>
+ </configuration>
+ </plugin>
+<!--
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <phase>test</phase>
+ <testClassesDirectory>${baseDir}/../picketlink-sts-tests/target/test-classes</testClassesDirectory>
+ <testResourcesDirectory>${baseDir}/../picketlink-sts-tests/src/test/resources</testResourcesDirectory>
+ <includes>
+ <include>**/**TestCase.java</include>
+ </includes>
+ <forkMode>pertest</forkMode>
+ <trimStackTrace>false</trimStackTrace>
+ <reportsDirectory>${project.build.directory}/surefire-reports-native</reportsDirectory>
+ </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="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>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx-client</artifactId>
+ <version>2.0.4.SP6</version>
+ <scope>test</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>test</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>test</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>
+ <version>1.9.12</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b2</version>
+ </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>
Property changes on: integration-tests/branches/product/picketlink-sts-eap5-native
___________________________________________________________________
Added: svn:ignore
+ target
Added: integration-tests/branches/product/picketlink-sts-eap5-native/pom.xml
===================================================================
--- integration-tests/branches/product/picketlink-sts-eap5-native/pom.xml (rev 0)
+++ integration-tests/branches/product/picketlink-sts-eap5-native/pom.xml 2011-09-06 12:29:57 UTC (rev 1199)
@@ -0,0 +1,211 @@
+<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>
+ <artifactId>picketlink-integration-tests-parent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../parent</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>picketlink-integration-sts-eap5-native</artifactId>
+ <packaging>jar</packaging>
+ <name>PicketLink Integration Tests for WS-Trust (STS) - EAP 5.x - WS Native 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>
+ <version>2.4.3</version>
+ <configuration>
+ <phase>test</phase>
+ <!-- <skipTests>true</skipTests> -->
+ <testClassesDirectory>${basedir}/../picketlink-sts-tests/target/test-classes</testClassesDirectory>
+ <testResourcesDirectory>${basedir}/../picketlink-sts-tests/target/test-classes</testResourcesDirectory>
+ <printSummary>true</printSummary>
+ <disableXmlReport>false</disableXmlReport>
+ <includes>
+ <include>**/**TestCase.java</include>
+ </includes>
+ <forkMode>pertest</forkMode>
+ <argLine>-Djava.endorsed.dirs=${basedir}/../picketlink-sts-tests/src/test/resources/endorsed</argLine>
+ <useFile>false</useFile>
+ <trimStackTrace>false</trimStackTrace>
+ <reportsDirectory>${project.build.directory}/surefire-reports-native</reportsDirectory>
+ </configuration>
+ </plugin>
+<!--
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <phase>test</phase>
+ <testClassesDirectory>${baseDir}/../picketlink-sts-tests/target/test-classes</testClassesDirectory>
+ <testResourcesDirectory>${baseDir}/../picketlink-sts-tests/src/test/resources</testResourcesDirectory>
+ <includes>
+ <include>**/**TestCase.java</include>
+ </includes>
+ <forkMode>pertest</forkMode>
+ <trimStackTrace>false</trimStackTrace>
+ <reportsDirectory>${project.build.directory}/surefire-reports-native</reportsDirectory>
+ </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" />
+ <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="copy-sts-props-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>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx-client</artifactId>
+ <version>2.0.4.SP6</version>
+ <scope>test</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>test</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>test</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>
+ <version>1.9.12</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b2</version>
+ </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>
Modified: integration-tests/branches/product/picketlink-sts-tests/pom.xml
===================================================================
--- integration-tests/branches/product/picketlink-sts-tests/pom.xml 2011-09-05 11:24:13 UTC (rev 1198)
+++ integration-tests/branches/product/picketlink-sts-tests/pom.xml 2011-09-06 12:29:57 UTC (rev 1199)
@@ -47,10 +47,10 @@
<dependencies>
<dependency>
- <groupId>org.picketlink</groupId>
- <artifactId>picketlink-fed</artifactId>
- <version>${pl-version}</version>
- <scope>test</scope>
+ <groupId>org.picketlink.product</groupId>
+ <artifactId>picketlink-core</artifactId>
+ <version>${pl-version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.security</groupId>
Property changes on: integration-tests/branches/product/picketlink-trust-eap5-native
___________________________________________________________________
Added: svn:ignore
+ target
Added: integration-tests/branches/product/picketlink-trust-eap5-native/.classpath
===================================================================
--- integration-tests/branches/product/picketlink-trust-eap5-native/.classpath (rev 0)
+++ integration-tests/branches/product/picketlink-trust-eap5-native/.classpath 2011-09-06 12:29:57 UTC (rev 1199)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: integration-tests/branches/product/picketlink-trust-eap5-native/.externalToolBuilders/org.maven.ide.eclipse.maven2Builder.launch
===================================================================
--- integration-tests/branches/product/picketlink-trust-eap5-native/.externalToolBuilders/org.maven.ide.eclipse.maven2Builder.launch (rev 0)
+++ integration-tests/branches/product/picketlink-trust-eap5-native/.externalToolBuilders/org.maven.ide.eclipse.maven2Builder.launch 2011-09-06 12:29:57 UTC (rev 1199)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.maven.ide.eclipse.maven2Builder"/>
+<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>
Added: integration-tests/branches/product/picketlink-trust-eap5-native/.project
===================================================================
--- integration-tests/branches/product/picketlink-trust-eap5-native/.project (rev 0)
+++ integration-tests/branches/product/picketlink-trust-eap5-native/.project 2011-09-06 12:29:57 UTC (rev 1199)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>picketlink-integration-trust-eap5-native</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: integration-tests/branches/product/picketlink-trust-eap5-native/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- integration-tests/branches/product/picketlink-trust-eap5-native/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ integration-tests/branches/product/picketlink-trust-eap5-native/.settings/org.eclipse.jdt.core.prefs 2011-09-06 12:29:57 UTC (rev 1199)
@@ -0,0 +1,6 @@
+#Mon Sep 05 19:03:28 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
Added: integration-tests/branches/product/picketlink-trust-eap5-native/.settings/org.eclipse.m2e.core.prefs
===================================================================
--- integration-tests/branches/product/picketlink-trust-eap5-native/.settings/org.eclipse.m2e.core.prefs (rev 0)
+++ integration-tests/branches/product/picketlink-trust-eap5-native/.settings/org.eclipse.m2e.core.prefs 2011-09-06 12:29:57 UTC (rev 1199)
@@ -0,0 +1,5 @@
+#Mon Sep 05 19:03:27 CEST 2011
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
Added: integration-tests/branches/product/picketlink-trust-eap5-native/pom.xml
===================================================================
--- integration-tests/branches/product/picketlink-trust-eap5-native/pom.xml (rev 0)
+++ integration-tests/branches/product/picketlink-trust-eap5-native/pom.xml 2011-09-06 12:29:57 UTC (rev 1199)
@@ -0,0 +1,221 @@
+<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>
+ <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-jbas51-native</artifactId>
+ <packaging>jar</packaging>
+ <name>PicketLink Integration Tests for WS-Trust (STS) - Trust - EAP5 - WS Native 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>
+ <version>2.5</version>
+ <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>**/**TestCase.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-native</reportsDirectory>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${basedir}/target/jboss-5.1.0.GA/client/jbossall-client.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/jboss-5.1.0.GA/client/jbossws-native-core.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/jboss-5.1.0.GA/client/jbossws-native-client.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/jboss-5.1.0.GA/client/jbossws-spi.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/jboss-5.1.0.GA/client/jbossws-native-jaxrpc.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/jboss-5.1.0.GA/client/jbossws-common.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/jboss-5.1.0.GA/client/jboss-xml-binding.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/jboss-5.1.0.GA/client/mail.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/jboss-5.1.0.GA/client/wsdl4j.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/jboss-5.1.0.GA/client/wstx.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/jboss-5.1.0.GA/client/policy.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" />
+ <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>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-trust-jbossws</artifactId>
+ <version>${pl-trust-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx-client</artifactId>
+ <version>2.0.4.SP6</version>
+ <scope>test</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>test</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>test</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>
+ <version>1.9.12</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ <scope>test</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>
Modified: integration-tests/branches/product/picketlink-trust-tests/pom.xml
===================================================================
--- integration-tests/branches/product/picketlink-trust-tests/pom.xml 2011-09-05 11:24:13 UTC (rev 1198)
+++ integration-tests/branches/product/picketlink-trust-tests/pom.xml 2011-09-06 12:29:57 UTC (rev 1199)
@@ -145,16 +145,10 @@
<dependencies>
<dependency>
- <groupId>org.picketlink</groupId>
- <artifactId>picketlink-fed</artifactId>
+ <groupId>org.picketlink.product</groupId>
+ <artifactId>picketlink-core</artifactId>
<version>${pl-version}</version>
<scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.picketlink</groupId>
- <artifactId>picketlink-trust-jbossws</artifactId>
- <version>${pl-version}</version>
- <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.jboss.spec.javax.servlet</groupId>
@@ -163,6 +157,12 @@
</exclusions>
</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>
@@ -187,7 +187,7 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-server</artifactId>
<classifier>jmx-invoker-adaptor-client</classifier>
@@ -203,7 +203,7 @@
<artifactId>dtdparser121</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency -->
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-server</artifactId>
@@ -251,10 +251,10 @@
<version>1.0b2</version>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
<version>3.1</version>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
Modified: integration-tests/branches/product/pom.xml
===================================================================
--- integration-tests/branches/product/pom.xml 2011-09-05 11:24:13 UTC (rev 1198)
+++ integration-tests/branches/product/pom.xml 2011-09-06 12:29:57 UTC (rev 1199)
@@ -6,29 +6,27 @@
<relativePath>parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.picketlink</groupId>
<artifactId>picketlink-integration-tests-pom</artifactId>
<packaging>pom</packaging>
- <name>PicketLink Integration Tests- Aggregator</name>
+ <name>PicketLink Integration Tests - Aggregator</name>
<url>http://jboss.org/picketlink/</url>
<description>PicketLink is the identity project for Java projects</description>
<modules>
<module>parent</module>
<module>picketlink-int-webapps</module>
+
<module>picketlink-saml-tests</module>
- <module>picketlink-saml-jbas51</module>
- <module>picketlink-saml-jbas6</module>
- <module>picketlink-saml-tomcat6</module>
- <module>picketlink-saml-standalone</module>
+ <module>picketlink-saml-eap5</module>
+
<module>picketlink-sts-tests</module>
- <module>picketlink-sts-jbas51-native</module>
- <module>picketlink-sts-jbas51-cxf</module>
- <module>picketlink-sts-jbas6-cxf</module>
+ <module>picketlink-sts-eap5-native</module>
+ <module>picketlink-sts-eap5-cxf</module>
+
<module>picketlink-pdp-tests</module>
+
<module>picketlink-trust-tests</module>
- <module>picketlink-trust-jbas51-native</module>
-<!-- <module>picketlink-openid-tests</module> -->
-
+ <module>picketlink-trust-eap5-native</module>
+
</modules>
</project>
12 years, 12 months
- 1
- 0
Picketlink SVN: r1198 - federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion.
by picketlink-commits＠lists.jboss.org
Author: jonananas
Date: 2011-09-05 07:24:13 -0400 (Mon, 05 Sep 2011)
New Revision: 1198
Modified:
federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthnContextType.java
Log:
PLFED-228
Inner class AuthnContextTypeSequence of AuthnContextType need to be Serializable
Issue fixed
Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthnContextType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthnContextType.java 2011-09-05 08:59:48 UTC (rev 1197)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthnContextType.java 2011-09-05 11:24:13 UTC (rev 1198)
@@ -170,8 +170,10 @@
</choice>
</sequence>
*/
- public class AuthnContextTypeSequence
+ public class AuthnContextTypeSequence implements Serializable
{
+ private static final long serialVersionUID = 1L;
+
private AuthnContextClassRefType classRef;
private final Set<URIType> URITypes = new HashSet<URIType>();
12 years, 12 months
- 1
- 0
Picketlink SVN: r1197 - in integration-tests/trunk: ant-scripts and 12 other directories.
by picketlink-commits＠lists.jboss.org
Author: pskopek(a)redhat.com
Date: 2011-09-05 04:59:48 -0400 (Mon, 05 Sep 2011)
New Revision: 1197
Modified:
integration-tests/trunk/ant-scripts/ant-build.xml
integration-tests/trunk/parent/pom.xml
integration-tests/trunk/picketlink-pdp-tests/.classpath
integration-tests/trunk/picketlink-pdp-tests/.project
integration-tests/trunk/picketlink-pdp-tests/pom.xml
integration-tests/trunk/picketlink-saml-jbas51/pom.xml
integration-tests/trunk/picketlink-saml-jbas6/pom.xml
integration-tests/trunk/picketlink-saml-standalone/pom.xml
integration-tests/trunk/picketlink-saml-tomcat6/pom.xml
integration-tests/trunk/picketlink-sts-jbas51-cxf/pom.xml
integration-tests/trunk/picketlink-sts-jbas51-native/pom.xml
integration-tests/trunk/picketlink-sts-jbas6-cxf/pom.xml
integration-tests/trunk/picketlink-sts-tests/.classpath
integration-tests/trunk/picketlink-sts-tests/.project
integration-tests/trunk/picketlink-sts-tests/pom.xml
integration-tests/trunk/picketlink-trust-jbas51-native/pom.xml
integration-tests/trunk/picketlink-trust-tests/pom.xml
integration-tests/trunk/pom.xml
Log:
pl-version and pl-trust-version properties added to parent pom.xml + changes to used then in children's poms.
Modified: integration-tests/trunk/ant-scripts/ant-build.xml
===================================================================
--- integration-tests/trunk/ant-scripts/ant-build.xml 2011-09-01 08:49:08 UTC (rev 1196)
+++ integration-tests/trunk/ant-scripts/ant-build.xml 2011-09-05 08:59:48 UTC (rev 1197)
@@ -1,4 +1,4 @@
-<project default="init" name="PicketLink Federation Integration Test Suite">
+<project name="PicketLink Federation Integration Test Suite">
<taskdef resource="net/sf/antcontrib/antlib.xml">
<classpath path="${depclasspath}"/>
</taskdef>
@@ -11,6 +11,7 @@
<property name="JBWS_CXF_ZIP" location="${basedir}/../common-dist/jbossws/3.4.1.GA/jbossws-cxf-3.4.1.GA.zip"/>
<property name="JBWS_CXF_HOME" location="${basedir}/target/jbossws-cxf-bin-dist/"/>
<property environment="env" />
+ <property name="pl-trust-version" value="${version}"/>
<target name="init-jboss5">
<!-- Unzip JBoss AS5 -->
@@ -119,7 +120,7 @@
<copy file="${basedir}/../picketlink-trust-tests/target/binary-test.war" todir="${JBAS5_DEPLOY}/picketlink" />
<copy file="${basedir}/../picketlink-trust-tests/src/test/resources/props/sts-users.properties" todir="${JBAS5_DEPLOY}/../conf" />
<copy file="${basedir}/../picketlink-trust-tests/src/test/resources/props/sts-roles.properties" todir="${JBAS5_DEPLOY}/../conf" />
- <copy file="${localRepository}/org/picketlink/picketlink-trust-jbossws/${version}/picketlink-trust-jbossws-${version}.jar" todir="${JBAS5_DEPLOY}/picketlink"/>
+ <copy file="${localRepository}/org/picketlink/picketlink-trust-jbossws/${pl-trust-version}/picketlink-trust-jbossws-${pl-trust-version}.jar" todir="${JBAS5_DEPLOY}/picketlink"/>
<copy file="${basedir}/../common-dist/files/war-deployers-jboss-beans.xml" todir="${JBAS5_DEPLOYER}/jbossweb.deployer/META-INF" />
</target>
Modified: integration-tests/trunk/parent/pom.xml
===================================================================
--- integration-tests/trunk/parent/pom.xml 2011-09-01 08:49:08 UTC (rev 1196)
+++ integration-tests/trunk/parent/pom.xml 2011-09-05 08:59:48 UTC (rev 1197)
@@ -26,6 +26,14 @@
<connection>scm:svn:http://anonsvn.jboss.org/repos/picketlink/federation/tags/1.0.0.a...</connection>
<developerConnection>scm:svn:https://svn.jboss.org/repos/picketlink/federation/tags/1.0.0.alpha1</developerConnection>
</scm>
+
+ <properties>
+ <!-- default setting in order to have project imported to IDE without problems -->
+ <pl-version>2.0.0.final</pl-version>
+ <!-- as picketlink-trust-jbossws has different version and is separate project we have to create new property to reflect this fact -->
+ <pl-trust-version>2.0.0.final</pl-trust-version>
+ </properties>
+
<build>
<plugins>
@@ -58,6 +66,35 @@
<artifactId>maven-antrun-plugin</artifactId>
<version>1.4</version>
</plugin>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-antrun-plugin
+ </artifactId>
+ <versionRange>[1.4,)</versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
Modified: integration-tests/trunk/picketlink-pdp-tests/.classpath
===================================================================
--- integration-tests/trunk/picketlink-pdp-tests/.classpath 2011-09-01 08:49:08 UTC (rev 1196)
+++ integration-tests/trunk/picketlink-pdp-tests/.classpath 2011-09-05 08:59:48 UTC (rev 1197)
@@ -1,18 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.5/ant-1.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant-contrib/ant-contrib/1.0b2/ant-contrib-1.0b2.jar" sourcepath="M2_REPO/ant-contrib/ant-contrib/1.0b2/ant-contrib-1.0b2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/httpunit/httpunit/1.7/httpunit-1.7.jar" sourcepath="M2_REPO/httpunit/httpunit/1.7/httpunit-1.7-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbossxacml/2.0.4/jbossxacml-2.0.4.jar" sourcepath="M2_REPO/org/jboss/security/jbossxacml/2.0.4/jbossxacml-2.0.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/rhino/js/1.6R7/js-1.6R7.jar"/>
- <classpathentry kind="var" path="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" sourcepath="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/nekohtml/nekohtml/1.9.12/nekohtml-1.9.12.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-fed/2.0.0-SNAPSHOT/picketlink-fed-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/picketlink/picketlink-fed/2.0.0-SNAPSHOT/picketlink-fed-2.0.0-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: integration-tests/trunk/picketlink-pdp-tests/.project
===================================================================
--- integration-tests/trunk/picketlink-pdp-tests/.project 2011-09-01 08:49:08 UTC (rev 1196)
+++ integration-tests/trunk/picketlink-pdp-tests/.project 2011-09-05 08:59:48 UTC (rev 1197)
@@ -1,13 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>picketlink-integration-pdp-tests</name>
- <comment>PicketLink Federation Tests to be run in a continous integration environment such as Hudson</comment>
- <projects/>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
+ <name>picketlink-integration-pdp-tests</name>
+ <comment>PicketLink Federation Tests to be run in a continous integration environment such as Hudson</comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Modified: integration-tests/trunk/picketlink-pdp-tests/pom.xml
===================================================================
--- integration-tests/trunk/picketlink-pdp-tests/pom.xml 2011-09-01 08:49:08 UTC (rev 1196)
+++ integration-tests/trunk/picketlink-pdp-tests/pom.xml 2011-09-05 08:59:48 UTC (rev 1197)
@@ -44,7 +44,7 @@
<phase>compile</phase>
<configuration>
<tasks>
- <property name="version" value="${project.version}"/>
+ <property name="version" value="${pl-version}"/>
<property name="depclasspath" refid="maven.dependency.classpath"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
<ant antfile="${basedir}/ant-build.xml" target="install-jboss" />
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed</artifactId>
- <version>${version}</version>
+ <version>${pl-version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: integration-tests/trunk/picketlink-saml-jbas51/pom.xml
===================================================================
--- integration-tests/trunk/picketlink-saml-jbas51/pom.xml 2011-09-01 08:49:08 UTC (rev 1196)
+++ integration-tests/trunk/picketlink-saml-jbas51/pom.xml 2011-09-05 08:59:48 UTC (rev 1197)
@@ -60,7 +60,7 @@
<configuration>
<tasks>
<property name="depclasspath" refid="maven.dependency.classpath"/>
- <property name="version" value="${project.version}"/>
+ <property name="version" value="${pl-version}"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-jboss5" />
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-jboss5" />
@@ -76,7 +76,7 @@
<configuration>
<tasks>
<property name="depclasspath" refid="maven.dependency.classpath"/>
- <property name="version" value="${version}"/>
+ <property name="version" value="${pl-version}"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-jboss5" />
</tasks>
@@ -125,7 +125,27 @@
<artifactId>ant-contrib</artifactId>
<version>1.0b2</version>
</dependency>
-
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-bindings</artifactId>
+ <version>${pl-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-bindings-jboss</artifactId>
+ <version>${pl-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-fed</artifactId>
+ <version>${pl-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-fed-webapps-assembly</artifactId>
+ <version>${pl-version}</version>
+ <type>zip</type>
+ </dependency>
</dependencies>
<reporting>
Modified: integration-tests/trunk/picketlink-saml-jbas6/pom.xml
===================================================================
--- integration-tests/trunk/picketlink-saml-jbas6/pom.xml 2011-09-01 08:49:08 UTC (rev 1196)
+++ integration-tests/trunk/picketlink-saml-jbas6/pom.xml 2011-09-05 08:59:48 UTC (rev 1197)
@@ -60,7 +60,7 @@
<configuration>
<tasks>
<property name="depclasspath" refid="maven.dependency.classpath"/>
- <property name="version" value="${project.version}"/>
+ <property name="version" value="${pl-version}"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-jboss6" />
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-jboss6" />
@@ -76,7 +76,7 @@
<configuration>
<tasks>
<property name="depclasspath" refid="maven.dependency.classpath"/>
- <property name="version" value="${version}"/>
+ <property name="version" value="${pl-version}"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-jboss6" />
</tasks>
Modified: integration-tests/trunk/picketlink-saml-standalone/pom.xml
===================================================================
--- integration-tests/trunk/picketlink-saml-standalone/pom.xml 2011-09-01 08:49:08 UTC (rev 1196)
+++ integration-tests/trunk/picketlink-saml-standalone/pom.xml 2011-09-05 08:59:48 UTC (rev 1197)
@@ -56,7 +56,7 @@
<configuration>
<tasks>
<property name="depclasspath" refid="maven.dependency.classpath"/>
- <property name="version" value="${project.version}"/>
+ <property name="version" value="${pl-version}"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-tomcat6-standalone" />
</tasks>
@@ -71,7 +71,7 @@
<configuration>
<tasks>
<property name="depclasspath" refid="maven.dependency.classpath"/>
- <property name="version" value="${version}"/>
+ <property name="version" value="${pl-version}"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-tomcat6" />
</tasks>
@@ -120,7 +120,13 @@
<artifactId>ant-contrib</artifactId>
<version>1.0b2</version>
</dependency>
-
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>idp-standalone</artifactId>
+ <type>war</type>
+ <version>${pl-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<reporting>
Modified: integration-tests/trunk/picketlink-saml-tomcat6/pom.xml
===================================================================
--- integration-tests/trunk/picketlink-saml-tomcat6/pom.xml 2011-09-01 08:49:08 UTC (rev 1196)
+++ integration-tests/trunk/picketlink-saml-tomcat6/pom.xml 2011-09-05 08:59:48 UTC (rev 1197)
@@ -60,7 +60,7 @@
<configuration>
<tasks>
<property name="depclasspath" refid="maven.dependency.classpath"/>
- <property name="version" value="${project.version}"/>
+ <property name="version" value="${pl-version}"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-tomcat6" />
</tasks>
@@ -75,7 +75,7 @@
<configuration>
<tasks>
<property name="depclasspath" refid="maven.dependency.classpath"/>
- <property name="version" value="${version}"/>
+ <property name="version" value="${pl-version}"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-tomcat6" />
</tasks>
Modified: integration-tests/trunk/picketlink-sts-jbas51-cxf/pom.xml
===================================================================
--- integration-tests/trunk/picketlink-sts-jbas51-cxf/pom.xml 2011-09-01 08:49:08 UTC (rev 1196)
+++ integration-tests/trunk/picketlink-sts-jbas51-cxf/pom.xml 2011-09-05 08:59:48 UTC (rev 1197)
@@ -66,7 +66,7 @@
<phase>compile</phase>
<configuration>
<tasks>
- <property name="version" value="${project.version}"/>
+ <property name="version" value="${pl-version}"/>
<property name="depclasspath" refid="maven.dependency.classpath"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-jboss5" />
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed</artifactId>
- <version>${version}</version>
+ <version>${pl-version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: integration-tests/trunk/picketlink-sts-jbas51-native/pom.xml
===================================================================
--- integration-tests/trunk/picketlink-sts-jbas51-native/pom.xml 2011-09-01 08:49:08 UTC (rev 1196)
+++ integration-tests/trunk/picketlink-sts-jbas51-native/pom.xml 2011-09-05 08:59:48 UTC (rev 1197)
@@ -67,7 +67,7 @@
<phase>compile</phase>
<configuration>
<tasks>
- <property name="version" value="${project.version}"/>
+ <property name="version" value="${pl-version}"/>
<property name="depclasspath" refid="maven.dependency.classpath"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-jboss5" />
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed</artifactId>
- <version>${version}</version>
+ <version>${pl-version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: integration-tests/trunk/picketlink-sts-jbas6-cxf/pom.xml
===================================================================
--- integration-tests/trunk/picketlink-sts-jbas6-cxf/pom.xml 2011-09-01 08:49:08 UTC (rev 1196)
+++ integration-tests/trunk/picketlink-sts-jbas6-cxf/pom.xml 2011-09-05 08:59:48 UTC (rev 1197)
@@ -51,7 +51,7 @@
<phase>compile</phase>
<configuration>
<tasks>
- <property name="version" value="${project.version}"/>
+ <property name="version" value="${pl-version}"/>
<property name="depclasspath" refid="maven.dependency.classpath"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-jboss6" />
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed</artifactId>
- <version>${version}</version>
+ <version>${pl-version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: integration-tests/trunk/picketlink-sts-tests/.classpath
===================================================================
--- integration-tests/trunk/picketlink-sts-tests/.classpath 2011-09-01 08:49:08 UTC (rev 1196)
+++ integration-tests/trunk/picketlink-sts-tests/.classpath 2011-09-05 08:59:48 UTC (rev 1197)
@@ -1,115 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/security/jaas/1.0.01/jaas-1.0.01.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar" sourcepath="M2_REPO/javax/transaction/jta/1.1/jta-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.5/ant-1.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar" sourcepath="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant-contrib/ant-contrib/1.0b2/ant-contrib-1.0b2.jar" sourcepath="M2_REPO/ant-contrib/ant-contrib/1.0b2/ant-contrib-1.0b2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/bcel/bcel/5.1/bcel-5.1.jar" sourcepath="M2_REPO/bcel/bcel/5.1/bcel-5.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1.jar" sourcepath="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar" sourcepath="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/gnu-getopt/getopt/1.0.12-brew/getopt-1.0.12-brew.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1.jar" sourcepath="M2_REPO/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/httpunit/httpunit/1.7/httpunit-1.7.jar" sourcepath="M2_REPO/httpunit/httpunit/1.7/httpunit-1.7-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA.jar" sourcepath="M2_REPO/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.1.1.GA/jboss-aop-2.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/aop/jboss-aop/2.1.1.GA/jboss-aop-2.1.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.4.GA/jboss-aop-mc-int-2.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.4.GA/jboss-aop-mc-int-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-deployment/5.1.0.GA/jboss-as-deployment-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-deployment/5.1.0.GA/jboss-as-deployment-5.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.1.0.GA/jboss-as-j2se-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.1.0.GA/jboss-as-j2se-5.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.1.0.GA/jboss-as-j2se-5.1.0.GA-tests.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.1.0.GA/jboss-as-jmx-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.1.0.GA/jboss-as-jmx-5.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.1.0.GA/jboss-as-mbeans-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.1.0.GA/jboss-as-mbeans-5.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-security/5.1.0.GA/jboss-as-security-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-security/5.1.0.GA/jboss-as-security-5.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-server/5.1.0.GA/jboss-as-server-5.1.0.GA-client.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-server/5.1.0.GA/jboss-as-server-5.1.0.GA-jmx-invoker-adaptor-client.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system/5.1.0.GA/jboss-as-system-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-system/5.1.0.GA/jboss-as-system-5.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.1.0.GA/jboss-as-system-jmx-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.1.0.GA/jboss-as-system-jmx-5.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/bootstrap/jboss-bootstrap/1.0.0-Beta-3/jboss-bootstrap-1.0.0-Beta-3.jar" sourcepath="M2_REPO/org/jboss/bootstrap/jboss-bootstrap/1.0.0-Beta-3/jboss-bootstrap-1.0.0-Beta-3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloader/2.0.3.GA/jboss-classloader-2.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloader/2.0.3.GA/jboss-classloader-2.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading/2.0.3.GA/jboss-classloading-2.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading/2.0.3.GA/jboss-classloading-2.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.1.0.GA/jboss-classloading-spi-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.1.0.GA/jboss-classloading-spi-5.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.3.GA/jboss-classloading-vfs-2.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.3.GA/jboss-classloading-vfs-2.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.14.GA/jboss-common-core-2.2.14.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.14.GA/jboss-common-core-2.2.14.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.6.GA/jboss-dependency-2.0.6.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.6.GA/jboss-dependency-2.0.6.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.5.GA/jboss-deployers-client-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.5.GA/jboss-deployers-client-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.7.GA/jboss-deployers-client-spi-2.0.7.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.7.GA/jboss-deployers-client-spi-2.0.7.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.5.GA/jboss-deployers-core-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.5.GA/jboss-deployers-core-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.7.GA/jboss-deployers-core-spi-2.0.7.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.7.GA/jboss-deployers-core-spi-2.0.7.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.7.GA/jboss-deployers-impl-2.0.7.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.7.GA/jboss-deployers-impl-2.0.7.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.5.GA/jboss-deployers-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.5.GA/jboss-deployers-spi-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.7.GA/jboss-deployers-structure-spi-2.0.7.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.7.GA/jboss-deployers-structure-spi-2.0.7.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.5.GA/jboss-deployers-vfs-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.5.GA/jboss-deployers-vfs-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.5.GA/jboss-deployers-vfs-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.5.GA/jboss-deployers-vfs-spi-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-deployment-spi/5.1.0.GA/jboss-deployment-spi-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-deployment-spi/5.1.0.GA/jboss-deployment-spi-5.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-ejb-api/3.0.0.GA/jboss-ejb-api-3.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-ejb-api/3.0.0.GA/jboss-ejb-api-3.0.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api/1.0.0/jboss-ejb3-ext-api-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api/1.0.0/jboss-ejb3-ext-api-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jacc-api/1.1.0.GA_SP1/jboss-jacc-api-1.1.0.GA_SP1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jacc-api/1.1.0.GA_SP1/jboss-jacc-api-1.1.0.GA_SP1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jad-api/1.2.0.GA/jboss-jad-api-1.2.0.GA.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jad-api/1.2.0.GA/jboss-jad-api-1.2.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jaspi-api/1.0.0.GA/jboss-jaspi-api-1.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jaspi-api/1.0.0.GA/jboss-jaspi-api-1.0.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jbossws/jboss-jaxws/3.0.1-native-2.0.4.GA/jboss-jaxws-3.0.1-native-2.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jca-api/1.5.0.GA/jboss-jca-api-1.5.0.GA.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jca-api/1.5.0.GA/jboss-jca-api-1.5.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jms-api/1.1.0.GA/jboss-jms-api-1.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jms-api/1.1.0.GA/jboss-jms-api-1.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jpa/jboss-jpa-deployers/1.0.0/jboss-jpa-deployers-1.0.0.jar" sourcepath="M2_REPO/org/jboss/jpa/jboss-jpa-deployers/1.0.0/jboss-jpa-deployers-1.0.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.4.GA/jboss-kernel-2.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.4.GA/jboss-kernel-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.0.0.GA/jboss-managed-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/man/jboss-managed/2.0.0.GA/jboss-managed-2.0.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.0.GA/jboss-mdr-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.0.GA/jboss-mdr-2.0.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/metadata/jboss-metadata/1.0.1.GA/jboss-metadata-1.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/metadata/jboss-metadata/1.0.1.GA/jboss-metadata-1.0.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.1.0.SP1/jboss-metatype-2.1.0.SP1.jar" sourcepath="M2_REPO/org/jboss/man/jboss-metatype/2.1.0.SP1/jboss-metatype-2.1.0.SP1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-profileservice-spi/5.1.0.GA/jboss-profileservice-spi-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-profileservice-spi/5.1.0.GA/jboss-profileservice-spi-5.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/remoting/jboss-remoting/2.5.1/jboss-remoting-2.5.1.jar" sourcepath="M2_REPO/org/jboss/remoting/jboss-remoting/2.5.1/jboss-remoting-2.5.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.0.3.SP1/jboss-security-spi-2.0.3.SP1.jar" sourcepath="M2_REPO/org/jboss/security/jboss-security-spi/2.0.3.SP1/jboss-security-spi-2.0.3.SP1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-serialization/1.0.3.GA/jboss-serialization-1.0.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-server-manager/1.0.2.GA/jboss-server-manager-1.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-server-manager/1.0.2.GA/jboss-server-manager-1.0.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.4.GA/jboss-test-1.1.4.GA.jar" sourcepath="M2_REPO/org/jboss/test/jboss-test/1.1.4.GA/jboss-test-1.1.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.GA/jboss-transaction-api-1.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.GA/jboss-transaction-api-1.0.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-transaction-spi/5.1.0.GA/jboss-transaction-spi-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-transaction-spi/5.1.0.GA/jboss-transaction-spi-5.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.0.0.CR1/jboss-vfs-2.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jboss-vfs/2.0.0.CR1/jboss-vfs-2.0.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbosssx/2.0.3.SP1/jbosssx-2.0.3.SP1.jar" sourcepath="M2_REPO/org/jboss/security/jbosssx/2.0.3.SP1/jbosssx-2.0.3.SP1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbosssx-client/2.0.4.SP6/jbosssx-client-2.0.4.SP6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/native/jbossws-native-jaxrpc/3.0.4.GA/jbossws-native-jaxrpc-3.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/ws/native/jbossws-native-jaxrpc/3.0.4.GA/jbossws-native-jaxrpc-3.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/native/jbossws-native-jaxws/3.1.2.GA/jbossws-native-jaxws-3.1.2.GA.jar" sourcepath="M2_REPO/org/jboss/ws/native/jbossws-native-jaxws/3.1.2.GA/jbossws-native-jaxws-3.1.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/native/jbossws-native-saaj/3.1.2.GA/jbossws-native-saaj-3.1.2.GA.jar" sourcepath="M2_REPO/org/jboss/ws/native/jbossws-native-saaj/3.1.2.GA/jbossws-native-saaj-3.1.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-spi/1.0.6.GA/jbossws-spi-1.0.6.GA.jar" sourcepath="M2_REPO/org/jboss/ws/jbossws-spi/1.0.6.GA/jbossws-spi-1.0.6.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbossxacml/2.0.4/jbossxacml-2.0.4.jar" sourcepath="M2_REPO/org/jboss/security/jbossxacml/2.0.4/jbossxacml-2.0.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/naming/jnp-client/5.0.3.GA/jnp-client-5.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/naming/jnp-client/5.0.3.GA/jnp-client-5.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/naming/jnpserver/5.0.3.GA/jnpserver-5.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/naming/jnpserver/5.0.3.GA/jnpserver-5.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jpl-pattern/jpl-pattern/1.0/jpl-pattern-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/jpl-util/jpl-util/1.0/jpl-util-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/rhino/js/1.6R7/js-1.6R7.jar"/>
- <classpathentry kind="var" path="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" sourcepath="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/nekohtml/nekohtml/1.9.12/nekohtml-1.9.12.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-fed/2.0.0-SNAPSHOT/picketlink-fed-2.0.0-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1.jar" sourcepath="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/web/servlet-api/2.1.1.GA/servlet-api-2.1.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.2/slf4j-api-1.4.2.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.4.2/slf4j-api-1.4.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/xmlsec/1.4.3/xmlsec-1.4.3.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: integration-tests/trunk/picketlink-sts-tests/.project
===================================================================
--- integration-tests/trunk/picketlink-sts-tests/.project 2011-09-01 08:49:08 UTC (rev 1196)
+++ integration-tests/trunk/picketlink-sts-tests/.project 2011-09-05 08:59:48 UTC (rev 1197)
@@ -1,17 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>picketlink-integration-sts-tests</name>
- <comment>PicketLink Federation Tests to be run in a continous integration environment such as Hudson</comment>
- <projects/>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
+ <name>picketlink-integration-sts-tests</name>
+ <comment>PicketLink Federation Tests to be run in a continous integration environment such as Hudson</comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Modified: integration-tests/trunk/picketlink-sts-tests/pom.xml
===================================================================
--- integration-tests/trunk/picketlink-sts-tests/pom.xml 2011-09-01 08:49:08 UTC (rev 1196)
+++ integration-tests/trunk/picketlink-sts-tests/pom.xml 2011-09-05 08:59:48 UTC (rev 1197)
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed</artifactId>
- <version>${version}</version>
+ <version>${pl-version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: integration-tests/trunk/picketlink-trust-jbas51-native/pom.xml
===================================================================
--- integration-tests/trunk/picketlink-trust-jbas51-native/pom.xml 2011-09-01 08:49:08 UTC (rev 1196)
+++ integration-tests/trunk/picketlink-trust-jbas51-native/pom.xml 2011-09-05 08:59:48 UTC (rev 1197)
@@ -64,7 +64,8 @@
<phase>compile</phase>
<configuration>
<tasks>
- <property name="version" value="${project.version}"/>
+ <property name="version" value="${pl-version}"/>
+ <property name="pl-trust-version" value="${pl-trust-version}"/>
<property name="depclasspath" refid="maven.dependency.classpath"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-jboss5" />
@@ -98,13 +99,13 @@
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed</artifactId>
- <version>${project.version}</version>
+ <version>${pl-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-trust-jbossws</artifactId>
- <version>${project.version}</version>
+ <version>${pl-trust-version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: integration-tests/trunk/picketlink-trust-tests/pom.xml
===================================================================
--- integration-tests/trunk/picketlink-trust-tests/pom.xml 2011-09-01 08:49:08 UTC (rev 1196)
+++ integration-tests/trunk/picketlink-trust-tests/pom.xml 2011-09-05 08:59:48 UTC (rev 1197)
@@ -147,13 +147,13 @@
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed</artifactId>
- <version>${version}</version>
+ <version>${pl-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-trust-jbossws</artifactId>
- <version>${version}</version>
+ <version>${pl-trust-version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
Modified: integration-tests/trunk/pom.xml
===================================================================
--- integration-tests/trunk/pom.xml 2011-09-01 08:49:08 UTC (rev 1196)
+++ integration-tests/trunk/pom.xml 2011-09-05 08:59:48 UTC (rev 1197)
@@ -24,9 +24,11 @@
<module>picketlink-sts-tests</module>
<module>picketlink-sts-jbas51-native</module>
<module>picketlink-sts-jbas51-cxf</module>
- <module>picketlink-sts-jbas6-cxf</module>
+ <module>picketlink-sts-jbas6-cxf</module>
+ <module>picketlink-pdp-tests</module>
+ <module>picketlink-trust-tests</module>
+ <module>picketlink-trust-jbas51-native</module>
<!-- <module>picketlink-openid-tests</module> -->
- <module>picketlink-pdp-tests</module>
</modules>
</project>
12 years, 12 months
- 1
- 0
Picketlink SVN: r1196 - in federation/trunk/picketlink-webapps: employee-post-sig/src/main/webapp/WEB-INF and 4 other directories.
by picketlink-commits＠lists.jboss.org
Author: pskopek(a)redhat.com
Date: 2011-09-01 04:49:08 -0400 (Thu, 01 Sep 2011)
New Revision: 1196
Added:
federation/trunk/picketlink-webapps/employee-post-sig/src/main/webapp/WEB-INF/classes/
federation/trunk/picketlink-webapps/employee-post-sig/src/main/webapp/WEB-INF/classes/jbid_test_keystore.jks
federation/trunk/picketlink-webapps/sales-post-sig/src/main/webapp/WEB-INF/classes/
federation/trunk/picketlink-webapps/sales-post-sig/src/main/webapp/WEB-INF/classes/jbid_test_keystore.jks
Removed:
federation/trunk/picketlink-webapps/employee-post-sig/src/main/webapp/META-INF/jbid_test_keystore.jks
federation/trunk/picketlink-webapps/sales-post-sig/src/main/webapp/META-INF/jbid_test_keystore.jks
Log:
Moving jbid_test_keystore.jks to WEB-INF/classes for all *sig apps to fix problem in SAML integration tests as part of JBQA-5139.
Deleted: federation/trunk/picketlink-webapps/employee-post-sig/src/main/webapp/META-INF/jbid_test_keystore.jks
===================================================================
(Binary files differ)
Copied: federation/trunk/picketlink-webapps/employee-post-sig/src/main/webapp/WEB-INF/classes/jbid_test_keystore.jks (from rev 1191, federation/trunk/picketlink-webapps/employee-post-sig/src/main/webapp/META-INF/jbid_test_keystore.jks)
===================================================================
(Binary files differ)
Deleted: federation/trunk/picketlink-webapps/sales-post-sig/src/main/webapp/META-INF/jbid_test_keystore.jks
===================================================================
(Binary files differ)
Copied: federation/trunk/picketlink-webapps/sales-post-sig/src/main/webapp/WEB-INF/classes/jbid_test_keystore.jks (from rev 1191, federation/trunk/picketlink-webapps/sales-post-sig/src/main/webapp/META-INF/jbid_test_keystore.jks)
===================================================================
(Binary files differ)
13 years
- 1
- 0
Picketlink SVN: r1195 - integration-tests/trunk/picketlink-int-webapps/claims.
by picketlink-commits＠lists.jboss.org
Author: pskopek(a)redhat.com
Date: 2011-09-01 04:26:33 -0400 (Thu, 01 Sep 2011)
New Revision: 1195
Modified:
integration-tests/trunk/picketlink-int-webapps/claims/pom.xml
Log:
Fixing relative path to parent.
Modified: integration-tests/trunk/picketlink-int-webapps/claims/pom.xml
===================================================================
--- integration-tests/trunk/picketlink-int-webapps/claims/pom.xml 2011-08-26 07:52:04 UTC (rev 1194)
+++ integration-tests/trunk/picketlink-int-webapps/claims/pom.xml 2011-09-01 08:26:33 UTC (rev 1195)
@@ -3,7 +3,7 @@
<groupId>org.picketlink</groupId>
<artifactId>picketlink-integration-tests-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
+ <relativePath>../../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
13 years
- 1
- 0