Author: indika
Date: Wed May 13 10:05:21 2009
New Revision: 774272
URL: http://svn.apache.org/viewvc?rev=774272&view=rev
Log:
Change passwordProvider in the configurations into secretProvider as secret API
is just not only for password
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/SecurityConstants.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformationFactory.java
synapse/trunk/java/repository/conf/synapse.properties
synapse/trunk/java/src/site/xdoc/Synapse_Samples_Setup.xml
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/SecurityConstants.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/SecurityConstants.java?rev=774272&r1=774271&r2=774272&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/SecurityConstants.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/SecurityConstants.java
Wed May 13 10:05:21 2009
@@ -23,7 +23,7 @@
public static final String GLOBAL_PREFIX = "synapse.";
public static final String PROP_USER_NAME = "username";
public static final String PROP_PASSWORD = "password";
- public static final String PROP_PASSWORD_PROVIDER = "passwordProvider";
+ public static final String PROP_SECRET_PROVIDER = "secretProvider";
public static final String PROP_PASSWORD_PROMPT = "passwordPrompt";
public static final String PROP_SECRET_CALLBACK_HANDLER =
"SharedSecretCallbackHandler";
public static final String PROP_SECURITY_ADMIN_SERVICES =
"SecurityAdminServices";
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformationFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformationFactory.java?rev=774272&r1=774271&r2=774272&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformationFactory.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformationFactory.java
Wed May 13 10:05:21 2009
@@ -68,14 +68,14 @@
// set specific password provider if configured
SecretCallbackHandler passwordProvider =
SecretCallbackHandlerFactory.createSecretCallbackHandler(properties,
- configurationPrefix +
SecurityConstants.PROP_PASSWORD_PROVIDER);
+ configurationPrefix +
SecurityConstants.PROP_SECRET_PROVIDER);
// if no specific password provider configured, use default password
provider
if (passwordProvider == null) {
passwordProvider =
SecretCallbackHandlerFactory.createSecretCallbackHandler(
properties,
SecurityConstants.GLOBAL_PREFIX
- + SecurityConstants.PROP_PASSWORD_PROVIDER);
+ + SecurityConstants.PROP_SECRET_PROVIDER);
}
secretInformation.setPasswordProvider(passwordProvider);
secretInformation.setPasswordPrompt(passwordPrompt);
Modified: synapse/trunk/java/repository/conf/synapse.properties
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/synapse.properties?rev=774272&r1=774271&r2=774272&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/synapse.properties (original)
+++ synapse/trunk/java/repository/conf/synapse.properties Wed May 13 10:05:21
2009
@@ -40,12 +40,12 @@
#############################################################################
# The following property specifies a global password provider implementation
# which will be used globally if not overriden in specific configurations
-# synapse.passwordProvider=<any implementation of
org.apache.synapse.commons.security.secret.SecretCallbackHandler>
+# synapse.secretProvider=<any implementation of
org.apache.synapse.commons.security.secret.SecretCallbackHandler>
#Examples:
-#synapse.passwordProvider=org.apache.synapse.commons.security.secret.handler.SecretManagerSecretCallbackHandler
-#synapse.passwordProvider=org.apache.synapse.commons.security.secret.handler.JMXSecretCallbackHandler
-#synapse.passwordProvider=org.apache.synapse.commons.security.secret.handler.JlineSecretCallbackHandler
-#synapse.passwordProvider=org.apache.synapse.commons.security.secret.handler.JBossEncryptionSecretCallbackHandler
+#synapse.secretProvider=org.apache.synapse.commons.security.secret.handler.SecretManagerSecretCallbackHandler
+#synapse.secretProvider=org.apache.synapse.commons.security.secret.handler.JMXSecretCallbackHandler
+#synapse.secretProvider=org.apache.synapse.commons.security.secret.handler.JlineSecretCallbackHandler
+#synapse.secretProvider=org.apache.synapse.commons.security.secret.handler.JBossEncryptionSecretCallbackHandler
#
#secretRepositories=file
#secretRepositories.file.provider=org.apache.synapse.commons.security.secret.repository.filebased.FileBaseSecretRepositoryProvider
@@ -55,16 +55,16 @@
#keystore.identity.type=JKS
#keystore.identity.alias=synapse
#keystore.identity.store.password=password
-#keystore.identity.store.passwordProvider=<any implementation of
org.apache.synapse.commons.security.secret.SecretCallbackHandler>
+#keystore.identity.store.secretProvider=<any implementation of
org.apache.synapse.commons.security.secret.SecretCallbackHandler>
#keystore.identity.key.password=password
-#keystore.identity.key.passwordProvider=<any implementation of
org.apache.synapse.commons.security.secret.SecretCallbackHandler>
+#keystore.identity.key.secretProvider=<any implementation of
org.apache.synapse.commons.security.secret.SecretCallbackHandler>
##keystore.identity.parameters=enableHostnameVerifier=false;keyStoreCertificateFilePath=/home/esb.cer
#
#keystore.trust.location=lib/trust.jks
#keystore.trust.type=JKS
#keystore.trust.alias=synapse
#keystore.trust.store.password=password
-#keystore.trust.store.passwordProvider=<any implementation of
org.apache.synapse.commons.security.secret.SecretCallbackHandler>
+#keystore.trust.store.secretProvider=<any implementation of
org.apache.synapse.commons.security.secret.SecretCallbackHandler>
#
################################################################################
# DataSources Configuration
@@ -80,7 +80,7 @@
#synapse.datasources.lookupds.driverClassName=org.apache.derby.jdbc.ClientDriver
#synapse.datasources.lookupds.url=jdbc:derby://localhost:1527/lookupdb;create=false
# Optionally you can specifiy a specific password provider implementation
which overrides any globally configured provider
-#synapse.datasources.lookupds.passwordProvider=org.apache.synapse.commons.security.secret.handler.JBossEncryptionSecretCallbackHandler
+#synapse.datasources.lookupds.secretProvider=org.apache.synapse.commons.security.secret.handler.JBossEncryptionSecretCallbackHandler
#synapse.datasources.lookupds.username=synapse
# Depending on the password provider used, you may have to use an encrypted
password here!
#synapse.datasources.lookupds.password=synapse
@@ -98,7 +98,7 @@
#synapse.datasources.reportds.driverClassName=org.apache.derby.jdbc.ClientDriver
#synapse.datasources.reportds.url=jdbc:derby://localhost:1527/reportdb;create=false
# Optionally you can specifiy a specific password provider implementation
which overrides any globally configured provider
-#synapse.datasources.reportds.passwordProvider=org.apache.synapse.commons.security.secret.handler.JBossEncryptionSecretCallbackHandler
+#synapse.datasources.reportds.secretProvider=org.apache.synapse.commons.security.secret.handler.JBossEncryptionSecretCallbackHandler
#synapse.datasources.reportds.username=synapse
# Depending on the password provider used, you may have to use an encrypted
password here!
#synapse.datasources.reportds.password=synapse
@@ -115,11 +115,11 @@
#synapse.jmx.rmiPort=1101
# By default the hostname will be detected, but you can force to use another
network interface
#synapse.jmx.hostname=
-# Optionally you can specifiy a specific password provider implementation
which overrides any globally configured provider
-#synapse.jmx.passwordProvider=org.apache.synapse.commons.security.secret.handler.JBossEncryptionSecretCallbackHandler
+# Optionally you can specifiy a specific secret provider implementation which
overrides any globally configured provider
+#synapse.jmx.secretProvider=org.apache.synapse.commons.security.secret.handler.JBossEncryptionSecretCallbackHandler
# By default no authentication is required, but you may enforce this by
specifying a username and password
#synapse.jmx.username=admin
-# Depending on the password provider used, you may have to use an encrypted
password here!
+# Depending on the secret provider used, you may have to use an encrypted
password here!
#synapse.jmx.password=admin
# Optionally you may want to specify the location of an remote access file to
restrict access
#synapse.jmx.remote.access.file=
Modified: synapse/trunk/java/src/site/xdoc/Synapse_Samples_Setup.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/src/site/xdoc/Synapse_Samples_Setup.xml?rev=774272&r1=774271&r2=774272&view=diff
==============================================================================
--- synapse/trunk/java/src/site/xdoc/Synapse_Samples_Setup.xml (original)
+++ synapse/trunk/java/src/site/xdoc/Synapse_Samples_Setup.xml Wed May 13
10:05:21 2009
@@ -834,11 +834,11 @@
<strong>password provider</strong>
for each keystore.
This can be done by adding property called
- <strong>passwordProvider= any implementation of
org.apache.synapse.commons.security.secret.SecretCallbackHandler
+ <strong>secretProvider= any implementation of
org.apache.synapse.commons.security.secret.SecretCallbackHandler
</strong>
Example
<pre>
-
keystore.identity.store.passwordProvider=org.apache.synapse.commons.security.secret.handler.JMXSecretCallbackHandler
+
keystore.identity.store.secretProvider=org.apache.synapse.commons.security.secret.handler.JMXSecretCallbackHandler
</pre>
</p>
<p>
@@ -995,7 +995,7 @@
</strong>
</p>
<pre>
-
synapse.datasources.lookupds.passwordProvider=org.apache.synapse.commons.security.secret.handler.SecretManagerSecretCallbackHandler
+
synapse.datasources.lookupds.secretProvider=org.apache.synapse.commons.security.secret.handler.SecretManagerSecretCallbackHandler
</pre>
</div>
<h2>Using CipherTool</h2>
