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 [1/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/...
Author: indika
Date: Tue May 12 17:10:18 2009
New Revision: 773983
URL: http://svn.apache.org/viewvc?rev=773983&view=rev
Log:
Move security code into synapse utils
Change package structure of datasource, jmx
Added:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SecretManagerAdminMBeanImpl.java
- copied, changed from r773946, synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/SecretManagerAdmin.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/
- copied from r773946, synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/SecurityConstants.java
- copied, changed from r773946, synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretConfigurationConstants.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/AbstractSecretCallbackHandler.java
- copied, changed from r773946, synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/AbstractSecretCallbackHandler.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/MultiSecretCallback.java
- copied, changed from r773946, synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/MultiSecretCallback.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretCallback.java
- copied, changed from r773946, synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretCallback.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretCallbackHandler.java
- copied, changed from r773946, synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretCallbackHandler.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretCallbackHandlerFactory.java
- copied, changed from r773946, synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretCallbackHandlerFactory.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretInformation.java
- copied, changed from r773946, synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretInformation.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretInformationFactory.java
- copied, changed from r773946, synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretInformationFactory.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretLoadingModule.java
- copied, changed from r773946, synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretLoadingModule.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SingleSecretCallback.java
- copied, changed from r773946, synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SingleSecretCallback.java
Removed:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/mbean/SecretManagerAdmin.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/AbstractSecretCallbackHandler.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/MultiSecretCallback.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretCallback.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretCallbackHandler.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretCallbackHandlerFactory.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretConfigurationConstants.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretInformation.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretInformationFactory.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretLoadingModule.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SingleSecretCallback.java
Modified:
synapse/trunk/java/modules/core/pom.xml
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.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/config/SynapseConfigUtils.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java
synapse/trunk/java/modules/distribution/src/main/bin/ciphertool.bat
synapse/trunk/java/modules/distribution/src/main/bin/ciphertool.sh
synapse/trunk/java/modules/utils/pom.xml
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/definition/CipherInformation.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/definition/IdentityKeyStoreInformation.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/definition/KeyStoreInformation.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/definition/TrustKeyStoreInformation.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/definition/factory/KeyStoreInformationFactory.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/enumeration/CipherOperationMode.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/enumeration/EncodingType.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/enumeration/KeyStoreType.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/interfaces/ICACertsLoader.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/interfaces/IKeyStoreLoader.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/keystore/AbstractKeyStoreLoader.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/keystore/CACertsLoader.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/keystore/JKSKeyStoreLoader.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/keystore/PKCS12KeyStoreLoader.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/keystore/PKCS8KeyStoreLoader.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/mbean/JMXSecretsProvider.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/mbean/JMXSecretsProviderMBean.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/mbean/SecretManagerAdminMBean.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretManager.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretRepository.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretRepositoryProvider.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/HardCodedSecretCallbackHandler.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/JBossEncryptionSecretCallbackHandler.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/JMXSecretCallbackHandler.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/JlineSecretCallbackHandler.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/SecretManagerSecretCallbackHandler.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/SharedSecretCallbackHandler.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/SharedSecretCallbackHandlerCache.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/repository/filebased/FileBaseSecretRepository.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/repository/filebased/FileBaseSecretRepositoryProvider.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/tool/CipherTool.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/tool/EncodingHelper.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/wrappers/CipherWrapper.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/wrappers/IdentityKeyStoreWrapper.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/wrappers/KeyStoreWrapper.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/wrappers/TrustKeyStoreWrapper.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformation.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/JNDIBasedDataSourceRepository.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationFactory.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationSerializer.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/jmx/JmxInformation.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/jmx/JmxInformationFactory.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/jmx/JmxSecretAuthenticator.java
synapse/trunk/java/repository/conf/synapse.properties
synapse/trunk/java/src/site/xdoc/Synapse_Samples_Setup.xml
Modified: synapse/trunk/java/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/pom.xml?rev=773983&r1=773982&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/pom.xml (original)
+++ synapse/trunk/java/modules/core/pom.xml Tue May 12 17:10:18 2009
@@ -146,7 +146,6 @@
org.apache.synapse.mediators.*,
org.apache.synapse.metrics.*,
org.apache.synapse.registry.*,
- org.apache.synapse.security.*,
org.apache.synapse.startup.*,
org.apache.synapse.util.*,
</Export-Package>
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java?rev=773983&r1=773982&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java Tue May 12 17:10:18 2009
@@ -36,8 +36,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.commons.util.RMIRegistryController;
-import org.apache.synapse.commons.util.secret.SecretConfigurationConstants;
-import org.apache.synapse.commons.util.secret.SecretCallbackHandler;
+import org.apache.synapse.commons.security.SecurityConstants;
+import org.apache.synapse.commons.security.secret.SecretCallbackHandler;
import org.apache.synapse.commons.util.datasource.DataSourceInformationRepository;
import org.apache.synapse.commons.util.datasource.DataSourceHelper;
import org.apache.synapse.commons.util.datasource.DataSourceConstants;
@@ -51,7 +51,7 @@
import org.apache.synapse.core.axis2.*;
import org.apache.synapse.eventing.SynapseEventSource;
import org.apache.synapse.task.*;
-import org.apache.synapse.security.secret.handler.SharedSecretCallbackHandlerCache;
+import org.apache.synapse.commons.security.secret.handler.SharedSecretCallbackHandlerCache;
import java.util.*;
@@ -662,7 +662,7 @@
SharedSecretCallbackHandlerCache cache = SharedSecretCallbackHandlerCache.getInstance();
Object handler =
information.getProperty(
- SecretConfigurationConstants.PROP_SECRET_CALLBACK_HANDLER);
+ SecurityConstants.PROP_SECRET_CALLBACK_HANDLER);
if (handler instanceof SecretCallbackHandler) {
cache.setSecretCallbackHandler((SecretCallbackHandler) handler);
}
Copied: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SecretManagerAdminMBeanImpl.java (from r773946, synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/SecretManagerAdmin.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SecretManagerAdminMBeanImpl.java?p2=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SecretManagerAdminMBeanImpl.java&p1=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/SecretManagerAdmin.java&r1=773946&r2=773983&rev=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/SecretManagerAdmin.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SecretManagerAdminMBeanImpl.java Tue May 12 17:10:18 2009
@@ -16,22 +16,26 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.security.mbean;
+package org.apache.synapse;
import org.apache.synapse.config.SynapsePropertiesLoader;
-import org.apache.synapse.security.secret.SecretManager;
+import org.apache.synapse.commons.security.secret.SecretManager;
+import org.apache.synapse.commons.security.mbean.SecretManagerAdminMBean;
+
+import javax.management.StandardMBean;
+import javax.management.NotCompliantMBeanException;
/**
*
*/
-public class SecretManagerAdmin implements SecretManagerAdminMBean {
+public class SecretManagerAdminMBeanImpl extends StandardMBean implements SecretManagerAdminMBean {
- private SecretManager secretManager;
+ private SecretManager secretManager = SecretManager.getInstance();
- public SecretManagerAdmin(SecretManager secretManager) {
- this.secretManager = secretManager;
+ public SecretManagerAdminMBeanImpl() throws NotCompliantMBeanException {
+ super(SecretManagerAdminMBean.class);
}
/**
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java?rev=773983&r1=773982&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java Tue May 12 17:10:18 2009
@@ -21,8 +21,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.commons.util.jmx.MBeanRegistrar;
+import org.apache.synapse.commons.security.SecurityConstants;
+import org.apache.synapse.commons.security.secret.SecretManager;
import org.apache.synapse.core.axis2.SynapseCallbackReceiver;
+import javax.management.NotCompliantMBeanException;
import java.util.Date;
/**
@@ -477,13 +480,29 @@
throw new SynapseException(msg);
}
+ private void handleException(String msg, Exception e) {
+ log.error(msg, e);
+ throw new SynapseException(msg, e);
+ }
+
private void registerMBean() {
MBeanRegistrar.getInstance().registerMBean(new ServerManagerView(),
SynapseConstants.SERVER_MANAGER_MBEAN, SynapseConstants.SERVER_MANAGER_MBEAN);
+ try {
+ MBeanRegistrar.getInstance().registerMBean(
+ new SecretManagerAdminMBeanImpl(),
+ SecurityConstants.PROP_SECURITY_ADMIN_SERVICES,
+ SecurityConstants.PROP_SECRET_MANAGER_ADMIN_MBEAN);
+ } catch (NotCompliantMBeanException e) {
+ handleException("Error registering SecretManagerAdminMBeanImpl", e);
+ }
}
private void unRegisterMBean() {
MBeanRegistrar.getInstance().unRegisterMBean(
SynapseConstants.SERVER_MANAGER_MBEAN, SynapseConstants.SERVER_MANAGER_MBEAN);
+ MBeanRegistrar.getInstance().unRegisterMBean(
+ SecurityConstants.PROP_SECURITY_ADMIN_SERVICES,
+ SecurityConstants.PROP_SECRET_MANAGER_ADMIN_MBEAN);
}
}
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=773983&r1=773982&r2=773983&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 Tue May 12 17:10:18 2009
@@ -19,7 +19,7 @@
package org.apache.synapse;
import org.apache.synapse.config.SynapsePropertiesLoader;
-import org.apache.synapse.security.secret.SecretManager;
+import org.apache.synapse.commons.security.secret.SecretManager;
/**
* Detects possible current server state
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java?rev=773983&r1=773982&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java Tue May 12 17:10:18 2009
@@ -28,10 +28,10 @@
import org.apache.synapse.*;
import org.apache.synapse.aspects.statistics.StatisticsCollector;
import org.apache.synapse.core.SynapseEnvironment;
-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.security.definition.factory.KeyStoreInformationFactory;
+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.security.definition.factory.KeyStoreInformationFactory;
import org.apache.synapse.util.SynapseBinaryDataSource;
import org.xml.sax.InputSource;
import sun.net.www.protocol.https.HttpsURLConnectionImpl;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java?rev=773983&r1=773982&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java Tue May 12 17:10:18 2009
@@ -27,7 +27,7 @@
import org.apache.synapse.commons.util.datasource.*;
import org.apache.synapse.commons.util.jmx.MBeanRepository;
import org.apache.synapse.util.xpath.SynapseXPath;
-import org.apache.synapse.security.secret.SecretManager;
+import org.apache.synapse.commons.security.secret.SecretManager;
import org.jaxen.JaxenException;
import javax.naming.Context;
Modified: synapse/trunk/java/modules/distribution/src/main/bin/ciphertool.bat
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/distribution/src/main/bin/ciphertool.bat?rev=773983&r1=773982&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/distribution/src/main/bin/ciphertool.bat (original)
+++ synapse/trunk/java/modules/distribution/src/main/bin/ciphertool.bat Tue May 12 17:10:18 2009
@@ -82,7 +82,7 @@
set JAVA_ENDORSED=".\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed"
-%_RUNJAVA% %JAVA_OPTS% -cp "%SYNAPSE_CLASSPATH%" -Djava.endorsed.dirs=%JAVA_ENDORSED% org.apache.synapse.security.tool.CipherTool %*
+%_RUNJAVA% %JAVA_OPTS% -cp "%SYNAPSE_CLASSPATH%" -Djava.endorsed.dirs=%JAVA_ENDORSED% org.apache.synapse.commons.security.tool.CipherTool %*
endlocal
:end
Modified: synapse/trunk/java/modules/distribution/src/main/bin/ciphertool.sh
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/distribution/src/main/bin/ciphertool.sh?rev=773983&r1=773982&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/distribution/src/main/bin/ciphertool.sh (original)
+++ synapse/trunk/java/modules/distribution/src/main/bin/ciphertool.sh Tue May 12 17:10:18 2009
@@ -102,4 +102,4 @@
$JAVA_HOME/bin/java \
-classpath "$SYNAPSE_CLASSPATH" \
-Djava.endorsed.dirs="$SYNAPSE_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \
-org.apache.synapse.security.tool.CipherTool $*
+org.apache.synapse.commons.security.tool.CipherTool $*
Modified: synapse/trunk/java/modules/utils/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/pom.xml?rev=773983&r1=773982&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/pom.xml (original)
+++ synapse/trunk/java/modules/utils/pom.xml Tue May 12 17:10:18 2009
@@ -55,7 +55,7 @@
<instructions>
<Bundle-Version>${synapse.bundle.version}</Bundle-Version>
<Export-Package>
- org.apache.synapse.commons.util.*,
+ org.apache.synapse.commons.*,
</Export-Package>
<Import-Package>
!javax.xml.namespace,
Copied: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/SecurityConstants.java (from r773946, synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretConfigurationConstants.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/SecurityConstants.java?p2=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/SecurityConstants.java&p1=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretConfigurationConstants.java&r1=773946&r2=773983&rev=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretConfigurationConstants.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/SecurityConstants.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.commons.util.secret;
+package org.apache.synapse.commons.security;
-public class SecretConfigurationConstants {
+public class SecurityConstants {
public static final String GLOBAL_PREFIX = "synapse.";
public static final String PROP_USER_NAME = "username";
@@ -26,4 +26,6 @@
public static final String PROP_PASSWORD_PROVIDER = "passwordProvider";
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";
+ public static final String PROP_SECRET_MANAGER_ADMIN_MBEAN = "SecretManagerAdmin";
}
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/definition/CipherInformation.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/definition/CipherInformation.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/definition/CipherInformation.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/definition/CipherInformation.java Tue May 12 17:10:18 2009
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.security.definition;
+package org.apache.synapse.commons.security.definition;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.security.enumeration.CipherOperationMode;
-import org.apache.synapse.security.enumeration.EncodingType;
+import org.apache.synapse.commons.security.enumeration.CipherOperationMode;
+import org.apache.synapse.commons.security.enumeration.EncodingType;
/**
* Encapsulates the cipher related information
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/definition/IdentityKeyStoreInformation.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/definition/IdentityKeyStoreInformation.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/definition/IdentityKeyStoreInformation.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/definition/IdentityKeyStoreInformation.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.definition;
+package org.apache.synapse.commons.security.definition;
-import org.apache.synapse.commons.util.secret.SecretInformation;
+import org.apache.synapse.commons.security.secret.SecretInformation;
import javax.net.ssl.KeyManagerFactory;
import java.security.KeyStore;
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/definition/KeyStoreInformation.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/definition/KeyStoreInformation.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/definition/KeyStoreInformation.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/definition/KeyStoreInformation.java Tue May 12 17:10:18 2009
@@ -16,19 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.security.definition;
+package org.apache.synapse.commons.security.definition;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.SynapseException;
-import org.apache.synapse.commons.util.secret.SecretInformation;
-import org.apache.synapse.security.enumeration.KeyStoreType;
-import org.apache.synapse.security.interfaces.ICACertsLoader;
-import org.apache.synapse.security.interfaces.IKeyStoreLoader;
-import org.apache.synapse.security.keystore.CACertsLoader;
-import org.apache.synapse.security.keystore.JKSKeyStoreLoader;
-import org.apache.synapse.security.keystore.PKCS12KeyStoreLoader;
-import org.apache.synapse.security.keystore.PKCS8KeyStoreLoader;
+import org.apache.synapse.commons.security.secret.SecretInformation;
+import org.apache.synapse.commons.security.enumeration.KeyStoreType;
+import org.apache.synapse.commons.security.interfaces.ICACertsLoader;
+import org.apache.synapse.commons.security.interfaces.IKeyStoreLoader;
+import org.apache.synapse.commons.security.keystore.CACertsLoader;
+import org.apache.synapse.commons.security.keystore.JKSKeyStoreLoader;
+import org.apache.synapse.commons.security.keystore.PKCS12KeyStoreLoader;
+import org.apache.synapse.commons.security.keystore.PKCS8KeyStoreLoader;
+import org.apache.synapse.commons.util.SynapseUtilException;
import java.security.KeyStore;
import java.util.HashMap;
@@ -149,12 +149,12 @@
protected void handleException(String msg) {
log.error(msg);
- throw new SynapseException(msg);
+ throw new SynapseUtilException(msg);
}
protected void handleException(String msg, Exception e) {
log.error(msg, e);
- throw new SynapseException(msg, e);
+ throw new SynapseUtilException(msg, e);
}
public SecretInformation getKeyStorePasswordProvider() {
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/definition/TrustKeyStoreInformation.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/definition/TrustKeyStoreInformation.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/definition/TrustKeyStoreInformation.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/definition/TrustKeyStoreInformation.java Tue May 12 17:10:18 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.security.definition;
+package org.apache.synapse.commons.security.definition;
import javax.net.ssl.TrustManagerFactory;
import java.security.KeyStore;
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/definition/factory/KeyStoreInformationFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/definition/factory/KeyStoreInformationFactory.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/definition/factory/KeyStoreInformationFactory.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/definition/factory/KeyStoreInformationFactory.java Tue May 12 17:10:18 2009
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.security.definition.factory;
+package org.apache.synapse.commons.security.definition.factory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-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.security.secret.SecretInformationFactory;
import org.apache.synapse.commons.util.MiscellaneousUtil;
-import org.apache.synapse.commons.util.secret.SecretInformationFactory;
import java.util.Properties;
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/enumeration/CipherOperationMode.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/enumeration/CipherOperationMode.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/enumeration/CipherOperationMode.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/enumeration/CipherOperationMode.java Tue May 12 17:10:18 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.security.enumeration;
+package org.apache.synapse.commons.security.enumeration;
/**
* Cipher Operation Mode.
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/enumeration/EncodingType.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/enumeration/EncodingType.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/enumeration/EncodingType.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/enumeration/EncodingType.java Tue May 12 17:10:18 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.security.enumeration;
+package org.apache.synapse.commons.security.enumeration;
/**
* Encoding Types
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/enumeration/KeyStoreType.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/enumeration/KeyStoreType.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/enumeration/KeyStoreType.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/enumeration/KeyStoreType.java Tue May 12 17:10:18 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.security.enumeration;
+package org.apache.synapse.commons.security.enumeration;
/**
* KeyStore Types
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/interfaces/ICACertsLoader.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/interfaces/ICACertsLoader.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/interfaces/ICACertsLoader.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/interfaces/ICACertsLoader.java Tue May 12 17:10:18 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.security.interfaces;
+package org.apache.synapse.commons.security.interfaces;
import java.security.KeyStore;
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/interfaces/IKeyStoreLoader.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/interfaces/IKeyStoreLoader.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/interfaces/IKeyStoreLoader.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/interfaces/IKeyStoreLoader.java Tue May 12 17:10:18 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.security.interfaces;
+package org.apache.synapse.commons.security.interfaces;
import java.security.KeyStore;
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/keystore/AbstractKeyStoreLoader.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/keystore/AbstractKeyStoreLoader.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/keystore/AbstractKeyStoreLoader.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/keystore/AbstractKeyStoreLoader.java Tue May 12 17:10:18 2009
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.security.keystore;
+package org.apache.synapse.commons.security.keystore;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.SynapseException;
-import org.apache.synapse.security.interfaces.IKeyStoreLoader;
+import org.apache.synapse.commons.security.interfaces.IKeyStoreLoader;
+import org.apache.synapse.commons.util.SynapseUtilException;
import java.io.BufferedInputStream;
import java.io.File;
@@ -99,11 +99,11 @@
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/keystore/CACertsLoader.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/keystore/CACertsLoader.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/keystore/CACertsLoader.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/keystore/CACertsLoader.java Tue May 12 17:10:18 2009
@@ -1,10 +1,10 @@
-package org.apache.synapse.security.keystore;
+package org.apache.synapse.commons.security.keystore;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.SynapseException;
-import org.apache.synapse.security.interfaces.ICACertsLoader;
+import org.apache.synapse.commons.security.interfaces.ICACertsLoader;
+import org.apache.synapse.commons.util.SynapseUtilException;
import java.io.BufferedInputStream;
import java.io.File;
@@ -74,6 +74,6 @@
private void handleException(String msg, Exception e) {
log.error(msg, e);
- throw new SynapseException(msg, e);
+ throw new SynapseUtilException(msg, e);
}
}
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/keystore/JKSKeyStoreLoader.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/keystore/JKSKeyStoreLoader.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/keystore/JKSKeyStoreLoader.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/keystore/JKSKeyStoreLoader.java Tue May 12 17:10:18 2009
@@ -1,7 +1,7 @@
/**
*
*/
-package org.apache.synapse.security.keystore;
+package org.apache.synapse.commons.security.keystore;
import java.security.KeyStore;
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/keystore/PKCS12KeyStoreLoader.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/keystore/PKCS12KeyStoreLoader.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/keystore/PKCS12KeyStoreLoader.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/keystore/PKCS12KeyStoreLoader.java Tue May 12 17:10:18 2009
@@ -1,4 +1,4 @@
-package org.apache.synapse.security.keystore;
+package org.apache.synapse.commons.security.keystore;
import java.security.KeyStore;
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/keystore/PKCS8KeyStoreLoader.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/keystore/PKCS8KeyStoreLoader.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/keystore/PKCS8KeyStoreLoader.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/keystore/PKCS8KeyStoreLoader.java Tue May 12 17:10:18 2009
@@ -1,10 +1,10 @@
-package org.apache.synapse.security.keystore;
+package org.apache.synapse.commons.security.keystore;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.SynapseException;
-import org.apache.synapse.security.interfaces.IKeyStoreLoader;
+import org.apache.synapse.commons.security.interfaces.IKeyStoreLoader;
+import org.apache.synapse.commons.util.SynapseUtilException;
import java.io.*;
import java.security.*;
@@ -178,6 +178,6 @@
private void handleException(String msg, Exception e) {
log.error(msg, e);
- throw new SynapseException(msg, e);
+ throw new SynapseUtilException(msg, e);
}
}
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/mbean/JMXSecretsProvider.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/mbean/JMXSecretsProvider.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/mbean/JMXSecretsProvider.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/mbean/JMXSecretsProvider.java Tue May 12 17:10:18 2009
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.security.mbean;
+package org.apache.synapse.commons.security.mbean;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.SynapseException;
+import org.apache.synapse.commons.util.SynapseUtilException;
import java.util.HashMap;
import java.util.Map;
@@ -68,7 +68,7 @@
private 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/mbean/JMXSecretsProviderMBean.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/mbean/JMXSecretsProviderMBean.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/mbean/JMXSecretsProviderMBean.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/mbean/JMXSecretsProviderMBean.java Tue May 12 17:10:18 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.security.mbean;
+package org.apache.synapse.commons.security.mbean;
/**
* Managing MBean for secrct
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/mbean/SecretManagerAdminMBean.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/mbean/SecretManagerAdminMBean.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/mbean/SecretManagerAdminMBean.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/mbean/SecretManagerAdminMBean.java Tue May 12 17:10:18 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.security.mbean;
+package org.apache.synapse.commons.security.mbean;
/**
* Admin service for managing SecretManager
Copied: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/AbstractSecretCallbackHandler.java (from r773946, 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/security/secret/AbstractSecretCallbackHandler.java?p2=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/AbstractSecretCallbackHandler.java&p1=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/AbstractSecretCallbackHandler.java&r1=773946&r2=773983&rev=773983&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/security/secret/AbstractSecretCallbackHandler.java Tue May 12 17:10:18 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.commons.util.secret;
+package org.apache.synapse.commons.security.secret;
import java.util.Iterator;
Copied: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/MultiSecretCallback.java (from r773946, synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/MultiSecretCallback.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/MultiSecretCallback.java?p2=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/MultiSecretCallback.java&p1=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/MultiSecretCallback.java&r1=773946&r2=773983&rev=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/MultiSecretCallback.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/MultiSecretCallback.java Tue May 12 17:10:18 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.commons.util.secret;
+package org.apache.synapse.commons.security.secret;
import java.util.ArrayList;
import java.util.Iterator;
Copied: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretCallback.java (from r773946, synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretCallback.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretCallback.java?p2=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretCallback.java&p1=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretCallback.java&r1=773946&r2=773983&rev=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretCallback.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretCallback.java Tue May 12 17:10:18 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.commons.util.secret;
+package org.apache.synapse.commons.security.secret;
/**
* Get the required secret from secret providers
Copied: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretCallbackHandler.java (from r773946, synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretCallbackHandler.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretCallbackHandler.java?p2=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretCallbackHandler.java&p1=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretCallbackHandler.java&r1=773946&r2=773983&rev=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretCallbackHandler.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretCallbackHandler.java Tue May 12 17:10:18 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.commons.util.secret;
+package org.apache.synapse.commons.security.secret;
/**
* Get the required secrets needed from varies secret providers
Copied: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretCallbackHandlerFactory.java (from r773946, synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretCallbackHandlerFactory.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretCallbackHandlerFactory.java?p2=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretCallbackHandlerFactory.java&p1=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretCallbackHandlerFactory.java&r1=773946&r2=773983&rev=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretCallbackHandlerFactory.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretCallbackHandlerFactory.java Tue May 12 17:10:18 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.commons.util.secret;
+package org.apache.synapse.commons.security.secret;
import org.apache.synapse.commons.util.MiscellaneousUtil;
import org.apache.synapse.commons.util.SynapseUtilException;
Copied: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretInformation.java (from r773946, synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretInformation.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretInformation.java?p2=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretInformation.java&p1=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretInformation.java&r1=773946&r2=773983&rev=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretInformation.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretInformation.java Tue May 12 17:10:18 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.commons.util.secret;
+package org.apache.synapse.commons.security.secret;
/**
Copied: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretInformationFactory.java (from r773946, synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretInformationFactory.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretInformationFactory.java?p2=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretInformationFactory.java&p1=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretInformationFactory.java&r1=773946&r2=773983&rev=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretInformationFactory.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretInformationFactory.java Tue May 12 17:10:18 2009
@@ -16,11 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.commons.util.secret;
+package org.apache.synapse.commons.security.secret;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.commons.util.MiscellaneousUtil;
+import org.apache.synapse.commons.security.SecurityConstants;
import java.util.Properties;
@@ -50,14 +51,14 @@
SecretInformation secretInformation = new SecretInformation();
String user = MiscellaneousUtil.getProperty(
- properties, configurationPrefix + SecretConfigurationConstants.PROP_USER_NAME, null,
+ properties, configurationPrefix + SecurityConstants.PROP_USER_NAME, null,
String.class);
if (user != null && !"".equals(user)) {
secretInformation.setUser(user);
}
String password = MiscellaneousUtil.getProperty(
- properties, configurationPrefix + SecretConfigurationConstants.PROP_PASSWORD, null,
+ properties, configurationPrefix + SecurityConstants.PROP_PASSWORD, null,
String.class);
if (password != null && !"".equals(password)) {
@@ -67,14 +68,14 @@
// set specific password provider if configured
SecretCallbackHandler passwordProvider =
SecretCallbackHandlerFactory.createSecretCallbackHandler(properties,
- configurationPrefix + SecretConfigurationConstants.PROP_PASSWORD_PROVIDER);
+ configurationPrefix + SecurityConstants.PROP_PASSWORD_PROVIDER);
// if no specific password provider configured, use default password provider
if (passwordProvider == null) {
passwordProvider = SecretCallbackHandlerFactory.createSecretCallbackHandler(
properties,
- SecretConfigurationConstants.GLOBAL_PREFIX
- + SecretConfigurationConstants.PROP_PASSWORD_PROVIDER);
+ SecurityConstants.GLOBAL_PREFIX
+ + SecurityConstants.PROP_PASSWORD_PROVIDER);
}
secretInformation.setPasswordProvider(passwordProvider);
secretInformation.setPasswordPrompt(passwordPrompt);
Copied: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretLoadingModule.java (from r773946, synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretLoadingModule.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretLoadingModule.java?p2=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretLoadingModule.java&p1=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretLoadingModule.java&r1=773946&r2=773983&rev=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SecretLoadingModule.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretLoadingModule.java Tue May 12 17:10:18 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.commons.util.secret;
+package org.apache.synapse.commons.security.secret;
import java.util.ArrayList;
import java.util.List;
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretManager.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretManager.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretManager.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretManager.java Tue May 12 17:10:18 2009
@@ -1,19 +1,18 @@
/**
*
*/
-package org.apache.synapse.security.secret;
+package org.apache.synapse.commons.security.secret;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.SynapseException;
import org.apache.synapse.commons.util.MiscellaneousUtil;
+import org.apache.synapse.commons.util.SynapseUtilException;
import org.apache.synapse.commons.util.jmx.MBeanRegistrar;
-import org.apache.synapse.security.definition.IdentityKeyStoreInformation;
-import org.apache.synapse.security.definition.TrustKeyStoreInformation;
-import org.apache.synapse.security.definition.factory.KeyStoreInformationFactory;
-import org.apache.synapse.security.mbean.SecretManagerAdmin;
-import org.apache.synapse.security.wrappers.IdentityKeyStoreWrapper;
-import org.apache.synapse.security.wrappers.TrustKeyStoreWrapper;
+import org.apache.synapse.commons.security.definition.IdentityKeyStoreInformation;
+import org.apache.synapse.commons.security.definition.TrustKeyStoreInformation;
+import org.apache.synapse.commons.security.definition.factory.KeyStoreInformationFactory;
+import org.apache.synapse.commons.security.wrappers.IdentityKeyStoreWrapper;
+import org.apache.synapse.commons.security.wrappers.TrustKeyStoreWrapper;
import java.util.Properties;
@@ -47,9 +46,7 @@
return SECRET_MANAGER;
}
- private SecretManager() {
- registerMBean();
- }
+ private SecretManager() {}
/**
* Initializes the Secret Manager by providing configuration properties
@@ -216,12 +213,7 @@
private static void handleException(String msg) {
log.error(msg);
- throw new SynapseException(msg);
- }
-
- private void registerMBean() {
- MBeanRegistrar.getInstance().registerMBean(new SecretManagerAdmin(this),
- "SecurityAdminServices", "SecretManagerAdmin");
+ throw new SynapseUtilException(msg);
}
private boolean validatePasswords(String identityStorePass,
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretRepository.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretRepository.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretRepository.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretRepository.java Tue May 12 17:10:18 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.security.secret;
+package org.apache.synapse.commons.security.secret;
import java.util.Properties;
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretRepositoryProvider.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretRepositoryProvider.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretRepositoryProvider.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SecretRepositoryProvider.java Tue May 12 17:10:18 2009
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.security.secret;
+package org.apache.synapse.commons.security.secret;
-import org.apache.synapse.security.wrappers.IdentityKeyStoreWrapper;
-import org.apache.synapse.security.wrappers.TrustKeyStoreWrapper;
+import org.apache.synapse.commons.security.wrappers.IdentityKeyStoreWrapper;
+import org.apache.synapse.commons.security.wrappers.TrustKeyStoreWrapper;
/**
Copied: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SingleSecretCallback.java (from r773946, synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SingleSecretCallback.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SingleSecretCallback.java?p2=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SingleSecretCallback.java&p1=synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SingleSecretCallback.java&r1=773946&r2=773983&rev=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/secret/SingleSecretCallback.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/SingleSecretCallback.java Tue May 12 17:10:18 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.commons.util.secret;
+package org.apache.synapse.commons.security.secret;
/**
* A single secret callback that can be used to collect a single secret
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/HardCodedSecretCallbackHandler.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/HardCodedSecretCallbackHandler.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/HardCodedSecretCallbackHandler.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/HardCodedSecretCallbackHandler.java Tue May 12 17:10:18 2009
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.security.secret.handler;
+package org.apache.synapse.commons.security.secret.handler;
-import org.apache.synapse.commons.util.secret.SingleSecretCallback;
-import org.apache.synapse.commons.util.secret.AbstractSecretCallbackHandler;
+import org.apache.synapse.commons.security.secret.SingleSecretCallback;
+import org.apache.synapse.commons.security.secret.AbstractSecretCallbackHandler;
/**
* Hard-coded passwords as secrets .This is just a demonstration example and need to be adopted
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/JBossEncryptionSecretCallbackHandler.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/JBossEncryptionSecretCallbackHandler.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/JBossEncryptionSecretCallbackHandler.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/JBossEncryptionSecretCallbackHandler.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.secret.handler;
+package org.apache.synapse.commons.security.secret.handler;
-import org.apache.synapse.commons.util.secret.AbstractSecretCallbackHandler;
-import org.apache.synapse.commons.util.secret.SingleSecretCallback;
-import org.apache.synapse.security.definition.CipherInformation;
-import org.apache.synapse.security.enumeration.CipherOperationMode;
-import org.apache.synapse.security.enumeration.EncodingType;
-import org.apache.synapse.security.wrappers.CipherWrapper;
+import org.apache.synapse.commons.security.secret.AbstractSecretCallbackHandler;
+import org.apache.synapse.commons.security.secret.SingleSecretCallback;
+import org.apache.synapse.commons.security.definition.CipherInformation;
+import org.apache.synapse.commons.security.enumeration.CipherOperationMode;
+import org.apache.synapse.commons.security.enumeration.EncodingType;
+import org.apache.synapse.commons.security.wrappers.CipherWrapper;
import java.io.ByteArrayInputStream;
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/JMXSecretCallbackHandler.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/JMXSecretCallbackHandler.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/JMXSecretCallbackHandler.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/JMXSecretCallbackHandler.java Tue May 12 17:10:18 2009
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.security.secret.handler;
+package org.apache.synapse.commons.security.secret.handler;
import org.apache.synapse.commons.util.jmx.MBeanRegistrar;
-import org.apache.synapse.commons.util.secret.AbstractSecretCallbackHandler;
-import org.apache.synapse.commons.util.secret.SingleSecretCallback;
-import org.apache.synapse.security.mbean.JMXSecretsProvider;
+import org.apache.synapse.commons.security.secret.AbstractSecretCallbackHandler;
+import org.apache.synapse.commons.security.secret.SingleSecretCallback;
+import org.apache.synapse.commons.security.mbean.JMXSecretsProvider;
/**
* Get and propagates secrets that have been colleted through JMX Mean
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/JlineSecretCallbackHandler.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/JlineSecretCallbackHandler.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/JlineSecretCallbackHandler.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/JlineSecretCallbackHandler.java Tue May 12 17:10:18 2009
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.security.secret.handler;
+package org.apache.synapse.commons.security.secret.handler;
import jline.ConsoleReader;
-import org.apache.synapse.commons.util.secret.SingleSecretCallback;
-import org.apache.synapse.commons.util.secret.AbstractSecretCallbackHandler;
+import org.apache.synapse.commons.security.secret.SingleSecretCallback;
+import org.apache.synapse.commons.security.secret.AbstractSecretCallbackHandler;
import java.io.IOException;
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/SecretManagerSecretCallbackHandler.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/SecretManagerSecretCallbackHandler.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/SecretManagerSecretCallbackHandler.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/SecretManagerSecretCallbackHandler.java Tue May 12 17:10:18 2009
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.security.secret.handler;
+package org.apache.synapse.commons.security.secret.handler;
-import org.apache.synapse.commons.util.secret.AbstractSecretCallbackHandler;
-import org.apache.synapse.commons.util.secret.SingleSecretCallback;
-import org.apache.synapse.security.secret.SecretManager;
+import org.apache.synapse.commons.security.secret.AbstractSecretCallbackHandler;
+import org.apache.synapse.commons.security.secret.SingleSecretCallback;
+import org.apache.synapse.commons.security.secret.SecretManager;
/**
* SecretManager based secret provider , this can be used by other application
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/SharedSecretCallbackHandler.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/SharedSecretCallbackHandler.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/SharedSecretCallbackHandler.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/SharedSecretCallbackHandler.java Tue May 12 17:10:18 2009
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.security.secret.handler;
+package org.apache.synapse.commons.security.secret.handler;
-import org.apache.synapse.commons.util.secret.AbstractSecretCallbackHandler;
-import org.apache.synapse.commons.util.secret.SingleSecretCallback;
-import org.apache.synapse.commons.util.secret.SecretCallbackHandler;
-import org.apache.synapse.commons.util.secret.SecretCallback;
+import org.apache.synapse.commons.security.secret.AbstractSecretCallbackHandler;
+import org.apache.synapse.commons.security.secret.SingleSecretCallback;
+import org.apache.synapse.commons.security.secret.SecretCallbackHandler;
+import org.apache.synapse.commons.security.secret.SecretCallback;
/**
* SecretCallbackHandler that uses an existing SecretCallbackHandler instance
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/SharedSecretCallbackHandlerCache.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/SharedSecretCallbackHandlerCache.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/SharedSecretCallbackHandlerCache.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/handler/SharedSecretCallbackHandlerCache.java Tue May 12 17:10:18 2009
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.synapse.security.secret.handler;
+package org.apache.synapse.commons.security.secret.handler;
-import org.apache.synapse.commons.util.secret.SecretCallbackHandler;
+import org.apache.synapse.commons.security.secret.SecretCallbackHandler;
/**
* Keep shared SecretCallbackHandler instance.
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/repository/filebased/FileBaseSecretRepository.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/repository/filebased/FileBaseSecretRepository.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/repository/filebased/FileBaseSecretRepository.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/repository/filebased/FileBaseSecretRepository.java Tue May 12 17:10:18 2009
@@ -16,17 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.security.secret.repository.filebased;
+package org.apache.synapse.commons.security.secret.repository.filebased;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.security.definition.CipherInformation;
-import org.apache.synapse.security.enumeration.CipherOperationMode;
-import org.apache.synapse.security.enumeration.EncodingType;
-import org.apache.synapse.security.secret.SecretRepository;
-import org.apache.synapse.security.wrappers.CipherWrapper;
-import org.apache.synapse.security.wrappers.IdentityKeyStoreWrapper;
-import org.apache.synapse.security.wrappers.TrustKeyStoreWrapper;
+import org.apache.synapse.commons.security.definition.CipherInformation;
+import org.apache.synapse.commons.security.enumeration.CipherOperationMode;
+import org.apache.synapse.commons.security.enumeration.EncodingType;
+import org.apache.synapse.commons.security.secret.SecretRepository;
+import org.apache.synapse.commons.security.wrappers.CipherWrapper;
+import org.apache.synapse.commons.security.wrappers.IdentityKeyStoreWrapper;
+import org.apache.synapse.commons.security.wrappers.TrustKeyStoreWrapper;
import org.apache.synapse.commons.util.MiscellaneousUtil;
import java.io.ByteArrayInputStream;
@@ -181,7 +181,7 @@
/**
* @param alias Alias name for look up a secret
* @return Secret if there is any , otherwise ,alias itself
- * @see org.apache.synapse.security.secret.SecretRepository
+ * @see org.apache.synapse.commons.security.secret.SecretRepository
*/
public String getSecret(String alias) {
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/repository/filebased/FileBaseSecretRepositoryProvider.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/repository/filebased/FileBaseSecretRepositoryProvider.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/repository/filebased/FileBaseSecretRepositoryProvider.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/secret/repository/filebased/FileBaseSecretRepositoryProvider.java Tue May 12 17:10:18 2009
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.security.secret.repository.filebased;
+package org.apache.synapse.commons.security.secret.repository.filebased;
-import org.apache.synapse.security.secret.SecretRepository;
-import org.apache.synapse.security.secret.SecretRepositoryProvider;
-import org.apache.synapse.security.wrappers.IdentityKeyStoreWrapper;
-import org.apache.synapse.security.wrappers.TrustKeyStoreWrapper;
+import org.apache.synapse.commons.security.secret.SecretRepository;
+import org.apache.synapse.commons.security.secret.SecretRepositoryProvider;
+import org.apache.synapse.commons.security.wrappers.IdentityKeyStoreWrapper;
+import org.apache.synapse.commons.security.wrappers.TrustKeyStoreWrapper;
/**
@@ -32,7 +32,7 @@
/**
* Returns a FileBaseSecretRepository instance
*
- * @see org.apache.synapse.security.secret.SecretRepositoryProvider
+ * @see org.apache.synapse.commons.security.secret.SecretRepositoryProvider
*/
public SecretRepository getSecretRepository(IdentityKeyStoreWrapper identity,
TrustKeyStoreWrapper trust) {
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/tool/CipherTool.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/tool/CipherTool.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/tool/CipherTool.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/tool/CipherTool.java Tue May 12 17:10:18 2009
@@ -16,22 +16,22 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.security.tool;
+package org.apache.synapse.commons.security.tool;
import org.apache.commons.cli.*;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.SynapseException;
-import org.apache.synapse.commons.util.secret.SecretInformation;
-import org.apache.synapse.security.definition.CipherInformation;
-import org.apache.synapse.security.definition.IdentityKeyStoreInformation;
-import org.apache.synapse.security.definition.TrustKeyStoreInformation;
-import org.apache.synapse.security.enumeration.CipherOperationMode;
-import org.apache.synapse.security.enumeration.EncodingType;
-import org.apache.synapse.security.enumeration.KeyStoreType;
-import org.apache.synapse.security.wrappers.CipherWrapper;
-import org.apache.synapse.security.wrappers.IdentityKeyStoreWrapper;
-import org.apache.synapse.security.wrappers.TrustKeyStoreWrapper;
+import org.apache.synapse.commons.security.secret.SecretInformation;
+import org.apache.synapse.commons.security.definition.CipherInformation;
+import org.apache.synapse.commons.security.definition.IdentityKeyStoreInformation;
+import org.apache.synapse.commons.security.definition.TrustKeyStoreInformation;
+import org.apache.synapse.commons.security.enumeration.CipherOperationMode;
+import org.apache.synapse.commons.security.enumeration.EncodingType;
+import org.apache.synapse.commons.security.enumeration.KeyStoreType;
+import org.apache.synapse.commons.security.wrappers.CipherWrapper;
+import org.apache.synapse.commons.security.wrappers.IdentityKeyStoreWrapper;
+import org.apache.synapse.commons.security.wrappers.TrustKeyStoreWrapper;
+import org.apache.synapse.commons.util.SynapseUtilException;
import javax.crypto.spec.SecretKeySpec;
@@ -406,12 +406,12 @@
private static void handleException(String msg, Exception e) {
log.error(msg, e);
- throw new SynapseException(msg, e);
+ throw new SynapseUtilException(msg, e);
}
private static void handleException(String msg) {
log.error(msg);
- throw new SynapseException(msg);
+ throw new SynapseUtilException(msg);
}
private static void assertEmpty(String value, String key) {
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/tool/EncodingHelper.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/tool/EncodingHelper.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/tool/EncodingHelper.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/tool/EncodingHelper.java Tue May 12 17:10:18 2009
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.synapse.security.tool;
+package org.apache.synapse.commons.security.tool;
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.security.enumeration.EncodingType;
+import org.apache.synapse.commons.security.enumeration.EncodingType;
import sun.misc.BASE64Decoder;
import sun.misc.BASE64Encoder;
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/wrappers/CipherWrapper.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/wrappers/CipherWrapper.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/wrappers/CipherWrapper.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/wrappers/CipherWrapper.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.CipherInformation;
-import org.apache.synapse.security.enumeration.CipherOperationMode;
-import org.apache.synapse.security.tool.EncodingHelper;
+import org.apache.synapse.commons.security.definition.CipherInformation;
+import org.apache.synapse.commons.security.enumeration.CipherOperationMode;
+import org.apache.synapse.commons.security.tool.EncodingHelper;
+import org.apache.synapse.commons.util.SynapseUtilException;
import javax.crypto.Cipher;
import javax.crypto.CipherOutputStream;
@@ -151,11 +151,11 @@
private static void handleException(String msg, Exception e) {
log.error(msg, e);
- throw new SynapseException(msg, e);
+ throw new SynapseUtilException(msg, e);
}
private static 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/IdentityKeyStoreWrapper.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/wrappers/IdentityKeyStoreWrapper.java?rev=773983&r1=773946&r2=773983&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/wrappers/IdentityKeyStoreWrapper.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/security/wrappers/IdentityKeyStoreWrapper.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.IdentityKeyStoreInformation;
+import org.apache.synapse.commons.security.definition.IdentityKeyStoreInformation;
import javax.crypto.SecretKey;
import java.security.Key;
@@ -33,7 +33,7 @@
public class IdentityKeyStoreWrapper extends KeyStoreWrapper {
/**
- * @see org.apache.synapse.security.wrappers.KeyStoreWrapper
+ * @see org.apache.synapse.commons.security.wrappers.KeyStoreWrapper
* #init(org.apache.synapse.security.bean.KeyStoreInformation, String, String)
*/
public void init(IdentityKeyStoreInformation information, String keyPassword) {