[picketlink-commits] Picketlink SVN: r1081 - in idm/trunk: picketlink-idm-ldap/src/test/resources/datasources and 1 other directories.

Author: bdaw Date: 2011-07-12 16:28:48 -0400 (Tue, 12 Jul 2011) New Revision: 1081 Modified: idm/trunk/picketlink-idm-ldap/src/test/resources/datasources/directories.xml idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-msad-2k3.xml idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-msad-2k8.xml idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-opends12.xml idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-opends20.xml idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-openldapds.xml idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-redhatds.xml idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-sunds.xml idm/trunk/picketlink-idm-testsuite/integration/ldap/src/test/java/org/picketlink/idm/impl/store/ldap/api/OrganizationLDAPTestCase.java Log: - fix LDAP matrix testsuite Modified: idm/trunk/picketlink-idm-ldap/src/test/resources/datasources/directories.xml =================================================================== --- idm/trunk/picketlink-idm-ldap/src/test/resources/datasources/directories.xml 2011-07-08 17:56:06 UTC (rev 1080) +++ idm/trunk/picketlink-idm-ldap/src/test/resources/datasources/directories.xml 2011-07-12 20:28:48 UTC (rev 1081) @@ -40,10 +40,10 @@ </directory> <directory> <directory-name>OpenDS-2-0</directory-name> - <description>ldap://dev39.qa.atl.jboss.com:2389</description> + <description>ldap://dev39.mw.lab.eng.bos.redhat.com:2389</description> <!--identity configuration file--> <config-file>test-identity-config-opends20.xml</config-file> - <host>dev39.qa.atl.jboss.com</host> + <host>perf15.mw.lab.eng.bos.redhat.com</host> <port>2389</port> <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> <admin-dn>cn=Directory Manager</admin-dn> @@ -55,10 +55,10 @@ </directory> <directory> <directory-name>OpenDS-1-2</directory-name> - <description>ldap://dev39.qa.atl.jboss.com:3389</description> + <description>ldap://dev39.mw.lab.eng.bos.redhat.com:3389</description> <!--identity configuration file--> <config-file>test-identity-config-opends12.xml</config-file> - <host>dev39.qa.atl.jboss.com</host> + <host>dev39.mw.lab.eng.bos.redhat.com</host> <port>3389</port> <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> <admin-dn>cn=Directory Manager</admin-dn> @@ -70,10 +70,10 @@ </directory> <directory> <directory-name>SunDS</directory-name> - <description>ldap://dev39.qa.atl.jboss.com:1389</description> + <description>ldap://dev39.mw.lab.eng.bos.redhat.com:1389</description> <!--identity configuration file--> <config-file>test-identity-config-sunds.xml</config-file> - <host>dev39.qa.atl.jboss.com</host> + <host>dev39.mw.lab.eng.bos.redhat.com</host> <port>1389</port> <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> <admin-dn>cn=Directory Manager</admin-dn> @@ -85,10 +85,10 @@ </directory> <directory> <directory-name>RedHatDS</directory-name> - <description>ldap://dev39.qa.atl.jboss.com:10389</description> + <description>ldap://dev39.mw.lab.eng.bos.redhat.com:10389</description> <config-file>test-identity-config-redhatds.xml</config-file> - <host>dev39.qa.atl.jboss.com</host> + <host>dev39.mw.lab.eng.bos.redhat.com</host> <port>10389</port> <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> <admin-dn>cn=Directory Manager</admin-dn> @@ -100,10 +100,10 @@ </directory> <directory> <directory-name>OpenLDAP</directory-name> - <description>ldap://dev39.qa.atl.jboss.com:389</description> + <description>ldap://dev39.mw.lab.eng.bos.redhat.com:389</description> <config-file>test-identity-config-openldapds.xml</config-file> - <host>dev39.qa.atl.jboss.com</host> + <host>dev39.mw.lab.eng.bos.redhat.com</host> <port>389</port> <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> <admin-dn>cn=Manager,dc=my-domain,dc=com</admin-dn> @@ -145,10 +145,10 @@ </directory> <directory> <directory-name>MSAD-2k3</directory-name> - <description>ldap://dev44.qa.atl.jboss.com:389</description> + <description>ldap://dev44.mw.lab.eng.bos.redhat.com:389</description> <config-file>test-identity-config-msad-2k3.xml</config-file> - <host>dev44.qa.atl.jboss.com</host> + <host>dev44.mw.lab.eng.bos.redhat.com</host> <port>389</port> <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> <admin-dn>JBOSS\jbossqa</admin-dn> @@ -186,4 +186,4 @@ <cleanup-dn>o=jbid,dc=test,dc=domain</cleanup-dn> </directory> -</directories> +</directories> \ No newline at end of file Modified: idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-msad-2k3.xml =================================================================== --- idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-msad-2k3.xml 2011-07-08 17:56:06 UTC (rev 1080) +++ idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-msad-2k3.xml 2011-07-12 20:28:48 UTC (rev 1081) @@ -866,7 +866,7 @@ <options> <option> <name>providerURL</name> - <value>ldaps://dev44.qa.atl.jboss.com:636</value> + <value>ldap://dev44.mw.lab.eng.bos.redhat.com:636</value> </option> <option> <name>adminDN</name> Modified: idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-msad-2k8.xml =================================================================== --- idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-msad-2k8.xml 2011-07-08 17:56:06 UTC (rev 1080) +++ idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-msad-2k8.xml 2011-07-12 20:28:48 UTC (rev 1081) @@ -866,7 +866,7 @@ <options> <option> <name>providerURL</name> - <value>ldaps://vmg13.mw.lab.eng.bos.redhat.com:636</value> + <value>ldap://vmg13.mw.lab.eng.bos.redhat.com:636</value> </option> <option> <name>adminDN</name> Modified: idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-opends12.xml =================================================================== --- idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-opends12.xml 2011-07-08 17:56:06 UTC (rev 1080) +++ idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-opends12.xml 2011-07-12 20:28:48 UTC (rev 1081) @@ -885,7 +885,7 @@ <options> <option> <name>providerURL</name> - <value>ldap://dev39.qa.atl.jboss.com:3389</value> + <value>ldap://dev39.mw.lab.eng.bos.redhat.com:3389</value> </option> <option> <name>adminDN</name> Modified: idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-opends20.xml =================================================================== --- idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-opends20.xml 2011-07-08 17:56:06 UTC (rev 1080) +++ idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-opends20.xml 2011-07-12 20:28:48 UTC (rev 1081) @@ -885,7 +885,7 @@ <options> <option> <name>providerURL</name> - <value>ldap://dev39.qa.atl.jboss.com:2389</value> + <value>ldap://dev39.mw.lab.eng.bos.redhat.com:2389</value> </option> <option> <name>adminDN</name> Modified: idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-openldapds.xml =================================================================== --- idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-openldapds.xml 2011-07-08 17:56:06 UTC (rev 1080) +++ idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-openldapds.xml 2011-07-12 20:28:48 UTC (rev 1081) @@ -876,7 +876,7 @@ <options> <option> <name>providerURL</name> - <value>ldap://dev39.qa.atl.jboss.com:389</value> + <value>ldap://dev39.mw.lab.eng.bos.redhat.com:389</value> </option> <option> <name>adminDN</name> Modified: idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-redhatds.xml =================================================================== --- idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-redhatds.xml 2011-07-08 17:56:06 UTC (rev 1080) +++ idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-redhatds.xml 2011-07-12 20:28:48 UTC (rev 1081) @@ -874,7 +874,7 @@ <options> <option> <name>providerURL</name> - <value>ldap://dev39.qa.atl.jboss.com:10389</value> + <value>ldap://dev39.mw.lab.eng.bos.redhat.com:10389</value> </option> <option> <name>adminDN</name> Modified: idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-sunds.xml =================================================================== --- idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-sunds.xml 2011-07-08 17:56:06 UTC (rev 1080) +++ idm/trunk/picketlink-idm-ldap/src/test/resources/test-identity-config-sunds.xml 2011-07-12 20:28:48 UTC (rev 1081) @@ -149,34 +149,7 @@ <identity-object-type> <name>USER</name> <relationships> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>ORGANIZATION</identity-object-type-ref>--> - <!--</relationship>--> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>COMMUNITY</identity-object-type-ref>--> - <!--</relationship>--> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>OFFICE</identity-object-type-ref>--> - <!--</relationship>--> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>SECURITY</identity-object-type-ref>--> - <!--</relationship>--> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref>--> - <!--</relationship>--> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>PROJECT</identity-object-type-ref>--> - <!--</relationship>--> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>PEOPLE</identity-object-type-ref>--> - <!--</relationship>--> + </relationships> <credentials> <credential-type>PASSWORD</credential-type> @@ -874,7 +847,7 @@ <options> <option> <name>providerURL</name> - <value>ldap://dev39.qa.atl.jboss.com:1389</value> + <value>ldap://dev39.mw.lab.eng.bos.redhat.com:1389</value> </option> <option> <name>adminDN</name> Modified: idm/trunk/picketlink-idm-testsuite/integration/ldap/src/test/java/org/picketlink/idm/impl/store/ldap/api/OrganizationLDAPTestCase.java =================================================================== --- idm/trunk/picketlink-idm-testsuite/integration/ldap/src/test/java/org/picketlink/idm/impl/store/ldap/api/OrganizationLDAPTestCase.java 2011-07-08 17:56:06 UTC (rev 1080) +++ idm/trunk/picketlink-idm-testsuite/integration/ldap/src/test/java/org/picketlink/idm/impl/store/ldap/api/OrganizationLDAPTestCase.java 2011-07-12 20:28:48 UTC (rev 1081) @@ -56,6 +56,8 @@ hibernateTest.start(); ldapTestPOJO.start(); + identityConfig = ldapTestPOJO.getIdentityConfig(); + orgTest = new OrganizationTest(this); ldapTestPOJO.populateClean();