Author: anil.saldhana(a)jboss.com Date: 2011-03-09 13:55:24 -0500 (Wed, 09 Mar 2011) New Revision: 803 Modified: federation/trunk/picketlink-webapps/employee-post-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml federation/trunk/picketlink-webapps/employee-post/src/main/webapp/WEB-INF/picketlink-idfed.xml federation/trunk/picketlink-webapps/employee-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml federation/trunk/picketlink-webapps/employee-standalone/src/main/webapp/WEB-INF/picketlink-idfed.xml federation/trunk/picketlink-webapps/employee/src/main/webapp/WEB-INF/picketlink-idfed.xml federation/trunk/picketlink-webapps/idp-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml federation/trunk/picketlink-webapps/idp-standalone/src/main/webapp/WEB-INF/picketlink-idfed.xml federation/trunk/picketlink-webapps/idp/src/main/webapp/WEB-INF/picketlink-idfed.xml federation/trunk/picketlink-webapps/sales-post-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml federation/trunk/picketlink-webapps/sales-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml federation/trunk/picketlink-webapps/sales-standalone/src/main/webapp/WEB-INF/picketlink-idfed.xml federation/trunk/picketlink-webapps/sales/src/main/webapp/WEB-INF/picketlink-idfed.xml Log: use sys prop friendly strings Modified: federation/trunk/picketlink-webapps/employee/src/main/webapp/WEB-INF/picketlink-idfed.xml =================================================================== --- federation/trunk/picketlink-webapps/employee/src/main/webapp/WEB-INF/picketlink-idfed.xml 2011-03-09 18:54:52 UTC (rev 802) +++ federation/trunk/picketlink-webapps/employee/src/main/webapp/WEB-INF/picketlink-idfed.xml 2011-03-09 18:55:24 UTC (rev 803) @@ -1,4 +1,4 @@ <PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0" ServerEnvironment="tomcat"> - <IdentityURL>http://localhost:8080/idp/</IdentityURL> - <ServiceURL>http://localhost:8080/employee/</ServiceURL> + <IdentityURL>${idp.url::http://localhost:8080/idp/}</IdentityURL> + <ServiceURL>${employee.url::http://localhost:8080/employee/}</ServiceURL> </PicketLinkSP> Modified: federation/trunk/picketlink-webapps/employee-post/src/main/webapp/WEB-INF/picketlink-idfed.xml =================================================================== --- federation/trunk/picketlink-webapps/employee-post/src/main/webapp/WEB-INF/picketlink-idfed.xml 2011-03-09 18:54:52 UTC (rev 802) +++ federation/trunk/picketlink-webapps/employee-post/src/main/webapp/WEB-INF/picketlink-idfed.xml 2011-03-09 18:55:24 UTC (rev 803) @@ -1,4 +1,4 @@ <PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0" ServerEnvironment="tomcat"> - <IdentityURL>http://localhost:8080/idp/</IdentityURL> - <ServiceURL>http://localhost:8080/employee-post/</ServiceURL> + <IdentityURL>${idp.url::http://localhost:8080/idp/}</IdentityURL> + <ServiceURL>${employee-post.url::http://localhost:8080/employee-post/}</ServiceURL> </PicketLinkSP> Modified: federation/trunk/picketlink-webapps/employee-post-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml =================================================================== --- federation/trunk/picketlink-webapps/employee-post-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml 2011-03-09 18:54:52 UTC (rev 802) +++ federation/trunk/picketlink-webapps/employee-post-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml 2011-03-09 18:55:24 UTC (rev 803) @@ -1,6 +1,6 @@ <PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0" ServerEnvironment="tomcat"> - <IdentityURL>http://localhost:8080/idp-sig/</IdentityURL> - <ServiceURL>http://localhost:8080/employee-post-sig/</ServiceURL> + <IdentityURL>${idp-sig.url::http://localhost:8080/idp-sig/}</IdentityURL> + <ServiceURL>${employee-post-sig.url::http://localhost:8080/employee-post-sig/}</ServiceURL> <KeyProvider ClassName="org.picketlink.identity.federation.core.impl.KeyStoreKeyManager"> <Auth Key="KeyStoreURL" Value="/jbid_test_keystore.jks" /> <Auth Key="KeyStorePass" Value="store123" /> Modified: federation/trunk/picketlink-webapps/employee-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml =================================================================== --- federation/trunk/picketlink-webapps/employee-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml 2011-03-09 18:54:52 UTC (rev 802) +++ federation/trunk/picketlink-webapps/employee-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml 2011-03-09 18:55:24 UTC (rev 803) @@ -1,6 +1,6 @@ <PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0" ServerEnvironment="tomcat"> - <IdentityURL>http://localhost:8080/idp-sig/</IdentityURL> - <ServiceURL>http://localhost:8080/sales-sig/</ServiceURL> + <IdentityURL>${idp-sig.url::http://localhost:8080/idp-sig/}</IdentityURL> + <ServiceURL>${sales-sig.url::http://localhost:8080/sales-sig/}</ServiceURL> <KeyProvider ClassName="org.picketlink.identity.federation.core.impl.KeyStoreKeyManager"> <Auth Key="KeyStoreURL" Value="jbid_test_keystore.jks" /> <!-- <Auth Key="KeyStorePass" Value="store123" /> --> Modified: federation/trunk/picketlink-webapps/employee-standalone/src/main/webapp/WEB-INF/picketlink-idfed.xml =================================================================== --- federation/trunk/picketlink-webapps/employee-standalone/src/main/webapp/WEB-INF/picketlink-idfed.xml 2011-03-09 18:54:52 UTC (rev 802) +++ federation/trunk/picketlink-webapps/employee-standalone/src/main/webapp/WEB-INF/picketlink-idfed.xml 2011-03-09 18:55:24 UTC (rev 803) @@ -1,6 +1,6 @@ <PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0" ServerEnvironment="tomcat"> - <IdentityURL>http://localhost:8080/idp-standalone/</IdentityURL> - <ServiceURL>http://localhost:8080/employee-standalone/</ServiceURL> + <IdentityURL>${idp-standalone.url::http://localhost:8080/idp-standalone/}</IdentityURL> + <ServiceURL>${employee-standalone.url::http://localhost:8080/employee-standalone/}</ServiceURL> <Trust> <Domains>localhost,jboss.com,jboss.org,redhat.com</Domains> </Trust> Modified: federation/trunk/picketlink-webapps/idp/src/main/webapp/WEB-INF/picketlink-idfed.xml =================================================================== --- federation/trunk/picketlink-webapps/idp/src/main/webapp/WEB-INF/picketlink-idfed.xml 2011-03-09 18:54:52 UTC (rev 802) +++ federation/trunk/picketlink-webapps/idp/src/main/webapp/WEB-INF/picketlink-idfed.xml 2011-03-09 18:55:24 UTC (rev 803) @@ -1,6 +1,6 @@ <PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0" > -<IdentityURL>http://localhost:8080/idp/</IdentityURL> +<IdentityURL>${idp.url::http://localhost:8080/idp/}</IdentityURL> <Trust> - <Domains>localhost,jboss.com,jboss.org</Domains> + <Domains>localhost,jboss.com,jboss.org,amazonaws.com</Domains> </Trust> </PicketLinkIDP> Modified: federation/trunk/picketlink-webapps/idp-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml =================================================================== --- federation/trunk/picketlink-webapps/idp-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml 2011-03-09 18:54:52 UTC (rev 802) +++ federation/trunk/picketlink-webapps/idp-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml 2011-03-09 18:55:24 UTC (rev 803) @@ -1,7 +1,7 @@ <PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0" > -<IdentityURL>http://localhost:8080/idp-sig/</IdentityURL> +<IdentityURL>${idp-sig.url::http://localhost:8080/idp-sig/}</IdentityURL> <Trust> - <Domains>localhost,jboss.com,jboss.org,redhat.com</Domains> + <Domains>localhost,jboss.com,jboss.org,redhat.com,amazonaws.com</Domains> </Trust> <KeyProvider ClassName="org.picketlink.identity.federation.core.impl.KeyStoreKeyManager"> <Auth Key="KeyStoreURL" Value="/jbid_test_keystore.jks" /> Modified: federation/trunk/picketlink-webapps/idp-standalone/src/main/webapp/WEB-INF/picketlink-idfed.xml =================================================================== --- federation/trunk/picketlink-webapps/idp-standalone/src/main/webapp/WEB-INF/picketlink-idfed.xml 2011-03-09 18:54:52 UTC (rev 802) +++ federation/trunk/picketlink-webapps/idp-standalone/src/main/webapp/WEB-INF/picketlink-idfed.xml 2011-03-09 18:55:24 UTC (rev 803) @@ -1,6 +1,6 @@ <PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0" AttributeManager="org.picketlink.identity.federation.core.impl.EmptyAttributeManager"> - <IdentityURL>http://localhost:8080/idp-standalone/</IdentityURL> + <IdentityURL>${idp-standalone.url::http://localhost:8080/idp-standalone/}</IdentityURL> <Trust> <Domains>localhost,jboss.com,jboss.org</Domains> </Trust> Modified: federation/trunk/picketlink-webapps/sales/src/main/webapp/WEB-INF/picketlink-idfed.xml =================================================================== --- federation/trunk/picketlink-webapps/sales/src/main/webapp/WEB-INF/picketlink-idfed.xml 2011-03-09 18:54:52 UTC (rev 802) +++ federation/trunk/picketlink-webapps/sales/src/main/webapp/WEB-INF/picketlink-idfed.xml 2011-03-09 18:55:24 UTC (rev 803) @@ -1,4 +1,4 @@ <PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0" ServerEnvironment="tomcat"> - <IdentityURL>http://localhost:8080/idp/</IdentityURL> - <ServiceURL>http://localhost:8080/sales/</ServiceURL> + <IdentityURL>${idp.url::http://localhost:8080/idp/}</IdentityURL> + <ServiceURL>${sales.url::http://localhost:8080/sales/}</ServiceURL> </PicketLinkSP> Modified: federation/trunk/picketlink-webapps/sales-post-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml =================================================================== --- federation/trunk/picketlink-webapps/sales-post-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml 2011-03-09 18:54:52 UTC (rev 802) +++ federation/trunk/picketlink-webapps/sales-post-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml 2011-03-09 18:55:24 UTC (rev 803) @@ -1,6 +1,6 @@ <PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0" ServerEnvironment="tomcat"> - <IdentityURL>http://localhost:8080/idp-sig/</IdentityURL> - <ServiceURL>http://localhost:8080/sales-post-sig/</ServiceURL> + <IdentityURL>${idp-sig.url::http://localhost:8080/idp-sig/}</IdentityURL> + <ServiceURL>${sales-post-sig.url::http://localhost:8080/sales-post-sig/}</ServiceURL> <KeyProvider ClassName="org.picketlink.identity.federation.core.impl.KeyStoreKeyManager"> <Auth Key="KeyStoreURL" Value="/jbid_test_keystore.jks" /> <Auth Key="KeyStorePass" Value="store123" /> Modified: federation/trunk/picketlink-webapps/sales-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml =================================================================== --- federation/trunk/picketlink-webapps/sales-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml 2011-03-09 18:54:52 UTC (rev 802) +++ federation/trunk/picketlink-webapps/sales-sig/src/main/webapp/WEB-INF/picketlink-idfed.xml 2011-03-09 18:55:24 UTC (rev 803) @@ -1,6 +1,6 @@ <PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0" ServerEnvironment="tomcat"> - <IdentityURL>http://localhost:8080/idp-sig/</IdentityURL> - <ServiceURL>http://localhost:8080/sales-sig/</ServiceURL> + <IdentityURL>${idp-sig.url::http://localhost:8080/idp-sig/}</IdentityURL> + <ServiceURL>${sales-sig.url::http://localhost:8080/sales-sig/}</ServiceURL> <KeyProvider ClassName="org.picketlink.identity.federation.core.impl.KeyStoreKeyManager"> <Auth Key="KeyStoreURL" Value="jbid_test_keystore.jks" /> <!-- <Auth Key="KeyStorePass" Value="store123" /> --> Modified: federation/trunk/picketlink-webapps/sales-standalone/src/main/webapp/WEB-INF/picketlink-idfed.xml =================================================================== --- federation/trunk/picketlink-webapps/sales-standalone/src/main/webapp/WEB-INF/picketlink-idfed.xml 2011-03-09 18:54:52 UTC (rev 802) +++ federation/trunk/picketlink-webapps/sales-standalone/src/main/webapp/WEB-INF/picketlink-idfed.xml 2011-03-09 18:55:24 UTC (rev 803) @@ -1,6 +1,6 @@ <PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0" ServerEnvironment="tomcat"> - <IdentityURL>http://localhost:8080/idp-standalone/</IdentityURL> - <ServiceURL>http://localhost:8080/sales-standalone/</ServiceURL> + <IdentityURL>${idp-standalone.url::http://localhost:8080/idp-standalone/}</IdentityURL> + <ServiceURL>${sales-standalone.url::http://localhost:8080/sales-standalone/}</ServiceURL> <Trust> <Domains>localhost,jboss.com,jboss.org,redhat.com</Domains> </Trust>