[portal-commits] JBoss Portal SVN: r6636 - in trunk: identity/src/main/org/jboss/portal/identity and 4 other directories.

Author: bdaw Date: 2007-03-12 09:27:32 -0400 (Mon, 12 Mar 2007) New Revision: 6636 Modified: trunk/core/src/resources/portal-core-sar/conf/identity/standardidentity-config.xml trunk/identity/src/main/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java trunk/identity/src/main/org/jboss/portal/identity/IdentityServiceControllerImpl.java trunk/identity/src/main/org/jboss/portal/identity/config/metadata/DatasourceMetaData.java trunk/identity/src/main/org/jboss/portal/identity/config/metadata/ModuleMetaData.java trunk/identity/src/main/org/jboss/portal/identity/service/IdentityModuleService.java trunk/identity/src/main/org/jboss/portal/test/identity/ConfigurationTestCase.java trunk/identity/src/resources/test/config/standardidentity-config.xml Log: - change jndiName to JNDIName Modified: trunk/core/src/resources/portal-core-sar/conf/identity/standardidentity-config.xml =================================================================== --- trunk/core/src/resources/portal-core-sar/conf/identity/standardidentity-config.xml 2007-03-12 12:58:18 UTC (rev 6635) +++ trunk/core/src/resources/portal-core-sar/conf/identity/standardidentity-config.xml 2007-03-12 13:27:32 UTC (rev 6636) @@ -26,7 +26,7 @@ <!-- <!DOCTYPE identity-configuration PUBLIC "-//JBoss Portal//DTD JBoss Identity Configuration 1.0//EN" - "http://www.jboss.org/portal/dtd/identity-config_2_6.dtd"> + "http://www.jboss.org/portal/dtd/identity-config_1_0.dtd"> --> <identity-configuration> @@ -58,7 +58,7 @@ <value>password</value> </option> <option> - <name>jndiName</name> + <name>jNDIName</name> <value>java:/portal/LDAPConnectionContext</value> </option> </config> @@ -77,7 +77,7 @@ <!--set of options that are set in instantiated object--> <config> <option> - <name>jndiName</name> + <name>jNDIName</name> <value>java:/portal/UserProfileModule</value> </option> <option> @@ -109,7 +109,7 @@ <value>java:/portal/IdentitySessionFactory</value> </option> <option> - <name>jndiName</name> + <name>jNDIName</name> <value>java:/portal/UserModule</value> </option> </config> @@ -131,7 +131,7 @@ <value>java:/portal/IdentitySessionFactory</value> </option> <option> - <name>jndiName</name> + <name>jNDIName</name> <value>java:/portal/RoleModule</value> </option> </config> @@ -153,7 +153,7 @@ <value>java:/portal/IdentitySessionFactory</value> </option> <option> - <name>jndiName</name> + <name>jNDIName</name> <value>java:/portal/MembershipModule</value> </option> </config> @@ -175,7 +175,7 @@ <value>java:/portal/IdentitySessionFactory</value> </option> <option> - <name>jndiName</name> + <name>jNDIName</name> <value>java:/portal/DBUserProfileModule</value> </option> </config> @@ -194,7 +194,7 @@ <!--set of options that are set in instantiated object--> <config> <option> - <name>jndiName</name> + <name>jNDIName</name> <value>java:/portal/UserModule</value> </option> <option> @@ -216,7 +216,7 @@ <!--set of options that are set in instantiated object--> <config> <option> - <name>jndiName</name> + <name>jNDIName</name> <value>java:/portal/RoleModule</value> </option> <option> @@ -238,7 +238,7 @@ <!--set of options that are set in instantiated object--> <config> <option> - <name>jndiName</name> + <name>jNDIName</name> <value>java:/portal/MembershipModule</value> </option> <option> @@ -260,7 +260,7 @@ <!--set of options that are set in instantiated object--> <config> <option> - <name>jndiName</name> + <name>jNDIName</name> <value>java:/portal/LDAPUserProfileModule</value> </option> <option> Modified: trunk/identity/src/main/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java 2007-03-12 12:58:18 UTC (rev 6635) +++ trunk/identity/src/main/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java 2007-03-12 13:27:32 UTC (rev 6636) @@ -59,11 +59,11 @@ } //check if we don't delegate to ourselves: - if (getJndiName().equals(getDbModuleJNDIName())) + if (getJNDIName().equals(getDbModuleJNDIName())) { throw new IdentityException("Cannot delegate to itself - correct dbModuleJNDIName option"); } - if (getJndiName().equals(getLdapModuleJNDIName())) + if (getJNDIName().equals(getLdapModuleJNDIName())) { throw new IdentityException("Cannot delegate to itself - correct ldapModuleJNDIName option"); } Modified: trunk/identity/src/main/org/jboss/portal/identity/IdentityServiceControllerImpl.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/IdentityServiceControllerImpl.java 2007-03-12 12:58:18 UTC (rev 6635) +++ trunk/identity/src/main/org/jboss/portal/identity/IdentityServiceControllerImpl.java 2007-03-12 13:27:32 UTC (rev 6636) @@ -174,7 +174,7 @@ //check if defaults contains all information if (module.getType() == null || module.getImplementation() == null || - //module.getJndiName() == null || + //module.getJNDIName() == null || module.getServiceName() == null || module.getConfig() == null) { Modified: trunk/identity/src/main/org/jboss/portal/identity/config/metadata/DatasourceMetaData.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/config/metadata/DatasourceMetaData.java 2007-03-12 12:58:18 UTC (rev 6635) +++ trunk/identity/src/main/org/jboss/portal/identity/config/metadata/DatasourceMetaData.java 2007-03-12 13:27:32 UTC (rev 6636) @@ -69,16 +69,6 @@ this.className = className; } - /*public String getJndiName() - { - return jndiName; - } - - public void setJndiName(String jndiName) - { - this.jndiName = jndiName; - }*/ - public ConfigMetaData getConfig() { return config; Modified: trunk/identity/src/main/org/jboss/portal/identity/config/metadata/ModuleMetaData.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/config/metadata/ModuleMetaData.java 2007-03-12 12:58:18 UTC (rev 6635) +++ trunk/identity/src/main/org/jboss/portal/identity/config/metadata/ModuleMetaData.java 2007-03-12 13:27:32 UTC (rev 6636) @@ -80,16 +80,6 @@ this.className = className; } - /*public String getJndiName() - { - return jndiName; - } - - public void setJndiName(String jndiName) - { - this.jndiName = jndiName; - }*/ - public ConfigMetaData getConfig() { return config; Modified: trunk/identity/src/main/org/jboss/portal/identity/service/IdentityModuleService.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/service/IdentityModuleService.java 2007-03-12 12:58:18 UTC (rev 6635) +++ trunk/identity/src/main/org/jboss/portal/identity/service/IdentityModuleService.java 2007-03-12 13:27:32 UTC (rev 6636) @@ -142,14 +142,14 @@ this.identityContext = identityContext; } - public String getJndiName() + public String getJNDIName() { return jndiName; } - public void setJndiName(String jndiName) + public void setJNDIName(String JNDIName) { - this.jndiName = jndiName; + this.jndiName = JNDIName; } public Map getInitOptions() Modified: trunk/identity/src/main/org/jboss/portal/test/identity/ConfigurationTestCase.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/test/identity/ConfigurationTestCase.java 2007-03-12 12:58:18 UTC (rev 6635) +++ trunk/identity/src/main/org/jboss/portal/test/identity/ConfigurationTestCase.java 2007-03-12 13:27:32 UTC (rev 6636) @@ -142,7 +142,7 @@ controller.start(); IdentityModuleService service = (IdentityModuleService)controller.getIdentityContext().getObject(IdentityContext.TYPE_USER_MODULE); - assertEquals("java:/portal/UserModule", service.getJndiName()); + assertEquals("java:/portal/UserModule", service.getJNDIName()); } Modified: trunk/identity/src/resources/test/config/standardidentity-config.xml =================================================================== --- trunk/identity/src/resources/test/config/standardidentity-config.xml 2007-03-12 12:58:18 UTC (rev 6635) +++ trunk/identity/src/resources/test/config/standardidentity-config.xml 2007-03-12 13:27:32 UTC (rev 6636) @@ -56,7 +56,7 @@ <value>password</value> </option> <option> - <name>jndiName</name> + <name>jNDIName</name> <value>java:/portal/LDAPConnectionContext</value> </option> </config> @@ -75,7 +75,7 @@ <!--set of options that are passed to a class constructor--> <config> <option> - <name>jndiName</name> + <name>jNDIName</name> <value>java:/portal/UserProfileModule</value> </option> <option> @@ -107,7 +107,7 @@ <value>java:/portal/IdentitySessionFactory</value> </option> <option> - <name>jndiName</name> + <name>jNDIName</name> <value>java:/portal/UserModule</value> </option> </config> @@ -129,7 +129,7 @@ <value>java:/portal/IdentitySessionFactory</value> </option> <option> - <name>jndiName</name> + <name>jNDIName</name> <value>java:/portal/RoleModule</value> </option> </config> @@ -151,7 +151,7 @@ <value>java:/portal/IdentitySessionFactory</value> </option> <option> - <name>jndiName</name> + <name>jNDIName</name> <value>java:/portal/MembershipModule</value> </option> </config> @@ -173,7 +173,7 @@ <value>java:/portal/IdentitySessionFactory</value> </option> <option> - <name>jndiName</name> + <name>jNDIName</name> <value>java:/portal/DBUserProfileModule</value> </option> </config> @@ -192,7 +192,7 @@ <!--set of options that are passed to a class constructor--> <config> <option> - <name>jndiName</name> + <name>jNDIName</name> <value>java:/portal/UserModule</value> </option> <option> @@ -214,7 +214,7 @@ <!--set of options that are passed to a class constructor--> <config> <option> - <name>jndiName</name> + <name>jNDIName</name> <value>java:/portal/RoleModule</value> </option> <option> @@ -236,7 +236,7 @@ <!--set of options that are passed to a class constructor--> <config> <option> - <name>jndiName</name> + <name>jNDIName</name> <value>java:/portal/MembershipModule</value> </option> <option> @@ -271,7 +271,7 @@ <value>ldap-profile.xml</value> </option>--> <option> - <name>jndiName</name> + <name>jNDIName</name> <value>java:/portal/LDAPUserProfileModule</value> </option> <option>