Hi,
$subject. Diff file is attached.
--
Sadeep Jayasumana
Software Engineer
WSO2 Inc.
Email - [email protected]
Mobile - +94 77 22 66 507
diff -r
./src/main/java/org/wso2/carbon/registry/core/config/DataBaseConfiguration.java
../../branch/org.wso2.carbon.registry.core/3.1.0/src/main/java/org/wso2/carbon/registry/core/config/DataBaseConfiguration.java
19d18
< import org.apache.synapse.securevault.SecretResolver;
20a20
> import org.wso2.pwprovider.*;
39d38
< private SecretResolver secretResolver;
40a40
> private PasswordManager passwordManager;
223,229c223,224
< /**
< * Sets a password manager which is responsible for resolving encrypted
passwords
< *
< * @param secretResolver <code>SecretResolver</code> instance
< */
< public void setSecretResolver(SecretResolver secretResolver) {
< this.secretResolver = secretResolver;
---
> public void setPasswordManager(PasswordManager passwordManager) {
> this.passwordManager = passwordManager;
239,242c234,236
< if (secretResolver != null && secretResolver.isInitialized()) {
< String key = configName + "." + SecurityConstants.PROP_PASSWORD;
< if (secretResolver.isTokenProtected(key)) {
< return secretResolver.resolve(password);
---
> if (passwordManager.isInitialized()) {
> if (passwordManager.isTokenProtected(configName + ".password")) {
> return passwordManager.resolve(password);
diff -r
./src/main/java/org/wso2/carbon/registry/core/config/RegistryConfigurationProcessor.java
../../branch/org.wso2.carbon.registry.core/3.1.0/src/main/java/org/wso2/carbon/registry/core/config/RegistryConfigurationProcessor.java
58a59,61
> import org.wso2.pwprovider.PasswordManager;
> import org.wso2.pwprovider.PasswordManagerFactory;
>
117,118c120
< SecretResolver secretResolver =
SecretResolverFactory.create(configElement, false);
<
---
> PasswordManager passwordManager =
> PasswordManagerFactory.create(configElement, false);
125c127
< dataBaseConfiguration.setSecretResolver(secretResolver);
---
> dataBaseConfiguration.setPasswordManager(passwordManager);
302c304
< readRemoteInstances(configElement, registryContext,
secretResolver);
---
> readRemoteInstances(configElement, registryContext,
> passwordManager);
553,554c555
< SecretResolver secretResolver)
< throws RegistryException {
---
> PasswordManager passwordManager)
> throws RegistryException {
606c607
< remoteConfiguration.setSecretResolver(secretResolver);
---
> remoteConfiguration.setPasswordManager(passwordManager);
805c806
< if (tempTenantId > -1) {
---
> if (tempTenantId > 0) {
diff -r
./src/main/java/org/wso2/carbon/registry/core/config/RemoteConfiguration.java
../../branch/org.wso2.carbon.registry.core/3.1.0/src/main/java/org/wso2/carbon/registry/core/config/RemoteConfiguration.java
18,20c18
<
< import org.apache.synapse.securevault.SecretResolver;
< import org.apache.synapse.securevault.SecurityConstants;
---
> import org.wso2.pwprovider.*;
30a29,30
> private PasswordManager passwordManager;
>
34c34,39
< private SecretResolver secretResolver;
---
>
> public void setPasswordManager(PasswordManager passwordManager) {
> this.passwordManager = passwordManager;
> }
>
>
167,169c172,174
< public void setSecretResolver(SecretResolver secretResolver) {
< this.secretResolver = secretResolver;
< }
---
> // public void setSecretResolver(SecretResolver secretResolver) {
> // this.secretResolver = secretResolver;
> // }
178,181c183,185
< if (secretResolver != null && secretResolver.isInitialized()) {
< String key = id + "." + SecurityConstants.PROP_PASSWORD;
< if (secretResolver.isTokenProtected(key)) {
< return secretResolver.resolve(trustedPwd);
---
> if (passwordManager.isInitialized()) {
> if (passwordManager.isTokenProtected(id + ".password")) {
> return passwordManager.resolve(trustedPwd);
_______________________________________________
Carbon-dev mailing list
[email protected]
https://wso2.org/cgi-bin/mailman/listinfo/carbon-dev
