Author: anil.saldhana(a)jboss.com
Date: 2012-01-31 16:33:27 -0500 (Tue, 31 Jan 2012)
New Revision: 1350
Added:
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/WEB-INF/
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/WEB-INF/jbid_test_keystore.jks
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/WEB-INF/picketlink-handlers.xml
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/WEB-INF/picketlink-idfed.xml
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/roles.properties
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/WEB-INF/
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/WEB-INF/jbid_test_keystore.jks
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/WEB-INF/picketlink-handlers.xml
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/WEB-INF/picketlink-idfed.xml
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/roles.properties
Removed:
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/WEB-INF/
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/WEB-INF/jbid_test_keystore.jks
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/WEB-INF/picketlink-handlers.xml
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/WEB-INF/picketlink-idfed.xml
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/roles.properties
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/WEB-INF/
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/WEB-INF/jbid_test_keystore.jks
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/WEB-INF/picketlink-handlers.xml
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/WEB-INF/picketlink-idfed.xml
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/roles.properties
Modified:
product/trunk/picketlink-core/src/test/resources/saml2/redirect/
Log:
merge in -r1324
Property changes on: product/trunk/picketlink-core/src/test/resources/saml2/redirect
___________________________________________________________________
Added: svn:mergeinfo
+ /federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect:1321-1324
Deleted:
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/WEB-INF/jbid_test_keystore.jks
===================================================================
(Binary files differ)
Copied:
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/WEB-INF/jbid_test_keystore.jks
(from rev 1324,
federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/idp-sig/WEB-INF/jbid_test_keystore.jks)
===================================================================
(Binary files differ)
Deleted:
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/WEB-INF/picketlink-handlers.xml
===================================================================
---
federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/idp-sig/WEB-INF/picketlink-handlers.xml 2011-11-15
13:23:37 UTC (rev 1324)
+++
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/WEB-INF/picketlink-handlers.xml 2012-01-31
21:33:27 UTC (rev 1350)
@@ -1,6 +0,0 @@
-<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
- <Handler
class="org.picketlink.identity.federation.web.handlers.saml2.SAML2IssuerTrustHandler"/>
- <Handler
class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
- <Handler
class="org.picketlink.identity.federation.web.handlers.saml2.SAML2AuthenticationHandler"/>
- <Handler
class="org.picketlink.identity.federation.web.handlers.saml2.RolesGenerationHandler"/>
-</Handlers>
Copied:
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/WEB-INF/picketlink-handlers.xml
(from rev 1324,
federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/idp-sig/WEB-INF/picketlink-handlers.xml)
===================================================================
---
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/WEB-INF/picketlink-handlers.xml
(rev 0)
+++
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/WEB-INF/picketlink-handlers.xml 2012-01-31
21:33:27 UTC (rev 1350)
@@ -0,0 +1,6 @@
+<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
+ <Handler
class="org.picketlink.identity.federation.web.handlers.saml2.SAML2IssuerTrustHandler"/>
+ <Handler
class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
+ <Handler
class="org.picketlink.identity.federation.web.handlers.saml2.SAML2AuthenticationHandler"/>
+ <Handler
class="org.picketlink.identity.federation.web.handlers.saml2.RolesGenerationHandler"/>
+</Handlers>
Deleted:
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/WEB-INF/picketlink-idfed.xml
===================================================================
---
federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/idp-sig/WEB-INF/picketlink-idfed.xml 2011-11-15
13:23:37 UTC (rev 1324)
+++
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/WEB-INF/picketlink-idfed.xml 2012-01-31
21:33:27 UTC (rev 1350)
@@ -1,26 +0,0 @@
-<PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0">
- <IdentityURL>${idp-sig.url::http://192.168.1.1:8080/idp-sig/}
- </IdentityURL>
- <Trust>
- <Domains>192.168.1.1, 192.168.1.2</Domains>
- </Trust>
- <KeyProvider
- ClassName="org.picketlink.identity.federation.core.impl.KeyStoreKeyManager">
- <Auth Key="KeyStoreURL"
Value="saml2/redirect/idp-sig/WEB-INF/jbid_test_keystore.jks" />
- <Auth Key="KeyStorePass" Value="MASK-O1P+U1Domeec8lCaoIkTGg=="
/>
- <Auth Key="SigningKeyPass" Value="MASK-AJbh4WmHwy8=" />
- <Auth Key="SigningKeyAlias" Value="servercert" />
- <Auth Key="salt" Value="18273645" />
- <Auth Key="iterationCount" Value="11" />
- <ValidatingAlias Key="192.168.1.1" Value="servercert" />
- <ValidatingAlias Key="192.168.1.2" Value="servercert" />
- </KeyProvider>
-<!-- <KeyProvider -->
-<!--
ClassName="org.picketlink.identity.federation.core.impl.KeyStoreKeyManager">
-->
-<!-- <Auth Key="KeyStoreURL"
Value="saml2/redirect/idp-sig/WEB-INF/jbid_test_keystore.jks" /> -->
-<!-- <Auth Key="KeyStorePass" Value="servercert" />
-->
-<!-- <Auth Key="SigningKeyPass" Value="servercert" />
-->
-<!-- <Auth Key="SigningKeyAlias" Value="172.16.2.123" />
-->
-<!-- <ValidatingAlias Key="172.16.2.123" Value="172.16.2.123"
/> -->
-<!-- </KeyProvider> -->
-</PicketLinkIDP>
Copied:
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/WEB-INF/picketlink-idfed.xml
(from rev 1324,
federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/idp-sig/WEB-INF/picketlink-idfed.xml)
===================================================================
---
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/WEB-INF/picketlink-idfed.xml
(rev 0)
+++
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/WEB-INF/picketlink-idfed.xml 2012-01-31
21:33:27 UTC (rev 1350)
@@ -0,0 +1,26 @@
+<PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0">
+ <IdentityURL>${idp-sig.url::http://192.168.1.1:8080/idp-sig/}
+ </IdentityURL>
+ <Trust>
+ <Domains>192.168.1.1, 192.168.1.2</Domains>
+ </Trust>
+ <KeyProvider
+ ClassName="org.picketlink.identity.federation.core.impl.KeyStoreKeyManager">
+ <Auth Key="KeyStoreURL"
Value="saml2/redirect/idp-sig/WEB-INF/jbid_test_keystore.jks" />
+ <Auth Key="KeyStorePass" Value="MASK-O1P+U1Domeec8lCaoIkTGg=="
/>
+ <Auth Key="SigningKeyPass" Value="MASK-AJbh4WmHwy8=" />
+ <Auth Key="SigningKeyAlias" Value="servercert" />
+ <Auth Key="salt" Value="18273645" />
+ <Auth Key="iterationCount" Value="11" />
+ <ValidatingAlias Key="192.168.1.1" Value="servercert" />
+ <ValidatingAlias Key="192.168.1.2" Value="servercert" />
+ </KeyProvider>
+<!-- <KeyProvider -->
+<!--
ClassName="org.picketlink.identity.federation.core.impl.KeyStoreKeyManager">
-->
+<!-- <Auth Key="KeyStoreURL"
Value="saml2/redirect/idp-sig/WEB-INF/jbid_test_keystore.jks" /> -->
+<!-- <Auth Key="KeyStorePass" Value="servercert" />
-->
+<!-- <Auth Key="SigningKeyPass" Value="servercert" />
-->
+<!-- <Auth Key="SigningKeyAlias" Value="172.16.2.123" />
-->
+<!-- <ValidatingAlias Key="172.16.2.123" Value="172.16.2.123"
/> -->
+<!-- </KeyProvider> -->
+</PicketLinkIDP>
Deleted:
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/roles.properties
===================================================================
---
federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/idp-sig/roles.properties 2011-11-15
13:23:37 UTC (rev 1324)
+++
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/roles.properties 2012-01-31
21:33:27 UTC (rev 1350)
@@ -1 +0,0 @@
-manager=manager
\ No newline at end of file
Copied:
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/roles.properties
(from rev 1324,
federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/idp-sig/roles.properties)
===================================================================
---
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/roles.properties
(rev 0)
+++
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/roles.properties 2012-01-31
21:33:27 UTC (rev 1350)
@@ -0,0 +1 @@
+manager=manager
\ No newline at end of file
Deleted:
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/WEB-INF/jbid_test_keystore.jks
===================================================================
(Binary files differ)
Copied:
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/WEB-INF/jbid_test_keystore.jks
(from rev 1324,
federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/employee-sig/WEB-INF/jbid_test_keystore.jks)
===================================================================
(Binary files differ)
Deleted:
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/WEB-INF/picketlink-handlers.xml
===================================================================
---
federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/employee-sig/WEB-INF/picketlink-handlers.xml 2011-11-15
13:23:37 UTC (rev 1324)
+++
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/WEB-INF/picketlink-handlers.xml 2012-01-31
21:33:27 UTC (rev 1350)
@@ -1,4 +0,0 @@
-<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
- <Handler
class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
- <Handler
class="org.picketlink.identity.federation.web.handlers.saml2.SAML2AuthenticationHandler"/>
-</Handlers>
\ No newline at end of file
Copied:
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/WEB-INF/picketlink-handlers.xml
(from rev 1324,
federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/employee-sig/WEB-INF/picketlink-handlers.xml)
===================================================================
---
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/WEB-INF/picketlink-handlers.xml
(rev 0)
+++
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/WEB-INF/picketlink-handlers.xml 2012-01-31
21:33:27 UTC (rev 1350)
@@ -0,0 +1,4 @@
+<Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0">
+ <Handler
class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/>
+ <Handler
class="org.picketlink.identity.federation.web.handlers.saml2.SAML2AuthenticationHandler"/>
+</Handlers>
\ No newline at end of file
Deleted:
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/WEB-INF/picketlink-idfed.xml
===================================================================
---
federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/employee-sig/WEB-INF/picketlink-idfed.xml 2011-11-15
13:23:37 UTC (rev 1324)
+++
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/WEB-INF/picketlink-idfed.xml 2012-01-31
21:33:27 UTC (rev 1350)
@@ -1,26 +0,0 @@
-<PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0"
- ServerEnvironment="jboss">
- <IdentityURL>${idp-sig.url::http://192.168.1.1:8080/idp/}</IdentityURL>
- <ServiceURL>${employee-post-sig.url::http://192.168.1.2:8080/employee/}
- </ServiceURL>
- <KeyProvider
- ClassName="org.picketlink.identity.federation.core.impl.KeyStoreKeyManager">
- <Auth Key="KeyStoreURL"
Value="saml2/redirect/sp/employee-sig/WEB-INF/jbid_test_keystore.jks" />
- <Auth Key="KeyStorePass" Value="MASK-O1P+U1Domeec8lCaoIkTGg=="
/>
- <Auth Key="SigningKeyPass" Value="MASK-AJbh4WmHwy8=" />
- <Auth Key="SigningKeyAlias" Value="servercert" />
- <Auth Key="salt" Value="18273645" />
- <Auth Key="iterationCount" Value="11" />
- <ValidatingAlias Key="192.168.1.1" Value="servercert" />
- </KeyProvider>
-<!-- <KeyProvider -->
-<!--
ClassName="org.picketlink.identity.federation.core.impl.KeyStoreKeyManager">
-->
-<!-- <Auth Key="KeyStoreURL" -->
-<!--
Value="saml2/redirect/sp/employee-sig/WEB-INF/jbid_test_keystore.jks" />
-->
-<!-- <Auth Key="KeyStorePass" Value="servercert" />
-->
-<!-- <Auth Key="SigningKeyPass" Value="servercert" />
-->
-<!-- <Auth Key="SigningKeyAlias" Value="172.16.2.123" />
-->
-<!-- <ValidatingAlias Key="172.16.2.123" Value="172.16.2.123"
/> -->
-<!-- </KeyProvider> -->
-
-</PicketLinkSP>
Copied:
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/WEB-INF/picketlink-idfed.xml
(from rev 1324,
federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/employee-sig/WEB-INF/picketlink-idfed.xml)
===================================================================
---
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/WEB-INF/picketlink-idfed.xml
(rev 0)
+++
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/WEB-INF/picketlink-idfed.xml 2012-01-31
21:33:27 UTC (rev 1350)
@@ -0,0 +1,26 @@
+<PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0"
+ ServerEnvironment="jboss">
+ <IdentityURL>${idp-sig.url::http://192.168.1.1:8080/idp/}</IdentityURL>
+ <ServiceURL>${employee-post-sig.url::http://192.168.1.2:8080/employee/}
+ </ServiceURL>
+ <KeyProvider
+ ClassName="org.picketlink.identity.federation.core.impl.KeyStoreKeyManager">
+ <Auth Key="KeyStoreURL"
Value="saml2/redirect/sp/employee-sig/WEB-INF/jbid_test_keystore.jks" />
+ <Auth Key="KeyStorePass" Value="MASK-O1P+U1Domeec8lCaoIkTGg=="
/>
+ <Auth Key="SigningKeyPass" Value="MASK-AJbh4WmHwy8=" />
+ <Auth Key="SigningKeyAlias" Value="servercert" />
+ <Auth Key="salt" Value="18273645" />
+ <Auth Key="iterationCount" Value="11" />
+ <ValidatingAlias Key="192.168.1.1" Value="servercert" />
+ </KeyProvider>
+<!-- <KeyProvider -->
+<!--
ClassName="org.picketlink.identity.federation.core.impl.KeyStoreKeyManager">
-->
+<!-- <Auth Key="KeyStoreURL" -->
+<!--
Value="saml2/redirect/sp/employee-sig/WEB-INF/jbid_test_keystore.jks" />
-->
+<!-- <Auth Key="KeyStorePass" Value="servercert" />
-->
+<!-- <Auth Key="SigningKeyPass" Value="servercert" />
-->
+<!-- <Auth Key="SigningKeyAlias" Value="172.16.2.123" />
-->
+<!-- <ValidatingAlias Key="172.16.2.123" Value="172.16.2.123"
/> -->
+<!-- </KeyProvider> -->
+
+</PicketLinkSP>
Deleted:
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/roles.properties
===================================================================
---
federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/employee-sig/roles.properties 2011-11-15
13:23:37 UTC (rev 1324)
+++
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/roles.properties 2012-01-31
21:33:27 UTC (rev 1350)
@@ -1 +0,0 @@
-manager=manager
\ No newline at end of file
Copied:
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/roles.properties
(from rev 1324,
federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/employee-sig/roles.properties)
===================================================================
---
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/roles.properties
(rev 0)
+++
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/employee-sig/roles.properties 2012-01-31
21:33:27 UTC (rev 1350)
@@ -0,0 +1 @@
+manager=manager
\ No newline at end of file