Author: indika Date: Wed May 13 23:32:56 2009 New Revision: 35765 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=35765
Log: minor refractor Modified: branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/datasource/JNDIBasedDataSourceRepository.java branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceFactory.java branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/datasource/serializer/DataSourceInformationSerializer.java branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/jmx/JmxSecretAuthenticator.java branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/definition/IdentityKeyStoreInformation.java branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/definition/KeyStoreInformation.java branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformation.java branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformationFactory.java branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretManager.java branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/tool/CipherTool.java Modified: branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/datasource/JNDIBasedDataSourceRepository.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/datasource/JNDIBasedDataSourceRepository.java?rev=35765&r1=35764&r2=35765&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/datasource/JNDIBasedDataSourceRepository.java (original) +++ branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/datasource/JNDIBasedDataSourceRepository.java Wed May 13 23:32:56 2009 @@ -119,7 +119,7 @@ String url = information.getUrl(); String user = information.getSecretInformation().getUser(); - String password = information.getSecretInformation().getResolvedPassword(); + String password = information.getSecretInformation().getResolvedSecret(); String maxActive = String.valueOf(information.getMaxActive()); String maxIdle = String.valueOf(information.getMaxIdle()); Modified: branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceFactory.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceFactory.java?rev=35765&r1=35764&r2=35765&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceFactory.java (original) +++ branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceFactory.java Wed May 13 23:32:56 2009 @@ -64,7 +64,7 @@ } String user = dataSourceInformation.getSecretInformation().getUser(); - String password = dataSourceInformation.getSecretInformation().getResolvedPassword(); + String password = dataSourceInformation.getSecretInformation().getResolvedSecret(); int defaultTransactionIsolation = dataSourceInformation.getDefaultTransactionIsolation(); Modified: branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/datasource/serializer/DataSourceInformationSerializer.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/datasource/serializer/DataSourceInformationSerializer.java?rev=35765&r1=35764&r2=35765&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/datasource/serializer/DataSourceInformationSerializer.java (original) +++ branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/datasource/serializer/DataSourceInformationSerializer.java Wed May 13 23:32:56 2009 @@ -61,7 +61,7 @@ user); } - String password = secretInformation.getAliasPassword(); + String password = secretInformation.getAliasSecret(); if (password != null && !"".equals(password)) { addProperty(properties, prefix + SecurityConstants.PROP_PASSWORD, password); Modified: branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/jmx/JmxSecretAuthenticator.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/jmx/JmxSecretAuthenticator.java?rev=35765&r1=35764&r2=35765&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/jmx/JmxSecretAuthenticator.java (original) +++ branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/jmx/JmxSecretAuthenticator.java Wed May 13 23:32:56 2009 @@ -40,7 +40,7 @@ String password = (aCredentials[1] != null ? aCredentials[1] : ""); // perform authentication - if (secretInformation.getUser().equals(username) && password.equals(secretInformation.getResolvedPassword())) { + if (secretInformation.getUser().equals(username) && password.equals(secretInformation.getResolvedSecret())) { return new Subject(true, Collections.singleton(new JMXPrincipal(username)), Collections.EMPTY_SET, Modified: branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/definition/IdentityKeyStoreInformation.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/definition/IdentityKeyStoreInformation.java?rev=35765&r1=35764&r2=35765&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/definition/IdentityKeyStoreInformation.java (original) +++ branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/definition/IdentityKeyStoreInformation.java Wed May 13 23:32:56 2009 @@ -50,7 +50,7 @@ KeyStore keyStore = this.getIdentityKeyStore(); KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance( KeyManagerFactory.getDefaultAlgorithm()); - keyManagerFactory.init(keyStore, keyPasswordProvider.getResolvedPassword().toCharArray()); + keyManagerFactory.init(keyStore, keyPasswordProvider.getResolvedSecret().toCharArray()); return keyManagerFactory; } catch (Exception e) { Modified: branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/definition/KeyStoreInformation.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/definition/KeyStoreInformation.java?rev=35765&r1=35764&r2=35765&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/definition/KeyStoreInformation.java (original) +++ branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/definition/KeyStoreInformation.java Wed May 13 23:32:56 2009 @@ -120,7 +120,7 @@ if (log.isDebugEnabled()) { log.debug("Loading KeyStore with type : " + storeType); } - String keyStorePassword = this.keyStorePasswordProvider.getResolvedPassword(); + String keyStorePassword = this.keyStorePasswordProvider.getResolvedSecret(); switch (storeType) { case JKS: IKeyStoreLoader jksKeyStoreLoader = new JKSKeyStoreLoader(location, Modified: branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformation.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformation.java?rev=35765&r1=35764&r2=35765&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformation.java (original) +++ branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformation.java Wed May 13 23:32:56 2009 @@ -25,10 +25,10 @@ public class SecretInformation { private String user; - private String aliasPassword; - private String passwordPrompt; - private SecretCallbackHandler passwordProvider; - + private String aliasSecret; + private String secretPrompt; + private SecretCallbackHandler secretProvider; + public String getUser() { return user; } @@ -37,46 +37,49 @@ this.user = user; } - public String getAliasPassword() { - return aliasPassword; + public String getAliasSecret() { + return aliasSecret; } - public void setAliasPassword(String aliasPassword) { - this.aliasPassword = aliasPassword; + public void setAliasSecret(String aliasSecret) { + this.aliasSecret = aliasSecret; } - - public String getPasswordPrompt() { - return passwordPrompt; + + public String getSecretPrompt() { + return secretPrompt; } - public void setPasswordPrompt(String passwordPrompt) { - this.passwordPrompt = passwordPrompt; + public void setSecretPrompt(String secretPrompt) { + this.secretPrompt = secretPrompt; } /** * Get actual password based on SecretCallbackHandler and alias password * If SecretCallbackHandler is null, then returns alias password - * @return Actual password + * + * @return Actual password */ - public String getResolvedPassword() { + public String getResolvedSecret() { - if (passwordProvider != null) { - if (aliasPassword != null && !"".equals(aliasPassword)) { - return getSecret(passwordProvider, aliasPassword, passwordPrompt); + if (secretProvider != null) { + if (aliasSecret != null && !"".equals(aliasSecret)) { + return getSecret(secretProvider, aliasSecret, secretPrompt); } } - return aliasPassword; + return aliasSecret; } - - public SecretCallbackHandler getPasswordProvider() { - return passwordProvider; + + public SecretCallbackHandler getSecretProvider() { + return secretProvider; } - public void setPasswordProvider(SecretCallbackHandler passwordProvider) { - this.passwordProvider = passwordProvider; + public void setSecretProvider(SecretCallbackHandler secretProvider) { + this.secretProvider = secretProvider; } - - private String getSecret(SecretCallbackHandler secretCallbackHanlder, String encryptedPassword, String prompt) { + + private String getSecret(SecretCallbackHandler secretCallbackHanlder, + String encryptedPassword, String prompt) { + SecretLoadingModule secretLoadingModule = new SecretLoadingModule(); secretLoadingModule.init(new SecretCallbackHandler[]{secretCallbackHanlder}); SingleSecretCallback secretCallback = new SingleSecretCallback(encryptedPassword); @@ -86,6 +89,4 @@ secretLoadingModule.load(new SecretCallback[]{secretCallback}); return secretCallback.getSecret(); } - - } Modified: branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformationFactory.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformationFactory.java?rev=35765&r1=35764&r2=35765&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformationFactory.java (original) +++ branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformationFactory.java Wed May 13 23:32:56 2009 @@ -62,7 +62,7 @@ String.class); if (password != null && !"".equals(password)) { - secretInformation.setAliasPassword(password); + secretInformation.setAliasSecret(password); } // set specific password provider if configured @@ -77,8 +77,8 @@ SecurityConstants.GLOBAL_PREFIX + SecurityConstants.PROP_SECRET_PROVIDER); } - secretInformation.setPasswordProvider(passwordProvider); - secretInformation.setPasswordPrompt(passwordPrompt); + secretInformation.setSecretProvider(passwordProvider); + secretInformation.setSecretPrompt(passwordPrompt); return secretInformation; } @@ -96,10 +96,10 @@ String aliasPassword, String passwordPrompt) { SecretInformation secretInformation = new SecretInformation(); - secretInformation.setAliasPassword(aliasPassword); - secretInformation.setPasswordProvider( + secretInformation.setAliasSecret(aliasPassword); + secretInformation.setSecretProvider( SecretCallbackHandlerFactory.createSecretCallbackHandler(secretProvider)); - secretInformation.setPasswordPrompt(passwordPrompt); + secretInformation.setSecretPrompt(passwordPrompt); return secretInformation; } } Modified: branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretManager.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretManager.java?rev=35765&r1=35764&r2=35765&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretManager.java (original) +++ branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretManager.java Wed May 13 23:32:56 2009 @@ -109,11 +109,11 @@ String identityKeyPass = identityInformation - .getKeyPasswordProvider().getResolvedPassword(); + .getKeyPasswordProvider().getResolvedSecret(); String identityStorePass = identityInformation - .getKeyStorePasswordProvider().getResolvedPassword(); + .getKeyStorePasswordProvider().getResolvedSecret(); String trustStorePass = trustInformation - .getKeyStorePasswordProvider().getResolvedPassword(); + .getKeyStorePasswordProvider().getResolvedSecret(); if (!validatePasswords(identityStorePass, identityKeyPass, trustStorePass)) { if (log.isDebugEnabled()) { Modified: branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/tool/CipherTool.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/tool/CipherTool.java?rev=35765&r1=35764&r2=35765&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/tool/CipherTool.java (original) +++ branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/tool/CipherTool.java Wed May 13 23:32:56 2009 @@ -280,7 +280,7 @@ String storePass = getArgument(cmd, STORE_PASS, null); assertEmpty(storePass, STORE_PASS); SecretInformation secretInformation = new SecretInformation(); - secretInformation.setAliasPassword(storePass); + secretInformation.setAliasSecret(storePass); information.setKeyStorePasswordProvider(secretInformation); return information; @@ -303,7 +303,7 @@ String storePass = getArgument(cmd, STORE_PASS, null); assertEmpty(storePass, STORE_PASS); SecretInformation secretInformation = new SecretInformation(); - secretInformation.setAliasPassword(storePass); + secretInformation.setAliasSecret(storePass); information.setKeyStorePasswordProvider(secretInformation); return information; _______________________________________________ Esb-java-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
