[jboss-cvs] Picketlink SVN: r1357 - product/trunk/picketlink-core/src/test/resources and 20 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jan 31 17:12:57 EST 2012
Author: anil.saldhana at jboss.com
Date: 2012-01-31 17:12:56 -0500 (Tue, 31 Jan 2012)
New Revision: 1357
Added:
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/sales-sig/
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/sales-sig/WEB-INF/
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/sales-sig/WEB-INF/jbid_test_keystore.jks
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/sales-sig/WEB-INF/picketlink-handlers.xml
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/sales-sig/WEB-INF/picketlink-idfed.xml
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/sales-sig/roles.properties
Removed:
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/sales-sig/WEB-INF/
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/sales-sig/WEB-INF/jbid_test_keystore.jks
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/sales-sig/WEB-INF/picketlink-handlers.xml
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/sales-sig/WEB-INF/picketlink-idfed.xml
product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/sales-sig/roles.properties
Modified:
federation/trunk/picketlink-bindings/src/test/resources/responseIDP/
product/trunk/picketlink-core/src/test/resources/
product/trunk/picketlink-core/src/test/resources/config/
product/trunk/picketlink-core/src/test/resources/endorsed/
product/trunk/picketlink-core/src/test/resources/jbossws/
product/trunk/picketlink-core/src/test/resources/keystore/
product/trunk/picketlink-core/src/test/resources/log4j.xml
product/trunk/picketlink-core/src/test/resources/logging.properties
product/trunk/picketlink-core/src/test/resources/metadata/
product/trunk/picketlink-core/src/test/resources/openid/
product/trunk/picketlink-core/src/test/resources/parser/
product/trunk/picketlink-core/src/test/resources/parser/saml2/
product/trunk/picketlink-core/src/test/resources/saml-xacml/
product/trunk/picketlink-core/src/test/resources/saml/
product/trunk/picketlink-core/src/test/resources/saml2/
product/trunk/picketlink-core/src/test/resources/saml2/redirect/
product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/WEB-INF/picketlink-idfed.xml
product/trunk/picketlink-core/src/test/resources/sts-client.properties
product/trunk/picketlink-core/src/test/resources/sts/
product/trunk/picketlink-core/src/test/resources/wstrust/
product/trunk/picketlink-core/src/test/resources/xacml/
product/trunk/picketlink-core/src/test/resources/xml/
Log:
merge changes from -r1328 to 1337
Property changes on: federation/trunk/picketlink-bindings/src/test/resources/responseIDP
___________________________________________________________________
Added: svn:mergeinfo
+ /federation/trunk/picketlink-bindings/src/test/resources/responseIDP:1329-1337
Property changes on: product/trunk/picketlink-core/src/test/resources
___________________________________________________________________
Modified: svn:mergeinfo
- /federation/trunk/picketlink-bindings/src/test/resources:1302-1318
+ /federation/trunk/picketlink-bindings/src/test/resources:1302-1318,1329-1337*
Property changes on: product/trunk/picketlink-core/src/test/resources/config
___________________________________________________________________
Added: svn:mergeinfo
+ /federation/trunk/picketlink-bindings/src/test/resources/config:1302-1318,1329-1337
Property changes on: product/trunk/picketlink-core/src/test/resources/endorsed
___________________________________________________________________
Added: svn:mergeinfo
+ /federation/trunk/picketlink-bindings/src/test/resources/endorsed:1302-1318,1329-1337
Property changes on: product/trunk/picketlink-core/src/test/resources/jbossws
___________________________________________________________________
Added: svn:mergeinfo
+ /federation/trunk/picketlink-bindings/src/test/resources/jbossws:1302-1318,1329-1337
Property changes on: product/trunk/picketlink-core/src/test/resources/keystore
___________________________________________________________________
Added: svn:mergeinfo
+ /federation/trunk/picketlink-bindings/src/test/resources/keystore:1302-1318,1329-1337
Property changes on: product/trunk/picketlink-core/src/test/resources/log4j.xml
___________________________________________________________________
Added: svn:mergeinfo
+ /federation/trunk/picketlink-bindings/src/test/resources/log4j.xml:1302-1318,1329-1337
Property changes on: product/trunk/picketlink-core/src/test/resources/logging.properties
___________________________________________________________________
Added: svn:mergeinfo
+ /federation/trunk/picketlink-bindings/src/test/resources/logging.properties:1302-1318,1329-1337
Property changes on: product/trunk/picketlink-core/src/test/resources/metadata
___________________________________________________________________
Added: svn:mergeinfo
+ /federation/trunk/picketlink-bindings/src/test/resources/metadata:1302-1318,1329-1337
Property changes on: product/trunk/picketlink-core/src/test/resources/openid
___________________________________________________________________
Added: svn:mergeinfo
+ /federation/trunk/picketlink-bindings/src/test/resources/openid:1302-1318,1329-1337
Property changes on: product/trunk/picketlink-core/src/test/resources/parser
___________________________________________________________________
Added: svn:mergeinfo
+ /federation/trunk/picketlink-bindings/src/test/resources/parser:1302-1318,1329-1337
Property changes on: product/trunk/picketlink-core/src/test/resources/parser/saml2
___________________________________________________________________
Modified: svn:mergeinfo
- /federation/trunk/picketlink-bindings/src/test/resources/parser/saml2:1302-1318
/federation/trunk/picketlink-fed-core/src/test/resources/parser/saml2:1327-1328
+ /federation/trunk/picketlink-bindings/src/test/resources/parser/saml2:1302-1318,1329-1337
/federation/trunk/picketlink-fed-core/src/test/resources/parser/saml2:1327-1328
Property changes on: product/trunk/picketlink-core/src/test/resources/saml
___________________________________________________________________
Added: svn:mergeinfo
+ /federation/trunk/picketlink-bindings/src/test/resources/saml:1302-1318,1329-1337
Property changes on: product/trunk/picketlink-core/src/test/resources/saml-xacml
___________________________________________________________________
Added: svn:mergeinfo
+ /federation/trunk/picketlink-bindings/src/test/resources/saml-xacml:1302-1318,1329-1337
Property changes on: product/trunk/picketlink-core/src/test/resources/saml2
___________________________________________________________________
Added: svn:mergeinfo
+ /federation/trunk/picketlink-bindings/src/test/resources/saml2:1302-1318,1329-1337
Property changes on: product/trunk/picketlink-core/src/test/resources/saml2/redirect
___________________________________________________________________
Modified: svn:mergeinfo
- /federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect:1321-1324
+ /federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect:1321-1324,1329-1337
Modified: 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/WEB-INF/picketlink-idfed.xml 2012-01-31 22:11:50 UTC (rev 1356)
+++ product/trunk/picketlink-core/src/test/resources/saml2/redirect/idp-sig/WEB-INF/picketlink-idfed.xml 2012-01-31 22:12:56 UTC (rev 1357)
@@ -2,7 +2,7 @@
<IdentityURL>${idp-sig.url::http://192.168.1.1:8080/idp-sig/}
</IdentityURL>
<Trust>
- <Domains>192.168.1.1, 192.168.1.2</Domains>
+ <Domains>192.168.1.1, 192.168.1.2, 192.168.1.4</Domains>
</Trust>
<KeyProvider
ClassName="org.picketlink.identity.federation.core.impl.KeyStoreKeyManager">
@@ -14,6 +14,7 @@
<Auth Key="iterationCount" Value="11" />
<ValidatingAlias Key="192.168.1.1" Value="servercert" />
<ValidatingAlias Key="192.168.1.2" Value="servercert" />
+ <ValidatingAlias Key="192.168.1.4" Value="servercert" />
</KeyProvider>
<!-- <KeyProvider -->
<!-- ClassName="org.picketlink.identity.federation.core.impl.KeyStoreKeyManager"> -->
Deleted: product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/sales-sig/WEB-INF/jbid_test_keystore.jks
===================================================================
(Binary files differ)
Copied: product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/sales-sig/WEB-INF/jbid_test_keystore.jks (from rev 1337, federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/sales-sig/WEB-INF/jbid_test_keystore.jks)
===================================================================
(Binary files differ)
Deleted: product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/sales-sig/WEB-INF/picketlink-handlers.xml
===================================================================
--- federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/sales-sig/WEB-INF/picketlink-handlers.xml 2011-12-02 15:02:23 UTC (rev 1337)
+++ product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/sales-sig/WEB-INF/picketlink-handlers.xml 2012-01-31 22:12:56 UTC (rev 1357)
@@ -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/sales-sig/WEB-INF/picketlink-handlers.xml (from rev 1337, federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/sales-sig/WEB-INF/picketlink-handlers.xml)
===================================================================
--- product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/sales-sig/WEB-INF/picketlink-handlers.xml (rev 0)
+++ product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/sales-sig/WEB-INF/picketlink-handlers.xml 2012-01-31 22:12:56 UTC (rev 1357)
@@ -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/sales-sig/WEB-INF/picketlink-idfed.xml
===================================================================
--- federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/sales-sig/WEB-INF/picketlink-idfed.xml 2011-12-02 15:02:23 UTC (rev 1337)
+++ product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/sales-sig/WEB-INF/picketlink-idfed.xml 2012-01-31 22:12:56 UTC (rev 1357)
@@ -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.4:8080/sales/}
- </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/sales-sig/WEB-INF/picketlink-idfed.xml (from rev 1337, federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/sales-sig/WEB-INF/picketlink-idfed.xml)
===================================================================
--- product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/sales-sig/WEB-INF/picketlink-idfed.xml (rev 0)
+++ product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/sales-sig/WEB-INF/picketlink-idfed.xml 2012-01-31 22:12:56 UTC (rev 1357)
@@ -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.4:8080/sales/}
+ </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/sales-sig/roles.properties
===================================================================
--- federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/sales-sig/roles.properties 2011-12-02 15:02:23 UTC (rev 1337)
+++ product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/sales-sig/roles.properties 2012-01-31 22:12:56 UTC (rev 1357)
@@ -1 +0,0 @@
-manager=manager
\ No newline at end of file
Copied: product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/sales-sig/roles.properties (from rev 1337, federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/sales-sig/roles.properties)
===================================================================
--- product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/sales-sig/roles.properties (rev 0)
+++ product/trunk/picketlink-core/src/test/resources/saml2/redirect/sp/sales-sig/roles.properties 2012-01-31 22:12:56 UTC (rev 1357)
@@ -0,0 +1 @@
+manager=manager
\ No newline at end of file
Property changes on: product/trunk/picketlink-core/src/test/resources/sts
___________________________________________________________________
Added: svn:mergeinfo
+ /federation/trunk/picketlink-bindings/src/test/resources/sts:1302-1318,1329-1337
Property changes on: product/trunk/picketlink-core/src/test/resources/sts-client.properties
___________________________________________________________________
Added: svn:mergeinfo
+ /federation/trunk/picketlink-bindings/src/test/resources/sts-client.properties:1302-1318,1329-1337
Property changes on: product/trunk/picketlink-core/src/test/resources/wstrust
___________________________________________________________________
Added: svn:mergeinfo
+ /federation/trunk/picketlink-bindings/src/test/resources/wstrust:1302-1318,1329-1337
Property changes on: product/trunk/picketlink-core/src/test/resources/xacml
___________________________________________________________________
Added: svn:mergeinfo
+ /federation/trunk/picketlink-bindings/src/test/resources/xacml:1302-1318,1329-1337
Property changes on: product/trunk/picketlink-core/src/test/resources/xml
___________________________________________________________________
Added: svn:mergeinfo
+ /federation/trunk/picketlink-bindings/src/test/resources/xml:1302-1318,1329-1337
More information about the jboss-cvs-commits
mailing list