You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by in...@apache.org on 2009/05/12 19:10:20 UTC
svn commit: r773983 [2/2] - in /synapse/trunk/java: modules/core/
modules/core/src/main/java/org/apache/synapse/
modules/core/src/main/java/org/apache/synapse/config/
modules/core/src/main/java/org/apache/synapse/config/xml/
modules/core/src/main/java/...
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/wrappers/KeyStoreWrapper.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/wrappers/KeyStoreWrapper.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/wrappers/KeyStoreWrapper.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/wrappers/KeyStoreWrapper.java Tue May 12 17:10:18 2009
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.security.wrappers;
+package org.apache.synapse.commons.security.wrappers;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.SynapseException;
-import org.apache.synapse.security.definition.IdentityKeyStoreInformation;
-import org.apache.synapse.security.definition.KeyStoreInformation;
-import org.apache.synapse.security.definition.TrustKeyStoreInformation;
+import org.apache.synapse.commons.security.definition.IdentityKeyStoreInformation;
+import org.apache.synapse.commons.security.definition.KeyStoreInformation;
+import org.apache.synapse.commons.security.definition.TrustKeyStoreInformation;
+import org.apache.synapse.commons.util.SynapseUtilException;
import java.security.*;
import java.security.cert.Certificate;
@@ -155,12 +155,12 @@
protected void handleException(String msg, Exception e) {
log.error(msg, e);
- throw new SynapseException(msg, e);
+ throw new SynapseUtilException(msg, e);
}
protected void handleException(String msg) {
log.error(msg);
- throw new SynapseException(msg);
+ throw new SynapseUtilException(msg);
}
/**
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/wrappers/TrustKeyStoreWrapper.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/wrappers/TrustKeyStoreWrapper.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/wrappers/TrustKeyStoreWrapper.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/wrappers/TrustKeyStoreWrapper.java Tue May 12 17:10:18 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.security.wrappers;
+package org.apache.synapse.commons.security.wrappers;
-import org.apache.synapse.security.definition.TrustKeyStoreInformation;
+import org.apache.synapse.commons.security.definition.TrustKeyStoreInformation;
import java.security.KeyStore;
@@ -28,7 +28,7 @@
*/
public class TrustKeyStoreWrapper extends KeyStoreWrapper {
/**
- * @see org.apache.synapse.security.wrappers.KeyStoreWrapper
+ * @see org.apache.synapse.commons.security.wrappers.KeyStoreWrapper
* There is no keyPassword as trusted Store doesn't keep private or secret keys
*/
public void init(TrustKeyStoreInformation information) {
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformation.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformation.java?rev=773983&r1=773982&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformation.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformation.java Tue May 12 17:10:18 2009
@@ -19,7 +19,7 @@
package org.apache.synapse.commons.util.datasource;
import org.apache.commons.pool.impl.GenericObjectPool;
-import org.apache.synapse.commons.util.secret.SecretInformation;
+import org.apache.synapse.commons.security.secret.SecretInformation;
import java.util.HashMap;
import java.util.Map;
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/JNDIBasedDataSourceRepository.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/JNDIBasedDataSourceRepository.java?rev=773983&r1=773982&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/JNDIBasedDataSourceRepository.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/JNDIBasedDataSourceRepository.java Tue May 12 17:10:18 2009
@@ -26,7 +26,7 @@
import org.apache.synapse.commons.util.MiscellaneousUtil;
import org.apache.synapse.commons.util.RMIRegistryController;
import org.apache.synapse.commons.util.SynapseUtilException;
-import org.apache.synapse.commons.util.secret.SecretConfigurationConstants;
+import org.apache.synapse.commons.security.SecurityConstants;
import javax.naming.*;
import javax.sql.DataSource;
@@ -136,8 +136,8 @@
ref.add(new StringRefAddr(DataSourceConstants.PROP_DRIVER_CLS_NAME,
driver));
ref.add(new StringRefAddr(DataSourceConstants.PROP_URL, url));
- ref.add(new StringRefAddr(SecretConfigurationConstants.PROP_USER_NAME, user));
- ref.add(new StringRefAddr(SecretConfigurationConstants.PROP_PASSWORD, password));
+ ref.add(new StringRefAddr(SecurityConstants.PROP_USER_NAME, user));
+ ref.add(new StringRefAddr(SecurityConstants.PROP_PASSWORD, password));
ref.add(new StringRefAddr(DataSourceConstants.PROP_MAXACTIVE, maxActive));
ref.add(new StringRefAddr(DataSourceConstants.PROP_MAXIDLE, maxIdle));
ref.add(new StringRefAddr(DataSourceConstants.PROP_MAXWAIT, maxWait));
@@ -183,7 +183,7 @@
cpdsRef.add(new StringRefAddr(DataSourceConstants.PROP_DRIVER, driver));
cpdsRef.add(new StringRefAddr(DataSourceConstants.PROP_URL, url));
cpdsRef.add(new StringRefAddr(DataSourceConstants.PROP_USER, user));
- cpdsRef.add(new StringRefAddr(SecretConfigurationConstants.PROP_PASSWORD,
+ cpdsRef.add(new StringRefAddr(SecurityConstants.PROP_PASSWORD,
password));
try {
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationFactory.java?rev=773983&r1=773982&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationFactory.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationFactory.java Tue May 12 17:10:18 2009
@@ -26,9 +26,9 @@
import org.apache.synapse.commons.util.SynapseUtilException;
import org.apache.synapse.commons.util.datasource.DataSourceConstants;
import org.apache.synapse.commons.util.datasource.DataSourceInformation;
-import org.apache.synapse.commons.util.secret.SecretConfigurationConstants;
-import org.apache.synapse.commons.util.secret.SecretInformation;
-import org.apache.synapse.commons.util.secret.SecretInformationFactory;
+import org.apache.synapse.commons.security.SecurityConstants;
+import org.apache.synapse.commons.security.secret.SecretInformation;
+import org.apache.synapse.commons.security.secret.SecretInformationFactory;
import java.util.Properties;
@@ -267,7 +267,7 @@
null));
String passwordPrompt = MiscellaneousUtil.getProperty(
- properties, prefix + SecretConfigurationConstants.PROP_PASSWORD_PROMPT,
+ properties, prefix + SecurityConstants.PROP_PASSWORD_PROMPT,
"Password for datasource " + dsName, String.class);
SecretInformation secretInformation = SecretInformationFactory.createSecretInformation(
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationSerializer.java?rev=773983&r1=773982&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationSerializer.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationSerializer.java Tue May 12 17:10:18 2009
@@ -20,8 +20,8 @@
import org.apache.synapse.commons.util.datasource.DataSourceConstants;
import org.apache.synapse.commons.util.datasource.DataSourceInformation;
-import org.apache.synapse.commons.util.secret.SecretConfigurationConstants;
-import org.apache.synapse.commons.util.secret.SecretInformation;
+import org.apache.synapse.commons.security.SecurityConstants;
+import org.apache.synapse.commons.security.secret.SecretInformation;
import java.util.Properties;
@@ -57,13 +57,13 @@
String user = secretInformation.getUser();
if (user != null && !"".equals(user)) {
- addProperty(properties, prefix + SecretConfigurationConstants.PROP_USER_NAME,
+ addProperty(properties, prefix + SecurityConstants.PROP_USER_NAME,
user);
}
String password = secretInformation.getAliasPassword();
if (password != null && !"".equals(password)) {
- addProperty(properties, prefix + SecretConfigurationConstants.PROP_PASSWORD,
+ addProperty(properties, prefix + SecurityConstants.PROP_PASSWORD,
password);
}
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/jmx/JmxInformation.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/jmx/JmxInformation.java?rev=773983&r1=773982&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/jmx/JmxInformation.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/jmx/JmxInformation.java Tue May 12 17:10:18 2009
@@ -1,6 +1,6 @@
package org.apache.synapse.commons.util.jmx;
-import org.apache.synapse.commons.util.secret.SecretInformation;
+import org.apache.synapse.commons.security.secret.SecretInformation;
public class JmxInformation {
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/jmx/JmxInformationFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/jmx/JmxInformationFactory.java?rev=773983&r1=773982&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/jmx/JmxInformationFactory.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/jmx/JmxInformationFactory.java Tue May 12 17:10:18 2009
@@ -22,9 +22,8 @@
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.commons.util.MiscellaneousUtil;
import org.apache.synapse.commons.util.SynapseUtilException;
-import org.apache.synapse.commons.util.secret.SecretConfigurationConstants;
-import org.apache.synapse.commons.util.secret.SecretInformation;
-import org.apache.synapse.commons.util.secret.SecretInformationFactory;
+import org.apache.synapse.commons.security.secret.SecretInformation;
+import org.apache.synapse.commons.security.secret.SecretInformationFactory;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/jmx/JmxSecretAuthenticator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/jmx/JmxSecretAuthenticator.java?rev=773983&r1=773982&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/jmx/JmxSecretAuthenticator.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/jmx/JmxSecretAuthenticator.java Tue May 12 17:10:18 2009
@@ -1,7 +1,7 @@
package org.apache.synapse.commons.util.jmx;
-import org.apache.synapse.commons.util.secret.SecretInformation;
+import org.apache.synapse.commons.security.secret.SecretInformation;
import javax.management.remote.JMXAuthenticator;
import javax.management.remote.JMXPrincipal;
Modified: synapse/trunk/java/repository/conf/synapse.properties
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/synapse.properties?rev=773983&r1=773982&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/synapse.properties (original)
+++ synapse/trunk/java/repository/conf/synapse.properties Tue May 12 17:10:18 2009
@@ -40,31 +40,31 @@
#############################################################################
# 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.util.secret.SecretCallbackHandler>
+# synapse.passwordProvider=<any implementation of org.apache.synapse.commons.security.secret.SecretCallbackHandler>
#Examples:
-#synapse.passwordProvider=org.apache.synapse.security.secret.handler.SecretManagerSecretCallbackHandler
-#synapse.passwordProvider=org.apache.synapse.security.secret.handler.JMXSecretCallbackHandler
-#synapse.passwordProvider=org.apache.synapse.security.secret.handler.JlineSecretCallbackHandler
-#synapse.passwordProvider=org.apache.synapse.security.secret.handler.JBossEncryptionSecretCallbackHandler
+#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
#
#secretRepositories=file
-#secretRepositories.file.provider=org.apache.synapse.security.secret.repository.filebased.FileBaseSecretRepositoryProvider
+#secretRepositories.file.provider=org.apache.synapse.commons.security.secret.repository.filebased.FileBaseSecretRepositoryProvider
#secretRepositories.file.location=cipher-text.properties
#
#keystore.identity.location=lib/identity.jks
#keystore.identity.type=JKS
#keystore.identity.alias=synapse
#keystore.identity.store.password=password
-#keystore.identity.store.passwordProvider=<any implementation of org.apache.synapse.commons.util.secret.SecretCallbackHandler>
+#keystore.identity.store.passwordProvider=<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.util.secret.SecretCallbackHandler>
+#keystore.identity.key.passwordProvider=<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.util.secret.SecretCallbackHandler>
+#keystore.trust.store.passwordProvider=<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.security.secret.handler.JBossEncryptionSecretCallbackHandler
+#synapse.datasources.lookupds.passwordProvider=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.security.secret.handler.JBossEncryptionSecretCallbackHandler
+#synapse.datasources.reportds.passwordProvider=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
@@ -116,7 +116,7 @@
# 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.security.secret.handler.JBossEncryptionSecretCallbackHandler
+#synapse.jmx.passwordProvider=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!
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=773983&r1=773982&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/src/site/xdoc/Synapse_Samples_Setup.xml (original)
+++ synapse/trunk/java/src/site/xdoc/Synapse_Samples_Setup.xml Tue May 12 17:10:18 2009
@@ -834,34 +834,34 @@
<strong>password provider</strong>
for each keystore.
This can be done by adding property called
- <strong>passwordProvider= any implementation of org.apache.synapse.commons.util.secret.SecretCallbackHandler
+ <strong>passwordProvider= any implementation of org.apache.synapse.commons.security.secret.SecretCallbackHandler
</strong>
Example
<pre>
- keystore.identity.store.passwordProvider=org.apache.synapse.security.secret.handler.JMXSecretCallbackHandler
+ keystore.identity.store.passwordProvider=org.apache.synapse.commons.security.secret.handler.JMXSecretCallbackHandler
</pre>
</p>
<p>
The <strong>password provider</strong> should be an implementation of
- <strong>org.apache.synapse.commons.util.secret.SecretCallbackHandler</strong>.Synapse ships three
+ <strong>org.apache.synapse.commons.security.secret.SecretCallbackHandler</strong>.Synapse ships three
implementations that can be used for this purpose.
<ul>
<li>
- org.apache.synapse.security.secret.handler.JMXSecretCallbackHandler
+ org.apache.synapse.commons.security.secret.handler.JMXSecretCallbackHandler
</li>
<li>
- org.apache.synapse.security.secret.handler.JlineSecretCallbackHandler
+ org.apache.synapse.commons.security.secret.handler.JlineSecretCallbackHandler
</li>
<li>
- org.apache.synapse.security.secret.handler.HardCodedSecretCallbackHandler
+ org.apache.synapse.commons.security.secret.handler.HardCodedSecretCallbackHandler
</li>
<li>
- org.apache.synapse.security.secret.handler.JBossEncryptionSecretCallbackHandler
+ org.apache.synapse.commons.security.secret.handler.JBossEncryptionSecretCallbackHandler
</li>
</ul>
<p>
- When use <strong>org.apache.synapse.security.secret.handler.JMXSecretCallbackHandler</strong>
+ When use <strong>org.apache.synapse.commons.security.secret.handler.JMXSecretCallbackHandler</strong>
, It is needed to use a JMX Console. Then , using JMX Console need to access the MBean
<strong>SecretsProvider</strong>
and add passwords for following keys. Therese is method to add secret in
@@ -888,7 +888,7 @@
</p>
<pre>secretRepositories=file
- secretRepositories.file.provider=org.apache.synapse.security.secret.repository.filebased.FileBaseSecretRepositoryProvider
+ secretRepositories.file.provider=org.apache.synapse.commons.security.secret.repository.filebased.FileBaseSecretRepositoryProvider
secretRepositories.file.location=cipher-text.properties
</pre>
@@ -980,10 +980,10 @@
The
<strong>password provider</strong>
should be an implementation of
- <strong>org.apache.synapse.commons.util.secret.SecretCallbackHandler</strong>. There are few
+ <strong>org.apache.synapse.commons.security.secret.SecretCallbackHandler</strong>. There are few
options but it is
recommended to use
- <strong>org.apache.synapse.security.secret.handler.SecretManagerSecretCallbackHandler</strong>
+ <strong>org.apache.synapse.commons.security.secret.handler.SecretManagerSecretCallbackHandler</strong>
in this case
(i.e. securing data source password).
</p>
@@ -995,7 +995,7 @@
</strong>
</p>
<pre>
-synapse.datasources.lookupds.passwordProvider=org.apache.synapse.security.secret.handler.SecretManagerSecretCallbackHandler
+ synapse.datasources.lookupds.passwordProvider=org.apache.synapse.commons.security.secret.handler.SecretManagerSecretCallbackHandler
</pre>
</div>
<h2>Using CipherTool</h2>