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/03/11 09:42:59 UTC
svn commit: r752407 - in /synapse/trunk/java:
modules/core/src/main/java/org/apache/synapse/
modules/core/src/main/java/org/apache/synapse/security/secret/
modules/core/src/main/java/org/apache/synapse/security/secret/handler/
modules/distribution/src/...
Author: indika
Date: Wed Mar 11 08:42:58 2009
New Revision: 752407
URL: http://svn.apache.org/viewvc?rev=752407&view=rev
Log:
add parameter for set deployment mode
some logs
make init secret manager for prodcution env
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerConfigurationInformationFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerStateDetectionStrategy.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/SecretManager.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/handler/JMXSecretCallbackHandler.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/handler/SecretManagerSecretCallbackHandler.java
synapse/trunk/java/modules/distribution/src/main/bin/synapse.bat
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DatasourceMBeanRepository.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/AbstractSecretCallbackHandler.java
synapse/trunk/java/repository/conf/synapse.properties
synapse/trunk/java/repository/conf/wrapper.conf
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerConfigurationInformationFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerConfigurationInformationFactory.java?rev=752407&r1=752406&r2=752407&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerConfigurationInformationFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerConfigurationInformationFactory.java Wed Mar 11 08:42:58 2009
@@ -117,14 +117,14 @@
information.setSynapseHome(args[2]);
information.setSynapseXMLLocation(args[3]);
information.setResolveRoot(args[4]);
- information.setServerName(args[5]);
+ information.setDeploymentMode(args[5]);
} else if (args.length == 7) {
information.setAxis2Xml(args[1]);
information.setSynapseHome(args[2]);
information.setSynapseXMLLocation(args[3]);
information.setResolveRoot(args[4]);
- information.setServerName(args[5]);
- information.setDeploymentMode(args[6]);
+ information.setDeploymentMode(args[5]);
+ information.setServerName(args[6]);
}
return information;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerStateDetectionStrategy.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerStateDetectionStrategy.java?rev=752407&r1=752406&r2=752407&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerStateDetectionStrategy.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerStateDetectionStrategy.java Wed Mar 11 08:42:58 2009
@@ -19,6 +19,7 @@
package org.apache.synapse;
import org.apache.synapse.security.secret.SecretManager;
+import org.apache.synapse.config.SynapsePropertiesLoader;
/**
* Detects possible current server state
@@ -44,6 +45,11 @@
SecretManager secretManager = SecretManager.getInstance();
if (secretManager.isInitialized()) {
return ServerState.INITIALIZABLE;
+ } else {
+ secretManager.init(SynapsePropertiesLoader.loadSynapseProperties());
+ if (secretManager.isInitialized()) {
+ return ServerState.INITIALIZABLE;
+ }
}
} else {
return ServerState.INITIALIZABLE;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/SecretManager.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/SecretManager.java?rev=752407&r1=752406&r2=752407&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/SecretManager.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/SecretManager.java Wed Mar 11 08:42:58 2009
@@ -158,11 +158,9 @@
identityStorePass = identityStorePassSecretCallback.getSecret();
trustStorePass = trustStorePassSecretCallback.getSecret();
- if (validatePasswords(identityStorePass, identityKeyPass, trustStorePass)) {
- if (log.isDebugEnabled()) {
- log.debug("Either Identity or Trust keystore password is mandotory" +
+ if (!validatePasswords(identityStorePass, identityKeyPass, trustStorePass)) {
+ log.info("Either Identity or Trust keystore password is mandotory" +
" in order to initialized secret manager.");
- }
return;
}
@@ -269,8 +267,7 @@
}
private void registerMBean() {
- MBeanRegistrar mBeanRegistrar = MBeanRegistrar.getInstance();
- mBeanRegistrar.registerMBean(new SecretManagerAdmin(this),
+ MBeanRegistrar.getInstance().registerMBean(new SecretManagerAdmin(this),
"SecurityAdminServices", "SecretManagerAdmin");
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/handler/JMXSecretCallbackHandler.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/handler/JMXSecretCallbackHandler.java?rev=752407&r1=752406&r2=752407&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/handler/JMXSecretCallbackHandler.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/handler/JMXSecretCallbackHandler.java Wed Mar 11 08:42:58 2009
@@ -32,8 +32,7 @@
static {
secretsMBean = new SecretsMBeanImplementation();
- MBeanRegistrar mBeanRegistrar = MBeanRegistrar.getInstance();
- mBeanRegistrar.registerMBean(secretsMBean, "SecretsMBean",
+ MBeanRegistrar.getInstance().registerMBean(secretsMBean, "SecretsMBean",
"SecretsMBean");
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/handler/SecretManagerSecretCallbackHandler.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/handler/SecretManagerSecretCallbackHandler.java?rev=752407&r1=752406&r2=752407&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/handler/SecretManagerSecretCallbackHandler.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/handler/SecretManagerSecretCallbackHandler.java Wed Mar 11 08:42:58 2009
@@ -21,6 +21,8 @@
import org.apache.synapse.commons.util.secret.SingleSecretCallback;
import org.apache.synapse.commons.util.secret.AbstractSecretCallbackHandler;
import org.apache.synapse.security.secret.SecretManager;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.Log;
/**
* SecretManager based secret provider , this can be used by other application
@@ -31,6 +33,14 @@
private final SecretManager secretManager = SecretManager.getInstance();
protected void handleSingleSecretCallback(SingleSecretCallback singleSecretCallback) {
+
+ if (!secretManager.isInitialized()) {
+ if (log.isDebugEnabled()) {
+ log.debug("SecretManager has not been initialized.Cannot collect secrets");
+ }
+ return;
+ }
+
String id = singleSecretCallback.getId();
if (id != null && !"".equals(id)) {
singleSecretCallback.setSecret(secretManager.getSecret(id));
Modified: synapse/trunk/java/modules/distribution/src/main/bin/synapse.bat
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/distribution/src/main/bin/synapse.bat?rev=752407&r1=752406&r2=752407&view=diff
==============================================================================
--- synapse/trunk/java/modules/distribution/src/main/bin/synapse.bat (original)
+++ synapse/trunk/java/modules/distribution/src/main/bin/synapse.bat Wed Mar 11 08:42:58 2009
@@ -111,7 +111,7 @@
rem Start the Wrapper
rem
:startup
-"%_WRAPPER_EXE%" -c %_WRAPPER_CONF% wrapper.app.parameter.5=%_SYNAPSE_XML% wrapper.app.parameter.7=%_SERVER_NAME% %_XDEBUG%
+"%_WRAPPER_EXE%" -c %_WRAPPER_CONF% wrapper.app.parameter.5=%_SYNAPSE_XML% wrapper.app.parameter.8=%_SERVER_NAME% %_XDEBUG%
if not errorlevel 1 goto :eof
pause
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DatasourceMBeanRepository.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DatasourceMBeanRepository.java?rev=752407&r1=752406&r2=752407&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DatasourceMBeanRepository.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DatasourceMBeanRepository.java Wed Mar 11 08:42:58 2009
@@ -54,8 +54,8 @@
assertFalse(mBean instanceof DBPoolView, "Given MBean instance is not matched " +
"with the expected MBean - 'DBPoolView'.");
dataSourcesMBeans.put(name, (DBPoolView) mBean);
- MBeanRegistrar mBeanRegistrar = MBeanRegistrar.getInstance();
- mBeanRegistrar.registerMBean(mBean, MBEAN_CATEGORY_DATABASE_CONNECTION_POOL, name);
+ MBeanRegistrar.getInstance().registerMBean(mBean,
+ MBEAN_CATEGORY_DATABASE_CONNECTION_POOL, name);
}
public Object getMBean(String name) {
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/AbstractSecretCallbackHandler.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/AbstractSecretCallbackHandler.java?rev=752407&r1=752406&r2=752407&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/AbstractSecretCallbackHandler.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/AbstractSecretCallbackHandler.java Wed Mar 11 08:42:58 2009
@@ -31,7 +31,11 @@
*/
public abstract class AbstractSecretCallbackHandler implements SecretCallbackHandler {
- private static final Log log = LogFactory.getLog(AbstractSecretCallbackHandler.class);
+ protected Log log;
+
+ protected AbstractSecretCallbackHandler() {
+ log = LogFactory.getLog(getClass());
+ }
public void handle(SecretCallback[] secretCallbacks) {
Modified: synapse/trunk/java/repository/conf/synapse.properties
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/synapse.properties?rev=752407&r1=752406&r2=752407&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/synapse.properties (original)
+++ synapse/trunk/java/repository/conf/synapse.properties Wed Mar 11 08:42:58 2009
@@ -26,7 +26,7 @@
#
##synapse.statistics.state=enable
#
-## KeyStores configurations
+## KeyStores configurations
#
#keystore.identity.location=lib/identity.jks
#keystore.identity.type=JKS
@@ -56,7 +56,7 @@
#synapse.datasources.lookupds.url=jdbc:derby://localhost:1527/lookupdb;create=false
#synapse.datasources.lookupds.username=synapse
#synapse.datasources.lookupds.password=synapse
-##synapse.datasources.lookupds.passwordProvider=org.apache.synapse.commons.util.secret.SecretCallbackHandler implementation
+##synapse.datasources.lookupds.passwordProvider=org.apache.synapse.security.secret.handler.SecretManagerSecretCallbackHandler
#synapse.datasources.lookupds.dsName=lookupdb
#synapse.datasources.lookupds.maxActive=100
#synapse.datasources.lookupds.maxIdle=20
@@ -72,12 +72,12 @@
#synapse.datasources.reportds.url=jdbc:derby://localhost:1527/reportdb;create=false
#synapse.datasources.reportds.username=synapse
#synapse.datasources.reportds.password=synapse
-##synapse.datasources.reportds.passwordProvider=org.apache.synapse.commons.util.secret.SecretCallbackHandler implementation
+##synapse.datasources.reportds.passwordProvider=org.apache.synapse.security.secret.handler.SecretManagerSecretCallbackHandler
#synapse.datasources.reportds.maxActive=100
#synapse.datasources.reportds.maxIdle=20
#synapse.datasources.reportds.maxWait=10000
#
-#secretManager.passwordProvider=org.apache.synapse.commons.util.secret.SecretCallbackHandler implementation
+#secretManager.passwordProvider=org.apache.synapse.commons.util.secret.SecretCallbackHandler implementation
#
#secretRepositories=file
##
Modified: synapse/trunk/java/repository/conf/wrapper.conf
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/wrapper.conf?rev=752407&r1=752406&r2=752407&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/wrapper.conf (original)
+++ synapse/trunk/java/repository/conf/wrapper.conf Wed Mar 11 08:42:58 2009
@@ -47,8 +47,10 @@
wrapper.app.parameter.4=.
wrapper.app.parameter.5=repository/conf/synapse.xml
wrapper.app.parameter.6=repository
-# add the serverName for the synapse instance, if any. Defaults to the hostname
+# deployment mode , set value to 'production' if it is production env.
wrapper.app.parameter.7=
+# add the serverName for the synapse instance, if any. Defaults to the hostname
+wrapper.app.parameter.8=
#********************************************************************
# Wrapper Logging Properties