[jboss-cvs] Picketlink SVN: r258 - in federation/trunk/picketlink-fed-core/src/test: resources and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 25 18:28:02 EDT 2010
Author: anil.saldhana at jboss.com
Date: 2010-05-25 18:28:02 -0400 (Tue, 25 May 2010)
New Revision: 258
Added:
federation/trunk/picketlink-fed-core/src/test/resources/sts/
federation/trunk/picketlink-fed-core/src/test/resources/sts/picketlink-sts.xml
Removed:
federation/trunk/picketlink-fed-core/src/test/resources/picketlink-sts.xml
Modified:
federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/PicketLinkSTSUnitTestCase.java
Log:
provide explicit sts config file to test
Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/PicketLinkSTSUnitTestCase.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/PicketLinkSTSUnitTestCase.java 2010-05-25 22:16:49 UTC (rev 257)
+++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/PicketLinkSTSUnitTestCase.java 2010-05-25 22:28:02 UTC (rev 258)
@@ -25,6 +25,7 @@
import java.io.InputStream;
import java.math.BigInteger;
import java.net.URI;
+import java.net.URL;
import java.security.KeyFactory;
import java.security.KeyStore;
import java.security.Principal;
@@ -1388,7 +1389,8 @@
InputStream stream;
try
{
- stream = Thread.currentThread().getContextClassLoader().getResource("picketlink-sts.xml").openStream();
+ URL configURL = Thread.currentThread().getContextClassLoader().getResource("sts/picketlink-sts.xml");
+ stream = configURL.openStream();
STSType stsConfig = WSTrustUtil.getSTSConfiguration(stream);
return new PicketLinkSTSConfiguration(stsConfig);
Deleted: federation/trunk/picketlink-fed-core/src/test/resources/picketlink-sts.xml
===================================================================
--- federation/trunk/picketlink-fed-core/src/test/resources/picketlink-sts.xml 2010-05-25 22:16:49 UTC (rev 257)
+++ federation/trunk/picketlink-fed-core/src/test/resources/picketlink-sts.xml 2010-05-25 22:28:02 UTC (rev 258)
@@ -1,31 +0,0 @@
-<PicketLinkSTS xmlns="urn:picketlink:identity-federation:config:1.0"
- STSName="Test STS" TokenTimeout="7200" EncryptToken="false">
- <KeyProvider ClassName="org.picketlink.identity.federation.core.impl.KeyStoreKeyManager">
- <Auth Key="KeyStoreURL" Value="keystore/sts_keystore.jks"/>
- <Auth Key="KeyStorePass" Value="testpass"/>
- <Auth Key="SigningKeyAlias" Value="sts"/>
- <Auth Key="SigningKeyPass" Value="keypass"/>
- <ValidatingAlias Key="http://services.testcorp.org/provider1" Value="service1"/>
- <ValidatingAlias Key="http://services.testcorp.org/provider2" Value="service2"/>
- </KeyProvider>
- <RequestHandler>org.picketlink.identity.federation.core.wstrust.StandardRequestHandler</RequestHandler>
- <TokenProviders>
- <TokenProvider ProviderClass="org.picketlink.test.identity.federation.core.wstrust.SpecialTokenProvider"
- TokenType="http://www.tokens.org/SpecialToken"
- TokenElement="SpecialToken"
- TokenElementNS="http://www.tokens.org">
- <Property Key="Property1" Value="Value1"/>
- <Property Key="Property2" Value="Value2"/>
- </TokenProvider>
- <TokenProvider ProviderClass="org.picketlink.identity.federation.core.wstrust.plugins.saml.SAML20TokenProvider"
- TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0"
- TokenElement="Assertion"
- TokenElementNS="urn:oasis:names:tc:SAML:2.0:assertion"/>
- </TokenProviders>
- <ServiceProviders>
- <ServiceProvider Endpoint="http://services.testcorp.org/provider1" TokenType="http://www.tokens.org/SpecialToken"
- TruststoreAlias="service1"/>
- <ServiceProvider Endpoint="http://services.testcorp.org/provider2" TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0"
- TruststoreAlias="service2"/>
- </ServiceProviders>
-</PicketLinkSTS>
\ No newline at end of file
Added: federation/trunk/picketlink-fed-core/src/test/resources/sts/picketlink-sts.xml
===================================================================
--- federation/trunk/picketlink-fed-core/src/test/resources/sts/picketlink-sts.xml (rev 0)
+++ federation/trunk/picketlink-fed-core/src/test/resources/sts/picketlink-sts.xml 2010-05-25 22:28:02 UTC (rev 258)
@@ -0,0 +1,31 @@
+<PicketLinkSTS xmlns="urn:picketlink:identity-federation:config:1.0"
+ STSName="Test STS" TokenTimeout="7200" EncryptToken="false">
+ <KeyProvider ClassName="org.picketlink.identity.federation.core.impl.KeyStoreKeyManager">
+ <Auth Key="KeyStoreURL" Value="keystore/sts_keystore.jks"/>
+ <Auth Key="KeyStorePass" Value="testpass"/>
+ <Auth Key="SigningKeyAlias" Value="sts"/>
+ <Auth Key="SigningKeyPass" Value="keypass"/>
+ <ValidatingAlias Key="http://services.testcorp.org/provider1" Value="service1"/>
+ <ValidatingAlias Key="http://services.testcorp.org/provider2" Value="service2"/>
+ </KeyProvider>
+ <RequestHandler>org.picketlink.identity.federation.core.wstrust.StandardRequestHandler</RequestHandler>
+ <TokenProviders>
+ <TokenProvider ProviderClass="org.picketlink.test.identity.federation.core.wstrust.SpecialTokenProvider"
+ TokenType="http://www.tokens.org/SpecialToken"
+ TokenElement="SpecialToken"
+ TokenElementNS="http://www.tokens.org">
+ <Property Key="Property1" Value="Value1"/>
+ <Property Key="Property2" Value="Value2"/>
+ </TokenProvider>
+ <TokenProvider ProviderClass="org.picketlink.identity.federation.core.wstrust.plugins.saml.SAML20TokenProvider"
+ TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0"
+ TokenElement="Assertion"
+ TokenElementNS="urn:oasis:names:tc:SAML:2.0:assertion"/>
+ </TokenProviders>
+ <ServiceProviders>
+ <ServiceProvider Endpoint="http://services.testcorp.org/provider1" TokenType="http://www.tokens.org/SpecialToken"
+ TruststoreAlias="service1"/>
+ <ServiceProvider Endpoint="http://services.testcorp.org/provider2" TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0"
+ TruststoreAlias="service2"/>
+ </ServiceProviders>
+</PicketLinkSTS>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list