[teiid-commits] teiid SVN: r1068 - in trunk: client/src/main/java/com/metamatrix/admin/objects and 49 other directories.

Author: rareddy Date: 2009-06-19 10:17:27 -0400 (Fri, 19 Jun 2009) New Revision: 1068 Added: trunk/common-internal/src/main/java/com/metamatrix/common/log/LogConfigurationImpl.java trunk/common-internal/src/main/java/com/metamatrix/common/util/LogConstants.java trunk/embedded/src/main/java/com/metamatrix/jdbc/Log4JUtil.java trunk/server/src/main/java/com/metamatrix/common/util/ trunk/server/src/main/java/com/metamatrix/common/util/LogCommonConstants.java trunk/server/src/main/java/com/metamatrix/common/util/LogContextsUtil.java trunk/server/src/main/java/com/metamatrix/platform/security/util/ trunk/server/src/main/java/com/metamatrix/platform/security/util/LogSecurityConstants.java Removed: trunk/common-internal/src/main/java/com/metamatrix/common/log/config/ trunk/common-internal/src/main/java/com/metamatrix/common/util/LogCommonConstants.java trunk/common-internal/src/main/java/com/metamatrix/common/util/LogContextsUtil.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/PlatformAdminLogConstants.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/util/LogSecurityConstants.java Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/LogConfiguration.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMLogConfiguration.java trunk/client/src/main/java/com/metamatrix/dqp/embedded/DQPEmbeddedProperties.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Configuration.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ConfigurationObjectEditor.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConfiguration.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConfigurationObjectEditor.java trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/ConfigurationImportExport.java trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/ConnectorArchiveImportExportUtility.java trunk/common-internal/src/main/java/com/metamatrix/common/log/LogConfiguration.java trunk/common-internal/src/main/java/com/metamatrix/common/log/LogManager.java trunk/common-internal/src/main/java/com/metamatrix/common/queue/WorkerPoolFactory.java trunk/common-internal/src/main/java/com/metamatrix/core/event/AbstractEventBroker.java trunk/common-internal/src/main/java/com/metamatrix/core/util/TempDirectory.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/apiimpl/PermissionDataNodeImpl.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/AbstractAuthorizationObjectEditor.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/AuthorizationObjectEditor.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/AuthorizationPermissionsImpl.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/AuthorizationPolicyFactory.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/BasicAuthorizationPermission.java trunk/common-internal/src/test/java/com/metamatrix/common/log/TestLogManager.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmin.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java trunk/embedded/src/main/java/com/metamatrix/jdbc/LogConfigurationProvider.java trunk/embedded/src/main/java/com/metamatrix/jdbc/LogListernerProvider.java trunk/embedded/src/main/java/com/metamatrix/platform/security/authorization/service/AuthorizationServiceImpl.java trunk/embedded/src/main/java/com/metamatrix/platform/security/membership/service/MembershipServiceImpl.java trunk/embedded/src/main/java/com/metamatrix/platform/security/membership/spi/ldap/LDAPMembershipDomain.java trunk/embedded/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java trunk/embedded/src/main/resources/com/metamatrix/dqp/embedded/i18n.properties trunk/engine/src/main/java/com/metamatrix/common/application/AbstractClassLoaderManager.java trunk/engine/src/main/java/com/metamatrix/common/buffer/impl/BufferManagerImpl.java trunk/engine/src/main/java/com/metamatrix/common/buffer/impl/BufferStats.java trunk/engine/src/main/java/com/metamatrix/common/buffer/impl/MemoryState.java trunk/engine/src/main/java/com/metamatrix/common/buffer/storage/file/FileStorageManager.java trunk/engine/src/main/java/com/metamatrix/common/lob/BufferManagerLobChunkStream.java trunk/engine/src/main/java/com/metamatrix/dqp/service/ConfigurationService.java trunk/engine/src/main/java/com/metamatrix/dqp/service/DQPServiceNames.java trunk/engine/src/main/java/com/metamatrix/dqp/service/TransactionService.java trunk/engine/src/main/java/com/metamatrix/dqp/util/LogConstants.java trunk/engine/src/main/java/com/metamatrix/query/util/LogConstants.java trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorManager.java trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java trunk/engine/src/main/java/org/teiid/dqp/internal/process/LobWorkItem.java trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/util/LogRuntimeMetadataConstants.java trunk/server/src/main/java/com/metamatrix/admin/server/ServerConfigAdminImpl.java trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/LogonImpl.java trunk/server/src/main/java/com/metamatrix/common/extensionmodule/ExtensionModuleManager.java trunk/server/src/main/java/com/metamatrix/platform/security/authorization/service/AuthorizationServiceImpl.java trunk/server/src/main/java/com/metamatrix/platform/security/authorization/spi/jdbc/JDBCAuthorizationReader.java trunk/server/src/main/java/com/metamatrix/platform/security/authorization/spi/jdbc/JDBCAuthorizationTransaction.java trunk/server/src/main/java/com/metamatrix/platform/security/membership/service/MembershipServiceImpl.java trunk/server/src/main/java/com/metamatrix/platform/security/membership/spi/ldap/LDAPMembershipDomain.java trunk/server/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java trunk/server/src/main/java/com/metamatrix/server/LogConfigurationProvider.java trunk/server/src/main/java/com/metamatrix/server/admin/api/ServerAdminLogConstants.java trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformTransactionService.java trunk/server/src/main/java/com/metamatrix/server/util/LogConstants.java trunk/txn-jbossts/src/main/java/com/metamatrix/xa/arjuna/ArjunaTransactionProvider.java Log: TEIID-672 : Adding changes specific to the LogConfiguration, where user can manage the log levels for different contexts. Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/LogConfiguration.java =================================================================== --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/LogConfiguration.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/LogConfiguration.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -24,7 +24,9 @@ import java.util.Set; +import com.metamatrix.core.log.MessageLevel; + /** * The LogConfiguration describes the current configuration of the * system logger. @@ -39,132 +41,66 @@ /** * Message level value that specifies that no messages are to be recorded. */ - public static final int NONE = 0; + public static final int NONE = MessageLevel.NONE; /** * Message level value that specifies that critical messages are to be recorded. */ - public static final int CRITICAL = 1; + public static final int CRITICAL = MessageLevel.CRITICAL; /** * Message level value that specifies that error messages and critical * messages are to be recorded. */ - public static final int ERROR = 2; + public static final int ERROR = MessageLevel.ERROR; /** * Message level value that specifies that warning, error and critical * messages are to be recorded. */ - public static final int WARNING = 3; + public static final int WARNING = MessageLevel.WARNING; /** * Message level value that specifies that information, warning, error and critical * messages are to be recorded. */ - public static final int INFO = 4; + public static final int INFO = MessageLevel.INFO; /** * Message level value that specifies that detailed, information, warning, error and critical * messages are to be recorded. */ - public static final int DETAIL = 5; + public static final int DETAIL = MessageLevel.DETAIL; /** * Message level value that specifies that all messages are to be recorded. */ - public static final int TRACE = 6; + public static final int TRACE = MessageLevel.TRACE; - /** - * A flag that specifies ALL logging contexts. Can be used in specifying included or - * discarded logging contexts. If this value exists among other logging contexts - * in the included or discarded sets, all other values are ignored. If this value - * is contained in <i>both</i> sets, no change in the logging configuration will take - * place. - */ - public static final String CTX_ALL = "CTX_ALL"; //$NON-NLS-1$ /** - * The name of the System property that contains the message level for the LogManager. - * This is an optional property that defaults to '3'. - */ - public static final String LOG_LEVEL_PROPERTY_NAME = "metamatrix.log"; //$NON-NLS-1$ - - /** - * <p>The name of the System property that contains the set of comma-separated - * context names for messages <i>not</i> to be recorded. A message context is simply - * some string that identifies something about the component that generates - * the message. The value for the contexts is application specific. - * </p><p> - * This is an optional property that defaults to no contexts (i.e., messages - * with any context are recorded).</p> - */ - public static final String LOG_CONTEXT_PROPERTY_NAME = "metamatrix.log.contexts"; //$NON-NLS-1$ - - /** - * This String should separate each of the contexts in the String value - * for the property {@link #LOG_CONTEXT_PROPERTY_NAME}. For example, - * if this delimiter were a comma, the value for the property might - * be something like "CONFIG,QUERY,CONFIGURATION_ADAPTER". - */ - public static final String CONTEXT_DELIMETER = ","; //$NON-NLS-1$ - - - /** - * Get the current configured Log Level - * TODO: An int log level is of little use to clients. Need to get log level descriptions too. + * Get the current configured Log Level for supplied context + * @param context * @return int value * @see com.metamatrix.core.log.MessageLevel * @since 4.3 */ - int getLogLevel(); + int getLogLevel(String context); /** * Obtain the set of message contexts that are currently used. * @return the unmodifiable set of context Strings; never null */ - Set getIncludedContexts(); + Set<String> getContexts(); - /** - * Obtain the set of contexts for messages that are to be discarded. - * If this method returns an empty set, then messages in all contexts - * are being recorded; if not empty, then messages with a context in the - * returned set are discarded and messages for all other contexts recorded. - * @return the set of contexts for messages that are to be discarded - */ - Set getDiscardedContexts(); - /** * Set the Log Level * * Note: Must call setLogConfiguration(LogConfiguration) for log level to take * affect on the server. * + * @param context log context name * @param logLevel The logLevel to set. - * @since 4.3 */ - public void setLogLevel(int logLevel); - - - /** - * Direct the log configuration to discard the given contexts and - * not record them. - * - * Note: Must call setLogConfiguration(LogConfiguration) for log level to take - * affect on the server. - * - * @param contexts the Set of contexts that should be discarded. - */ - void setDiscardedContexts(Set contexts); - - /** - * Direct the log configuration to record only these contexts. - * - * Note: Must call setLogConfiguration(LogConfiguration) for log level to take - * affect on the server. - * - * @param contexts the Set of contexts that should be included. - */ - void setIncludedContexts(Set contexts); - + public void setLogLevel(String context, int logLevel); } Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMLogConfiguration.java =================================================================== --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMLogConfiguration.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMLogConfiguration.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -22,8 +22,8 @@ package com.metamatrix.admin.objects; -import java.util.HashSet; -import java.util.Iterator; +import java.util.HashMap; +import java.util.Map; import java.util.Set; import com.metamatrix.admin.api.objects.LogConfiguration; @@ -32,95 +32,32 @@ /** * @since 4.3 */ -public class MMLogConfiguration extends MMAdminObject implements - LogConfiguration { +public class MMLogConfiguration extends MMAdminObject implements LogConfiguration { - /**Dummy identifier for the log as a whole.*/ - private final static String Log_IDENTIFIER = "SYSTEM.LOG"; //$NON-NLS-1$ - private int logLevel; - - private Set includedContexts; - - private Set discardedContexts; - - /** - * xtor for Log Configuration - * - * @since 4.3 - */ - public MMLogConfiguration() { - super(new String[] {Log_IDENTIFIER}); - } - /** - * @see com.metamatrix.admin.objects.MMAdminObject#toString() - * @since 4.3 - */ - public String toString() { - StringBuffer sb = new StringBuffer("LogConfiguration:"); //$NON-NLS-1$ - sb.append("\tLog Level: "); //$NON-NLS-1$ - sb.append(getLogLevel()); - - Iterator iter = getIncludedContexts().iterator(); - sb.append("\tLog contexts:"); //$NON-NLS-1$ - while ( iter.hasNext() ) { - String context = (String) iter.next(); - sb.append(context); - if( iter.hasNext()) { - sb.append(","); //$NON-NLS-1$ - } - } - return sb.toString(); - } + Map<String, Integer> contextMap = null; + + public MMLogConfiguration(Map<String, Integer> contextMap) { + this.contextMap = contextMap; + } + + @Override + public Set<String> getContexts() { + return this.contextMap.keySet(); + } - /** - * @see com.metamatrix.admin.api.objects.LogConfiguration#getLogLevel() - * @since 4.3 - */ - public int getLogLevel() { - return logLevel; - } + @Override + public int getLogLevel(String context) { + return this.contextMap.get(context); + } - - /** - * Set the Log Level - * - * @param logLevel The logLevel to set. - * @since 4.3 - */ - public void setLogLevel(int logLevel) { - this.logLevel = logLevel; - } - - /** - * @return Returns the discardedContexts. - * @since 4.3 - */ - public Set getDiscardedContexts() { - return (this.discardedContexts != null ? this.discardedContexts : new HashSet()); - } - - /** - * @param discardedContexts The discardedContexts to set. - * @since 4.3 - */ - public void setDiscardedContexts(Set discardedContexts) { - this.discardedContexts = discardedContexts; - } - - /** - * @return Returns the includedContexts. - * @since 4.3 - */ - public Set getIncludedContexts() { - return (this.includedContexts != null ? this.includedContexts : new HashSet()); - } - - /** - * @param includedContexts The includedContexts to set. - * @since 4.3 - */ - public void setIncludedContexts(Set includedContexts) { - this.includedContexts = includedContexts; - } + @Override + public void setLogLevel(String context, int logLevel) { + this.contextMap.put(context, logLevel); + } + + @Override + public String toString() { + return null; + } } Modified: trunk/client/src/main/java/com/metamatrix/dqp/embedded/DQPEmbeddedProperties.java =================================================================== --- trunk/client/src/main/java/com/metamatrix/dqp/embedded/DQPEmbeddedProperties.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/client/src/main/java/com/metamatrix/dqp/embedded/DQPEmbeddedProperties.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -27,7 +27,6 @@ public interface DQPEmbeddedProperties { public static final String DQP_LOGFILE = "dqp.logFile"; //$NON-NLS-1$ - public static final String DQP_LOGLEVEL = "dqp.logLevel"; //$NON-NLS-1$ public static final String DQP_EXTENSIONS = "dqp.extensions"; //$NON-NLS-1$ public static final String DQP_CONFIGFILE = "dqp.configFile"; //$NON-NLS-1$ public static final String DQP_METADATA_SYSTEMURL = "dqp.metadata.systemURL"; //$NON-NLS-1$ Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Configuration.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Configuration.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Configuration.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -429,11 +429,6 @@ */ Collection getVMComponentDefns(); - /** - * Returns the <code>LogConfiguration</code> - * @return LogConfiguration - */ - LogConfiguration getLogConfiguration(); /** * Returns a boolean true if the configuration is deployed for current use. Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ConfigurationObjectEditor.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ConfigurationObjectEditor.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ConfigurationObjectEditor.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -491,12 +491,6 @@ Configuration setIsDeployed( Configuration t, boolean newValue ); - /** - * Sets the LogConfiguration in effect for the Configuration - */ - Configuration setLogConfiguration( Configuration t, LogConfiguration logConfiguration ); - - // ComponentObject methods /** Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConfiguration.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConfiguration.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConfiguration.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -31,7 +31,6 @@ import java.util.Map; import java.util.Properties; -import com.metamatrix.common.CommonPlugin; import com.metamatrix.common.config.api.AuthenticationProvider; import com.metamatrix.common.config.api.AuthenticationProviderID; import com.metamatrix.common.config.api.ComponentDefn; @@ -48,7 +47,6 @@ import com.metamatrix.common.config.api.DeployedComponentID; import com.metamatrix.common.config.api.Host; import com.metamatrix.common.config.api.HostID; - import com.metamatrix.common.config.api.ResourceDescriptor; import com.metamatrix.common.config.api.ServiceComponentDefn; import com.metamatrix.common.config.api.ServiceComponentDefnID; @@ -56,12 +54,7 @@ import com.metamatrix.common.config.api.VMComponentDefnID; import com.metamatrix.common.config.api.exceptions.ConfigurationException; import com.metamatrix.common.config.api.exceptions.InvalidArgumentException; -import com.metamatrix.common.log.LogConfiguration; -import com.metamatrix.common.log.LogManager; -import com.metamatrix.common.log.config.BasicLogConfiguration; -import com.metamatrix.common.log.config.LogConfigurationException; import com.metamatrix.common.namedobject.BaseID; -import com.metamatrix.common.util.LogCommonConstants; import com.metamatrix.common.util.PropertiesUtils; import com.metamatrix.core.util.Assertion; @@ -1008,32 +1001,6 @@ } - - /** - * <p>Returns a clone of this Configuration's LogConfiguration - * (the LogConfiguration can only be changed through a - * {@link com.metamatrix.common.config.api.service.ConfigurationObjectEditor}). - * </p> - * - * @return <i>clone of</i> the LogConfiguration for this Configuration. - * The returned, cloned object will either be a - * LogConfiguration specified by the properties stored - * persistantly, or a default LogConfiguration if no properties - * are present. A clone is returned to ensure that this - * Configuration's LogConfiguration is only edited through - * a {@link com.metamatrix.common.config.api.service.ConfigurationObjectEditor} - */ - public LogConfiguration getLogConfiguration() { - LogConfiguration result = null; - try{ - result = BasicLogConfiguration.createLogConfiguration(this.getProperties()); - } catch (LogConfigurationException e){ - LogManager.logWarning(LogCommonConstants.CTX_CONFIG, CommonPlugin.Util.getString("MSG.003.001.0001")); //$NON-NLS-1$ - result = new BasicLogConfiguration(); - } - return result; - } - public boolean isDeployed() { return info.isDeployed(); } @@ -1044,56 +1011,6 @@ return info.isReleased(); } -// public void accept(ConfigurationVisitor visitor) { -// // visit this configuration object -// visitor.visitConfiguration(this); - -// // now we must visit all of the Component Defns that this configuration -// // references. -// Map defns = getComponentDefns(); -// Iterator iterator = defns.entrySet().iterator(); -// while (iterator.hasNext()) { -// Map.Entry entry = (Map.Entry)iterator.next(); -// ComponentDefn defn = (ComponentDefn)entry.getValue(); -// switch(getComponentType(defn)){ -// case VM_COMPONENT_DEFN_TYPE: -// ((VMComponentDefn)defn).accept(visitor); -// break; -// case PRODUCT_SERVICE_CONFIG_TYPE: -// ((ProductServiceConfig)defn).accept(visitor); -// break; -// case SERVICE_COMPONENT_DEFN_TYPE: -// ((ServiceComponentDefn)defn).accept(visitor); -// break; -// case RESOURCE_DESCRIPTOR_TYPE: -// ((ResourceDescriptor)defn).accept(visitor); -// break; -// case CONNECTOR_TYPE: -// // do not visit a connector, the export process -// // will add the connector at the root level -// break; -// -// -// case COMPONENT_DEFN_TYPE: -// // do nothing here...we dont know what this component -// // defn is -// break; -// } -// } - -// // now we must visit all of the deployed components that this configuration -// // references -// iterator = deployedComponents.entrySet().iterator(); -// while (iterator.hasNext()) { -// Map.Entry entry = (Map.Entry)iterator.next(); -// Object component = entry.getValue(); -// ((DeployedComponent)component).accept(visitor); -// } - -// info.accept(visitor); -// } - - void setInfo(ConfigurationInfo configInfo) { info = (BasicConfigurationInfo) configInfo; Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConfigurationObjectEditor.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConfigurationObjectEditor.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConfigurationObjectEditor.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -65,14 +65,9 @@ import com.metamatrix.common.config.api.VMComponentDefnID; import com.metamatrix.common.config.api.exceptions.ConfigurationException; import com.metamatrix.common.config.api.exceptions.InvalidComponentException; -import com.metamatrix.common.log.LogConfiguration; -import com.metamatrix.common.log.LogManager; -import com.metamatrix.common.log.config.BasicLogConfiguration; -import com.metamatrix.common.log.config.LogConfigurationException; import com.metamatrix.common.namedobject.BaseObject; import com.metamatrix.common.object.PropertyDefinition; import com.metamatrix.common.util.ErrorMessageKeys; -import com.metamatrix.common.util.LogCommonConstants; import com.metamatrix.core.id.ObjectIDFactory; import com.metamatrix.core.id.UUIDFactory; @@ -1743,59 +1738,7 @@ return deployedcomponent; } -// -// public DeployedComponent setEnabled(Configuration configuration, ServiceComponentDefn serviceComponentDefn, VMComponentDefn vm, boolean enabled) -// throws ConfigurationException { -// if ( configuration == null ) { -// throw new IllegalArgumentException(CommonPlugin.Util.getString(ErrorMessageKeys.CONFIG_ERR_0089, Configuration.class.getName())); -// } -// if ( serviceComponentDefn == null ) { -// throw new IllegalArgumentException(CommonPlugin.Util.getString(ErrorMessageKeys.CONFIG_ERR_0089, ServiceComponentDefn.class.getName())); -// } -// if ( vm == null ) { -// throw new IllegalArgumentException(CommonPlugin.Util.getString(ErrorMessageKeys.CONFIG_ERR_0089, VMComponentDefn.class.getName())); -// } -// -// ServiceComponentDefnID svcID = (ServiceComponentDefnID) serviceComponentDefn.getID(); -// -// DeployedComponent dc = configuration.getDeployedServiceForVM(svcID, vm); -// return this.setEnabled(dc, enabled); -// -// -// -// } - - - - /** - * Sets the LogConfiguration in effect for the Configuration - */ - public Configuration setLogConfiguration( Configuration t, LogConfiguration logConfiguration ){ - BasicConfiguration target = (BasicConfiguration) verifyTargetClass(t,BasicConfiguration.class); - try{ - LogConfiguration oldLogConfig = t.getLogConfiguration(); - Collection discardedContexts = oldLogConfig.getDiscardedContexts(); - - Properties props = BasicLogConfiguration.getLogConfigurationProperties(logConfiguration); - - String contextValue = props.getProperty(BasicLogConfiguration.LOG_CONTEXT_PROPERTY_NAME); - if (contextValue == null && !discardedContexts.isEmpty()){ - this.removeProperty(t, BasicLogConfiguration.LOG_CONTEXT_PROPERTY_NAME); - } else if (contextValue != null && discardedContexts.isEmpty()){ - this.addProperty(t, BasicLogConfiguration.LOG_CONTEXT_PROPERTY_NAME, contextValue); - } else if (contextValue != null && !discardedContexts.isEmpty()){ - this.setProperty(t, BasicLogConfiguration.LOG_CONTEXT_PROPERTY_NAME, contextValue); - } - this.setProperty(t, BasicLogConfiguration.LOG_LEVEL_PROPERTY_NAME, props.getProperty(BasicLogConfiguration.LOG_LEVEL_PROPERTY_NAME)); - - } catch (LogConfigurationException e){ - LogManager.logError(LogCommonConstants.CTX_CONFIG, e, CommonPlugin.Util.getString(ErrorMessageKeys.CONFIG_ERR_0001)); - } - return target; - } - - public ComponentObject addProperty( ComponentObject t, String name, String value ) { if ( t == null ) { throw new IllegalArgumentException(CommonPlugin.Util.getString(ErrorMessageKeys.CONFIG_ERR_0089, ComponentObject.class.getName())); Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/ConfigurationImportExport.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/ConfigurationImportExport.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/ConfigurationImportExport.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -63,7 +63,7 @@ import com.metamatrix.common.log.LogManager; import com.metamatrix.common.namedobject.BaseObject; import com.metamatrix.common.util.ErrorMessageKeys; -import com.metamatrix.common.util.LogCommonConstants; +import com.metamatrix.common.util.LogConstants; import com.metamatrix.common.xml.XMLReaderWriter; import com.metamatrix.common.xml.XMLReaderWriterImpl; import com.metamatrix.core.MetaMatrixCoreException; @@ -392,7 +392,7 @@ getXMLReaderWriter().writeDocument(doc, stream); stream.close(); - LogManager.logInfo(LogCommonConstants.CTX_CONFIG, CommonPlugin.Util.getString("MSG.003.001.0003", cmc.getConfigurationID().getFullName())); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_CONFIG, CommonPlugin.Util.getString("MSG.003.001.0003", cmc.getConfigurationID().getFullName())); //$NON-NLS-1$ } Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/ConnectorArchiveImportExportUtility.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/ConnectorArchiveImportExportUtility.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/ConnectorArchiveImportExportUtility.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -52,7 +52,7 @@ import com.metamatrix.common.config.util.InvalidConfigurationElementException; import com.metamatrix.common.log.LogManager; import com.metamatrix.common.util.ByteArrayHelper; -import com.metamatrix.common.util.LogContextsUtil; +import com.metamatrix.common.util.LogConstants; import com.metamatrix.core.util.FileUtils; import com.metamatrix.core.util.TempDirectory; import com.metamatrix.internal.core.xml.JdomHelper; @@ -468,7 +468,7 @@ // If an extension module not found then throw an exception if (!found) { //throw new ConfigObjectsNotResolvableException("Connector Archive is incomplete \""+moduleName+"\" not found for Connector Type \""+type.getName()+"\"", moduleName); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - LogManager.logWarning(LogContextsUtil.CommonConstants.CTX_CONFIG, CommonPlugin.Util.getString("ConnectorArchiveImportExportUtility.Invalid_archive_missing_jars", new Object[] {moduleName, type.getName()})); //$NON-NLS-1$ + LogManager.logWarning(LogConstants.CTX_CONFIG, CommonPlugin.Util.getString("ConnectorArchiveImportExportUtility.Invalid_archive_missing_jars", new Object[] {moduleName, type.getName()})); //$NON-NLS-1$ } } } Modified: trunk/common-internal/src/main/java/com/metamatrix/common/log/LogConfiguration.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/common/log/LogConfiguration.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/common-internal/src/main/java/com/metamatrix/common/log/LogConfiguration.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -25,62 +25,38 @@ import java.util.Set; import java.util.Collection; -public interface LogConfiguration extends Comparable, Cloneable { +public interface LogConfiguration { /** - * Obtain the set of contexts for messages that are to be discarded. - * If this method returns an empty set, then messages in all contexts - * are being recorded; if not empty, then messages with a context in the - * returned set are discarded and messages for all other contexts recorded. - * @return the set of contexts for messages that are to be discarded + * Get the current configured Log Level for supplied context + * @param context + * @return int value + * @see com.metamatrix.core.log.MessageLevel */ - Set getDiscardedContexts(); - + int getLogLevel(String context); + /** - * Specify that messages with the input context should be discarded - * and not recorded. - * @param context the context to add to the set; this method does nothing - * if the reference is null + * Obtain the set of message contexts that are currently used. + * @return the unmodifiable set of context Strings; never null */ - void discardContext( String context ); - - /** - * Get the level of detail of messages that are currently being recorded. - * @return the level of detail - */ - int getMessageLevel(); - - /** - * Direct the log configuration to record all known logging contexts. + Set<String> getContexts(); + + /** + * Set the Log Level + * + * Note: Must call setLogConfiguration(LogConfiguration) for log level to take + * affect on the server. + * + * @param context log context name + * @param logLevel The logLevel to set. */ - void recordAllContexts(); - + public void setLogLevel(String context, int logLevel); + /** - * Clone the object. + * Is the logging for the given context at the specified message level enabled. + * @param context + * @param msgLevel * @return */ - Object clone(); - - /** - * Direct the log configuration to discard the given contexts and - * not record them. - * @param contexts the collection of contexts that should be discarded. - */ - void discardContexts(Collection contexts); - - /** - * Direct the log configuration to record only these contexts. - * @param contexts the contexts that should be recorded. - */ - void recordContexts(Collection contexts); - - /** - * Direct the log configuration to record messages of the given level - * or above. - * @param level the lowest level to record. - */ - void setMessageLevel(int level); - - - boolean isMessageToBeRecorded(String context, int msgLevel); + boolean isEnabled(String context, int msgLevel); } Added: trunk/common-internal/src/main/java/com/metamatrix/common/log/LogConfigurationImpl.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/common/log/LogConfigurationImpl.java (rev 0) +++ trunk/common-internal/src/main/java/com/metamatrix/common/log/LogConfigurationImpl.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -0,0 +1,76 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package com.metamatrix.common.log; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import com.metamatrix.core.log.MessageLevel; + +public class LogConfigurationImpl implements LogConfiguration, Serializable { + + Map<String, Integer> contextMap = null; + + public LogConfigurationImpl() { + this.contextMap = new HashMap<String, Integer>(); + } + + public LogConfigurationImpl(Map<String, Integer> contextMap) { + this.contextMap = contextMap; + } + + @Override + public Set<String> getContexts() { + return this.contextMap.keySet(); + } + + @Override + public int getLogLevel(String context) { + Integer level = this.contextMap.get(context); + if (level != null) { + return level; + } + return MessageLevel.NONE; + } + + @Override + public void setLogLevel(String context, int logLevel) { + this.contextMap.put(context, logLevel); + } + + @Override + public boolean isEnabled(String context, int msgLevel) { + int level = getLogLevel(context); + return level >= msgLevel; + } + + public static LogConfiguration makeCopy(LogConfiguration config) { + Map<String, Integer> contextMap = new HashMap<String, Integer>(); + for(String context:config.getContexts()) { + contextMap.put(context, config.getLogLevel(context)); + } + return new LogConfigurationImpl(contextMap); + } +} Property changes on: trunk/common-internal/src/main/java/com/metamatrix/common/log/LogConfigurationImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/common-internal/src/main/java/com/metamatrix/common/log/LogManager.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/common/log/LogManager.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/common-internal/src/main/java/com/metamatrix/common/log/LogManager.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -29,13 +29,11 @@ import com.google.inject.Inject; import com.metamatrix.common.CommonPlugin; -import com.metamatrix.common.log.config.BasicLogConfiguration; -import com.metamatrix.common.util.LogCommonConstants; import com.metamatrix.core.MetaMatrixRuntimeException; +import com.metamatrix.core.log.JavaLogWriter; import com.metamatrix.core.log.LogListener; import com.metamatrix.core.log.LogMessage; import com.metamatrix.core.log.MessageLevel; -import com.metamatrix.core.log.JavaLogWriter; /** @@ -90,7 +88,7 @@ public final class LogManager { @Inject - static LogConfiguration configuration = new BasicLogConfiguration(MessageLevel.WARNING); // either injected or manually set using the set methods + static LogConfiguration configuration = new LogConfigurationImpl(); // either injected or manually set using the set methods @Inject static LogListener logListener = new JavaLogWriter(); // either injected or manually set using the set methods @@ -325,13 +323,12 @@ if (configuration == null) { throw new MetaMatrixRuntimeException(CommonPlugin.Util.getString("LogManager_not_configured")); //$NON-NLS-1$ } - return (LogConfiguration)configuration.clone(); + return LogConfigurationImpl.makeCopy(configuration); } - - public static void setLogConfiguration( LogConfiguration config ) { + + public static void setLogConfiguration(LogConfiguration config ) { if ( config != null ) { - logMessage(MessageLevel.INFO, LogCommonConstants.CTX_LOGGING, CommonPlugin.Util.getString("MSG.003.014.0015", config)); //$NON-NLS-1$ - configuration = (LogConfiguration) config.clone(); + configuration = LogConfigurationImpl.makeCopy(config); } } @@ -354,7 +351,10 @@ * or false if it would be discarded by the LogManager. */ public static boolean isMessageToBeRecorded(String context, int msgLevel) { - return configuration.isMessageToBeRecorded(context, msgLevel); + if (configuration != null) { + return configuration.isEnabled(context, msgLevel); + } + return true; } private static void logMessage(int level, String context, Object ... msgParts) { Modified: trunk/common-internal/src/main/java/com/metamatrix/common/queue/WorkerPoolFactory.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/common/queue/WorkerPoolFactory.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/common-internal/src/main/java/com/metamatrix/common/queue/WorkerPoolFactory.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -41,7 +41,7 @@ import com.metamatrix.common.CommonPlugin; import com.metamatrix.common.log.LogManager; -import com.metamatrix.common.util.LogCommonConstants; +import com.metamatrix.common.util.LogConstants; import com.metamatrix.core.log.MessageLevel; import com.metamatrix.core.util.NamedThreadFactory; @@ -79,7 +79,7 @@ @Override protected void afterExecute(Runnable r, Throwable t) { if (t != null) { - LogManager.logError(LogCommonConstants.CTX_POOLING, t, CommonPlugin.Util.getString("WorkerPool.uncaughtException")); //$NON-NLS-1$ + LogManager.logError(LogConstants.CTX_POOLING, t, CommonPlugin.Util.getString("WorkerPool.uncaughtException")); //$NON-NLS-1$ } } }; @@ -190,7 +190,7 @@ } if (atMaxThreads) { if (newMaxQueueSize && maximumPoolSize > 1) { - LogManager.logWarning(LogCommonConstants.CTX_POOLING, CommonPlugin.Util.getString("WorkerPool.Max_thread", maximumPoolSize, poolName, highestQueueSize)); //$NON-NLS-1$ + LogManager.logWarning(LogConstants.CTX_POOLING, CommonPlugin.Util.getString("WorkerPool.Max_thread", maximumPoolSize, poolName, highestQueueSize)); //$NON-NLS-1$ } return; } @@ -201,8 +201,8 @@ threads.add(t); String name = t.getName(); t.setName(name + "_" + poolName + threadCounter.getAndIncrement()); //$NON-NLS-1$ - if (LogManager.isMessageToBeRecorded(LogCommonConstants.CTX_POOLING, MessageLevel.TRACE)) { - LogManager.logTrace(LogCommonConstants.CTX_POOLING, "Beginning work with virtual worker", t.getName()); //$NON-NLS-1$ + if (LogManager.isMessageToBeRecorded(LogConstants.CTX_POOLING, MessageLevel.TRACE)) { + LogManager.logTrace(LogConstants.CTX_POOLING, "Beginning work with virtual worker", t.getName()); //$NON-NLS-1$ } Runnable r = command; while (r != null) { Deleted: trunk/common-internal/src/main/java/com/metamatrix/common/util/LogCommonConstants.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/common/util/LogCommonConstants.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/common-internal/src/main/java/com/metamatrix/common/util/LogCommonConstants.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -1,61 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.common.util; - -public interface LogCommonConstants { - - // ********************************************************************** - // PLEASE NOTE:!!!!!!!!!!!!!!!!! - // All constants defined here should also be defined in - // com.metamatrix.common.util.LogContextsUtil - // ********************************************************************** - - // Contexts - public static final String CTX_DBIDGEN = "DBIDGEN"; //$NON-NLS-1$ - - public static final String CTX_LOGON = "LOGON"; //$NON-NLS-1$ - public static final String CTX_SERVICE = "SERVICE"; //$NON-NLS-1$ - public static final String CTX_PROXY = "PROXY"; //$NON-NLS-1$ - public static final String CTX_CONTROLLER = "CONTROLLER"; //$NON-NLS-1$ - public static final String CTX_CONFIG = "CONFIG"; //$NON-NLS-1$ - public static final String CTX_LOGGING = "LOG"; //$NON-NLS-1$ - public static final String CTX_MESSAGE_BUS = "MESSAGE_BUS"; //$NON-NLS-1$ - public static final String CTX_STANDARD_OUT = "STDOUT"; //$NON-NLS-1$ - public static final String CTX_STANDARD_ERR = "STDERR"; //$NON-NLS-1$ - public static final String CTX_DISTRIB_CACHE = "DISTRIB_CACHE"; //$NON-NLS-1$ - public static final String CTX_POOLING = "RESOURCE_POOLING"; //$NON-NLS-1$ - public static final String CTX_BUFFER_MGR = "BUFFER_MGR"; //$NON-NLS-1$ - public static final String CTX_STORAGE_MGR = "STORAGE_MGR"; //$NON-NLS-1$ - public static final String CTX_XA_TXN = "XA_TXN"; //$NON-NLS-1$ - public static final String CTX_TXN_LOG = "TXN_LOG"; //$NON-NLS-1$ - public static final String CTX_EXTENSION_SOURCE = "EXTENSION_MODULE"; //$NON-NLS-1$ - public static final String CTX_EXTENSION_SOURCE_JDBC = "JDBC_EXT_MODULE_TRANSACTION"; //$NON-NLS-1$ - - // Types - public static final String TYPE_INFO = "INFO"; //$NON-NLS-1$ - public static final String TYPE_TRACE = "TRACE"; //$NON-NLS-1$ - public static final String TYPE_ERROR = "ERROR"; //$NON-NLS-1$ - public static final String TYPE_DEBUG = "DEBUG"; //$NON-NLS-1$ - public static final String TYPE_EXCEPTION = "EXCEPTION"; //$NON-NLS-1$ - public static final String TYPE_WARNING = "WARNING"; //$NON-NLS-1$ -} Added: trunk/common-internal/src/main/java/com/metamatrix/common/util/LogConstants.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/common/util/LogConstants.java (rev 0) +++ trunk/common-internal/src/main/java/com/metamatrix/common/util/LogConstants.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package com.metamatrix.common.util; + +public interface LogConstants { + // add the new contexts to the Log4JUtil.java class, for configuration purpose + public static final String CTX_CONFIG = "CONFIG"; //$NON-NLS-1$ + public static final String CTX_COMMUNICATION = "COMMUNICATION"; //$NON-NLS-1$ + public static final String CTX_POOLING = "RESOURCE_POOLING"; //$NON-NLS-1$ + public static final String CTX_SESSION = "SESSION"; //$NON-NLS-1$ + public static final String CTX_MEMBERSHIP = "MEMBERSHIP"; //$NON-NLS-1$ + public static final String CTX_AUTHORIZATION = "AUTHORIZATION"; //$NON-NLS-1$ + public static final String CTX_AUTHORIZATION_ADMIN_API = "AUTHORIZATION_ADMIN_API"; //$NON-NLS-1$ +} Property changes on: trunk/common-internal/src/main/java/com/metamatrix/common/util/LogConstants.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/common-internal/src/main/java/com/metamatrix/common/util/LogContextsUtil.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/common/util/LogContextsUtil.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/common-internal/src/main/java/com/metamatrix/common/util/LogContextsUtil.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -1,206 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.common.util; - -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; - -/** - * <p> - * Utility class which includes the Set of all String logging contexts used by all parts of the server. - * </p> - * <p> - * Due to build implementations, this class must define all logging contexts, which may be redundantly defined elsewhere. - * </p> - */ -public class LogContextsUtil { - - // ******************************************************************* - // TO ADD NEW CONTEXTS: - // Please add a context to the appropriate inner class, or create - // an appropriate new inner class. Then, also add that context to - // the ALL_CONTEXTS set, which is built in the static block at the - // end of this file. - // - // ******************************************************************* - - public static class CommonConstants { - - // Contexts - public static final String CTX_DBIDGEN = "DBIDGEN"; //$NON-NLS-1$ - public static final String CTX_LOGON = "LOGON"; //$NON-NLS-1$ - public static final String CTX_SERVICE = "SERVICE"; //$NON-NLS-1$ - public static final String CTX_PROXY = "PROXY"; //$NON-NLS-1$ - public static final String CTX_CONTROLLER = "CONTROLLER"; //$NON-NLS-1$ - public static final String CTX_CONFIG = "CONFIG"; //$NON-NLS-1$ - public static final String CTX_LOGGING = "LOG"; //$NON-NLS-1$ - public static final String CTX_MESSAGE_BUS = "MESSAGE_BUS"; //$NON-NLS-1$ - public static final String CTX_STANDARD_OUT = "STDOUT"; //$NON-NLS-1$ - public static final String CTX_STANDARD_ERR = "STDERR"; //$NON-NLS-1$ - public static final String CTX_DISTRIB_CACHE = "DISTRIB_CACHE"; //$NON-NLS-1$ - public static final String CTX_POOLING = "RESOURCE_POOLING"; //$NON-NLS-1$ - public static final String CTX_BUFFER_MGR = "BUFFER_MGR"; //$NON-NLS-1$ - public static final String CTX_STORAGE_MGR = "STORAGE_MGR"; //$NON-NLS-1$ - public static final String CTX_XA_TXN = "XA_TXN"; //$NON-NLS-1$ - public static final String CTX_TXN_LOG = "TXN_LOG"; //$NON-NLS-1$ - public static final String CTX_EXTENSION_SOURCE = "EXTENSION_MODULE"; //$NON-NLS-1$ - public static final String CTX_EXTENSION_SOURCE_JDBC = "JDBC_EXT_MODULE_TRANSACTION"; //$NON-NLS-1$ - public static final String CTX_COMMUNICATION = "COMMUNICATION"; //$NON-NLS-1$ - public static final String CTX_COMMANDLOGGING = "COMMAND_LOG"; //$NON-NLS-1$ - public static final String CTX_AUDITLOGGING = "AUDIT_LOG"; //$NON-NLS-1$ - } - - public static class SecurityConstants { - - public static final String CTX_CLIENT_MONITOR = "CLIENT_MONITOR"; //$NON-NLS-1$ - public static final String CTX_SESSION_MONITOR = "SESSION_MONITOR"; //$NON-NLS-1$ - public static final String CTX_SESSION_CLEANUP = "SESSION_CLEANUP"; //$NON-NLS-1$ - public static final String CTX_SESSION = "SESSION"; //$NON-NLS-1$ - public static final String CTX_SESSION_CACHE = "SESSION_CACHE"; //$NON-NLS-1$ - public static final String CTX_MEMBERSHIP = "MEMBERSHIP"; //$NON-NLS-1$ - public static final String CTX_AUTHORIZATION = "AUTHORIZATION"; //$NON-NLS-1$ - public static final String CTX_AUDIT = "AUDIT"; //$NON-NLS-1$ - } - - public static class PlatformConstants { - - public static final String CTX_REGISTRY = "REGISTRY"; //$NON-NLS-1$ - public static final String CTX_VM_CONTROLLER = "VM_CONTROLLER"; //$NON-NLS-1$ - public static final String CTX_SERVICE_CONTROLLER = "SERVICE_CONTROLLER"; //$NON-NLS-1$ - public static final String CTX_RUNTIME_ADMIN = "RUNTIME_ADMIN"; //$NON-NLS-1$ - } - - public static class PlatformAdminConstants { - - // Platform Admin API - public static final String CTX_ADMIN = "ADMIN"; //$NON-NLS-1$ - public static final String CTX_AUDIT_ADMIN = "AUDIT_ADMIN"; //$NON-NLS-1$ - public static final String CTX_ADMIN_API = "ADMIN_API"; //$NON-NLS-1$ - public static final String CTX_ADMIN_API_CONNECTION = "ADMIN_API_CONNECTION"; //$NON-NLS-1$ - public static final String CTX_AUTHORIZATION_ADMIN_API = "AUTHORIZATION_ADMIN_API"; //$NON-NLS-1$ - public static final String CTX_CONFIGURATION_ADMIN_API = "CONFIGURATION_ADMIN_API"; //$NON-NLS-1$ - public static final String CTX_RUNTIME_STATE_ADMIN_API = "RUNTIME_STATE_ADMIN_API"; //$NON-NLS-1$ - public static final String CTX_EXTENSION_SOURCE_ADMIN_API = "EXTENSION_SOURCE_ADMIN_API"; //$NON-NLS-1$ - - // Server Admin API - public static final String CTX_RUNTIME_METADATA_ADMIN_API = "RUNTIME_METADATA_ADMIN_API"; //$NON-NLS-1$ - } - - public static class RuntimeMetadataConstants { - - public static final String CTX_RUNTIME_METADATA = "RUNTIME_METADATA"; //$NON-NLS-1$ - } - - public static class QueryConstants { - - public static final String CTX_FUNCTION_TREE = "FUNCTION_TREE"; //$NON-NLS-1$ - public static final String CTX_QUERY_PLANNER = "QUERY_PLANNER"; //$NON-NLS-1$ - public static final String CTX_QUERY_RESOLVER = "QUERY_RESOLVER"; //$NON-NLS-1$ - public static final String CTX_XML_PLANNER = "XML_QUERY_PLANNER"; //$NON-NLS-1$ - public static final String CTX_XML_PLAN = "XML_PLAN"; //$NON-NLS-1$ - } - - public static class DQPConstants { - - public static final String CTX_DQP = "DQP"; //$NON-NLS-1$ - public static final String CTX_CONNECTOR = "CONNECTOR"; //$NON-NLS-1$ - } - - public static class ServerConstants { - - public static final String CTX_ROUTER = "ROUTER"; //$NON-NLS-1$ - public static final String CTX_QUERY_SERVICE = "QUERY_SERVICE"; //$NON-NLS-1$ - } - - /** - * The Set of all String logging contexts of all parts of the server. - */ - public static final Set ALL_CONTEXTS; - - // this will need to be updated as any new contexts are added to the - // various "logging contants" interfaces of the different projects - static { - Set allContexts = new HashSet(); - - allContexts.add(CommonConstants.CTX_DBIDGEN); - allContexts.add(CommonConstants.CTX_LOGON); - allContexts.add(CommonConstants.CTX_SERVICE); - allContexts.add(CommonConstants.CTX_PROXY); - allContexts.add(CommonConstants.CTX_CONTROLLER); - allContexts.add(CommonConstants.CTX_CONFIG); - allContexts.add(CommonConstants.CTX_LOGGING); - allContexts.add(CommonConstants.CTX_DISTRIB_CACHE); - allContexts.add(CommonConstants.CTX_MESSAGE_BUS); - allContexts.add(CommonConstants.CTX_POOLING); - allContexts.add(CommonConstants.CTX_BUFFER_MGR); - allContexts.add(CommonConstants.CTX_STORAGE_MGR); - allContexts.add(CommonConstants.CTX_XA_TXN); - allContexts.add(CommonConstants.CTX_STANDARD_OUT); - allContexts.add(CommonConstants.CTX_STANDARD_ERR); - allContexts.add(CommonConstants.CTX_EXTENSION_SOURCE); - allContexts.add(CommonConstants.CTX_EXTENSION_SOURCE_JDBC); - allContexts.add(CommonConstants.CTX_COMMUNICATION); - - allContexts.add(SecurityConstants.CTX_CLIENT_MONITOR); - allContexts.add(SecurityConstants.CTX_SESSION_MONITOR); - allContexts.add(SecurityConstants.CTX_SESSION_CLEANUP); - allContexts.add(SecurityConstants.CTX_SESSION); - allContexts.add(SecurityConstants.CTX_SESSION_CACHE); - allContexts.add(SecurityConstants.CTX_MEMBERSHIP); - allContexts.add(SecurityConstants.CTX_AUTHORIZATION); - allContexts.add(SecurityConstants.CTX_AUDIT); - - allContexts.add(PlatformConstants.CTX_REGISTRY); - allContexts.add(PlatformConstants.CTX_VM_CONTROLLER); - allContexts.add(PlatformConstants.CTX_SERVICE_CONTROLLER); - allContexts.add(PlatformConstants.CTX_RUNTIME_ADMIN); - - allContexts.add(PlatformAdminConstants.CTX_ADMIN); - allContexts.add(PlatformAdminConstants.CTX_AUDIT_ADMIN); - allContexts.add(PlatformAdminConstants.CTX_ADMIN_API); - allContexts.add(PlatformAdminConstants.CTX_ADMIN_API_CONNECTION); - allContexts.add(PlatformAdminConstants.CTX_AUTHORIZATION_ADMIN_API); - allContexts.add(PlatformAdminConstants.CTX_CONFIGURATION_ADMIN_API); - allContexts.add(PlatformAdminConstants.CTX_RUNTIME_STATE_ADMIN_API); - allContexts.add(PlatformAdminConstants.CTX_EXTENSION_SOURCE_ADMIN_API); - - allContexts.add(PlatformAdminConstants.CTX_RUNTIME_METADATA_ADMIN_API); - - allContexts.add(RuntimeMetadataConstants.CTX_RUNTIME_METADATA); - - allContexts.add(QueryConstants.CTX_FUNCTION_TREE); - allContexts.add(QueryConstants.CTX_QUERY_PLANNER); - allContexts.add(QueryConstants.CTX_QUERY_RESOLVER); - allContexts.add(QueryConstants.CTX_XML_PLANNER); - allContexts.add(QueryConstants.CTX_XML_PLAN); - - allContexts.add(DQPConstants.CTX_DQP); - allContexts.add(DQPConstants.CTX_CONNECTOR); - - allContexts.add(ServerConstants.CTX_ROUTER); - allContexts.add(ServerConstants.CTX_QUERY_SERVICE); - - ALL_CONTEXTS = Collections.unmodifiableSet(allContexts); - } -} Modified: trunk/common-internal/src/main/java/com/metamatrix/core/event/AbstractEventBroker.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/core/event/AbstractEventBroker.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/common-internal/src/main/java/com/metamatrix/core/event/AbstractEventBroker.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -27,7 +27,7 @@ import java.util.List; import com.metamatrix.common.log.LogManager; -import com.metamatrix.common.util.LogContextsUtil; +import com.metamatrix.common.util.LogConstants; import com.metamatrix.core.CorePlugin; import com.metamatrix.core.util.Assertion; @@ -173,7 +173,7 @@ listener.processEvent(obj); } } catch ( Throwable t ) { - LogManager.logError(LogContextsUtil.CommonConstants.CTX_COMMUNICATION, t,CorePlugin.Util.getString("AbstractEventBroker.Error_during_event_processing",this.getName())); //$NON-NLS-1$ + LogManager.logError(LogConstants.CTX_COMMUNICATION, t,CorePlugin.Util.getString("AbstractEventBroker.Error_during_event_processing",this.getName())); //$NON-NLS-1$ } } // RMH: } @@ -192,7 +192,7 @@ eventPerfMsg.append('\n'); - LogManager.logInfo(LogContextsUtil.CommonConstants.CTX_COMMUNICATION, eventPerfMsg.toString()); + LogManager.logInfo(LogConstants.CTX_COMMUNICATION, eventPerfMsg.toString()); eventPerfMsg.setLength(0); } } Modified: trunk/common-internal/src/main/java/com/metamatrix/core/util/TempDirectory.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/core/util/TempDirectory.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/common-internal/src/main/java/com/metamatrix/core/util/TempDirectory.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -26,7 +26,7 @@ import java.util.Random; import com.metamatrix.common.log.LogManager; -import com.metamatrix.common.util.LogContextsUtil; +import com.metamatrix.common.util.LogConstants; /** * Creates and deletes temporary directories. @@ -104,7 +104,7 @@ TempDirectory tempDirectory = new TempDirectory(absolutePath, System.currentTimeMillis(), RANDOM.nextLong()); while (new File(tempDirectory.getPath()).exists()) { - LogManager.logWarning(LogContextsUtil.CommonConstants.CTX_CONFIG, "Temporary Folder " + tempDirectory.getPath() + " already exists; Creating new folder..."); //$NON-NLS-1$ //$NON-NLS-2$ + LogManager.logWarning(LogConstants.CTX_CONFIG, "Temporary Folder " + tempDirectory.getPath() + " already exists; Creating new folder..."); //$NON-NLS-1$ //$NON-NLS-2$ try { Thread.sleep(10); } catch (final InterruptedException ignored) { Deleted: trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/PlatformAdminLogConstants.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/PlatformAdminLogConstants.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/PlatformAdminLogConstants.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -1,40 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.platform.admin.api; - -public interface PlatformAdminLogConstants { - -//********************************************************************** -//PLEASE NOTE:!!!!!!!!!!!!!!!!! -//All constants defined here should also be defined in -//com.metamatrix.common.util.LogContextsUtil -//********************************************************************** - - // Platform Admin logging contexts - public static final String CTX_ADMIN_API = "ADMIN_API"; //$NON-NLS-1$ - public static final String CTX_ADMIN_API_CONNECTION = "ADMIN_API_CONNECTION"; //$NON-NLS-1$ - public static final String CTX_AUTHORIZATION_ADMIN_API = "AUTHORIZATION_ADMIN_API"; //$NON-NLS-1$ - public static final String CTX_CONFIGURATION_ADMIN_API = "CONFIGURATION_ADMIN_API"; //$NON-NLS-1$ - public static final String CTX_RUNTIME_STATE_ADMIN_API = "RUNTIME_STATE_ADMIN_API"; //$NON-NLS-1$ - public static final String CTX_EXTENSION_SOURCE_ADMIN_API = "EXTENSION_SOURCE_ADMIN_API"; //$NON-NLS-1$ -} Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin/apiimpl/PermissionDataNodeImpl.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/apiimpl/PermissionDataNodeImpl.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/apiimpl/PermissionDataNodeImpl.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -30,13 +30,13 @@ import com.metamatrix.admin.AdminMessages; import com.metamatrix.common.log.LogManager; import com.metamatrix.common.tree.basic.BasicTreeNode; +import com.metamatrix.common.util.LogConstants; import com.metamatrix.core.id.ObjectID; import com.metamatrix.core.util.Assertion; import com.metamatrix.platform.admin.api.PermissionDataNode; import com.metamatrix.platform.admin.api.PermissionDataNodeDefinition; import com.metamatrix.platform.admin.api.PermissionDataNodeTreeView; import com.metamatrix.platform.admin.api.PermissionNode; -import com.metamatrix.platform.admin.api.PlatformAdminLogConstants; import com.metamatrix.platform.admin.api.exception.PermissionNodeNotActionableException; import com.metamatrix.platform.security.api.AuthorizationActions; import com.metamatrix.platform.security.api.SecurityPlugin; @@ -174,7 +174,7 @@ * accept <i>any</code> actions. */ public void setActions(AuthorizationActions actions) throws PermissionNodeNotActionableException { - LogManager.logDetail(PlatformAdminLogConstants.CTX_AUTHORIZATION_ADMIN_API, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION_ADMIN_API, "setActions(AuthoriztionActions): setting <" + actions + "> on <" + getType().getName() + //$NON-NLS-1$ //$NON-NLS-2$ ">: Allowed actions: <" + this.allowedActions + ">"); //$NON-NLS-1$ //$NON-NLS-2$ if ( ! this.allowedActions.implies(actions) ) { @@ -187,7 +187,7 @@ // Set appropriate permission state, reveal state to ancestery and set modified. // FIXME: Not propagating actions on server for SP1 // setPermissionStateAndPropagate(actions, true); - LogManager.logDetail(PlatformAdminLogConstants.CTX_AUTHORIZATION_ADMIN_API, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION_ADMIN_API, "setActions(AuthorizationActions): set <" + this.actions + "> on <" + getType().getName() + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } @@ -201,7 +201,7 @@ public void setActions(int actions) throws PermissionNodeNotActionableException { // Validity checking performed here AuthorizationActions newActions = StandardAuthorizationActions.getAuthorizationActions(actions); - LogManager.logDetail(PlatformAdminLogConstants.CTX_AUTHORIZATION_ADMIN_API, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION_ADMIN_API, "setActions(int): setting <" + newActions + "> on <" + getType().getName() + //$NON-NLS-1$ //$NON-NLS-2$ ">: Allowed actions: <" + this.allowedActions + ">"); //$NON-NLS-1$ //$NON-NLS-2$ if ( ! this.allowedActions.implies(newActions) ) { @@ -213,7 +213,7 @@ // Set appropriate permission state, reveal state to ancestery and set modified. // FIXME: Not propagating actions on server for SP1 // setPermissionStateAndPropagate(actions, true); - LogManager.logDetail(PlatformAdminLogConstants.CTX_AUTHORIZATION_ADMIN_API, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION_ADMIN_API, "setActions(int): set <" + this.actions + "> on <" + getType().getName() + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } @@ -223,13 +223,13 @@ * @param actions The the actions to set on this data node. */ private void privlegedSetActions(AuthorizationActions actions) { - LogManager.logDetail(PlatformAdminLogConstants.CTX_AUTHORIZATION_ADMIN_API, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION_ADMIN_API, "privlegedSetActions(AuthoriztionActions): setting <" + actions + "> on <" + getType().getName() + //$NON-NLS-1$ //$NON-NLS-2$ ">: Allowed actions: <" + this.allowedActions + ">"); //$NON-NLS-1$ //$NON-NLS-2$ // Set the actions on the node to the given actions masked by the allowed actions. this.actions = StandardAuthorizationActions.getAuthorizationActions(actions.getValue() & this.allowedActions.getValue()); - LogManager.logDetail(PlatformAdminLogConstants.CTX_AUTHORIZATION_ADMIN_API, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION_ADMIN_API, "privlegedSetActions(AuthoriztionActions): Actions now: <" + this.actions + "> on <" + getType().getName() + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } @@ -241,7 +241,7 @@ * @param actions The the actions to set on this data node. */ void setInitialActions(AuthorizationActions initialActions) { - LogManager.logDetail(PlatformAdminLogConstants.CTX_AUTHORIZATION_ADMIN_API, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION_ADMIN_API, "setInitialActions(AuthoriztionActions): setting <" + initialActions + "> on <" + getType().getName() + //$NON-NLS-1$ //$NON-NLS-2$ ">: Allowed actions: <" + this.allowedActions + ">"); //$NON-NLS-1$ //$NON-NLS-2$ this.actionsCreatedWith = initialActions.getValue(); @@ -558,11 +558,11 @@ this.setModified(modified, false); // DEBUG //System.out.println(" *** setPermissionStateAndPropagate: Propagating effected node: <" + this.toString() + "> Modified: <" + this.isModified() + ">"); - LogManager.logDetail(PlatformAdminLogConstants.CTX_AUTHORIZATION_ADMIN_API,"setPermissionStateAndPropagate: Propagating effected node: <" + this.toString() + "> Modified: <" + this.isModified() + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION_ADMIN_API,"setPermissionStateAndPropagate: Propagating effected node: <" + this.toString() + "> Modified: <" + this.isModified() + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ propagateActionsToChildren(actions, modified); // DEBUG //System.out.println(" *** setPermissionStateAndPropagate: Done propagating node: <" + this.toString() + ">\n"); - LogManager.logDetail(PlatformAdminLogConstants.CTX_AUTHORIZATION_ADMIN_API,"setPermissionStateAndPropagate: Done propagating node: <" + this.toString() + ">\n"); //$NON-NLS-1$ //$NON-NLS-2$ + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION_ADMIN_API,"setPermissionStateAndPropagate: Done propagating node: <" + this.toString() + ">\n"); //$NON-NLS-1$ //$NON-NLS-2$ } /** @@ -586,7 +586,7 @@ node = (PermissionDataNodeImpl) nodeItr.next(); // DEBUG //System.out.println("\n *** propActsToChildren: Setting <" + actions + "> on node: <" + node + ">"); - LogManager.logDetail(PlatformAdminLogConstants.CTX_AUTHORIZATION_ADMIN_API,"propActsToChildren: Setting <" + actions + "> on node: <" + node + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION_ADMIN_API,"propActsToChildren: Setting <" + actions + "> on node: <" + node + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ AuthorizationActions theActions = StandardAuthorizationActions.getAuthorizationActions( @@ -595,11 +595,11 @@ node.setModified(modified, false); // DEBUG //System.out.println(" *** propActsToChildren: Set <" + node.getActions() + "> on node: <" + node + "> Modified: <" + node.isModified() + ">"); - LogManager.logDetail(PlatformAdminLogConstants.CTX_AUTHORIZATION_ADMIN_API,"propActsToChildren: Set <" + node.getActions() + "> on node: <" + node + "> Modified: <" + node.isModified() + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION_ADMIN_API,"propActsToChildren: Set <" + node.getActions() + "> on node: <" + node + "> Modified: <" + node.isModified() + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ } // DEBUG //System.out.println(" *** propActsToChildren: Now setting descendant enabled with node: <" + node + ">"); - LogManager.logDetail(PlatformAdminLogConstants.CTX_AUTHORIZATION_ADMIN_API,"propActsToChildren: Now setting descendant enabled with node: <" + node + ">"); //$NON-NLS-1$ //$NON-NLS-2$ + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION_ADMIN_API,"propActsToChildren: Now setting descendant enabled with node: <" + node + ">"); //$NON-NLS-1$ //$NON-NLS-2$ // Now that all children's actions are set, propagate descendant actions to parents // starting with last child propagateDescendantEnabled(node); @@ -622,7 +622,7 @@ parent.descendantActions = otherChildrensCompleteActionValues | child.getActions().getValue(); // DEBUG //System.out.println("\n *** propagateDescendantEnabled: Set descendant actions for node: <" + parent + ">: <" + parent.getDescendantActions() + ">"); - LogManager.logDetail(PlatformAdminLogConstants.CTX_AUTHORIZATION_ADMIN_API, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION_ADMIN_API, "propagateDescendantEnabled: Descendant actions for node: <" + parent + ">: <" + parent.getDescendantActions() + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // Set parent nodes actions to common actions of children. If children have no common @@ -637,7 +637,7 @@ parent.privlegedSetActions(thisNodesActions); // DEBUG //System.out.println(" *** propagateDescendantEnabled: Set actions for node: <" + parent + ">: <" + parent.getActions() + ">"); - LogManager.logDetail(PlatformAdminLogConstants.CTX_AUTHORIZATION_ADMIN_API, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION_ADMIN_API, "Set actions for node: <" + parent + ">: <" + parent.getActions() + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/AbstractAuthorizationObjectEditor.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/AbstractAuthorizationObjectEditor.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/AbstractAuthorizationObjectEditor.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -30,9 +30,9 @@ import com.metamatrix.common.actions.AbstractObjectEditor; import com.metamatrix.common.log.LogManager; +import com.metamatrix.common.util.LogConstants; import com.metamatrix.platform.admin.api.EntitlementMigrationReport; import com.metamatrix.platform.admin.api.PermissionTreeView; -import com.metamatrix.platform.security.util.LogSecurityConstants; import com.metamatrix.platform.security.util.RolePermissionFactory; public abstract class AbstractAuthorizationObjectEditor extends AbstractObjectEditor { @@ -141,7 +141,7 @@ // They're all clonable but log anyway final Object[] params = { sourcePerm }; final String msg = SecurityPlugin.Util.getString(SecurityMessagesKeys.SEC_API_0005,params); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, e, msg ); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, e, msg ); } newPerm.setRealm(newRealm); @@ -192,7 +192,7 @@ MetaMatrixPrincipalName principal = (MetaMatrixPrincipalName)i.next(); if (!allPrincipals.contains(principal.getName())) { i.remove(); - LogManager.logWarning(LogSecurityConstants.CTX_AUTHORIZATION, SecurityPlugin.Util.getString("AbstractAuthorizationObjectEditor.missing_principal", new Object[] {sourcePolicy.getAuthorizationPolicyID().getDisplayName(), principal.getName()})); //$NON-NLS-1$ + LogManager.logWarning(LogConstants.CTX_AUTHORIZATION, SecurityPlugin.Util.getString("AbstractAuthorizationObjectEditor.missing_principal", new Object[] {sourcePolicy.getAuthorizationPolicyID().getDisplayName(), principal.getName()})); //$NON-NLS-1$ } } } Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/AuthorizationObjectEditor.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/AuthorizationObjectEditor.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/AuthorizationObjectEditor.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -29,12 +29,12 @@ import java.util.Set; import com.metamatrix.common.log.LogManager; +import com.metamatrix.common.util.LogConstants; import com.metamatrix.platform.admin.api.AuthorizationEditor; import com.metamatrix.platform.admin.api.EntitlementMigrationReport; import com.metamatrix.platform.admin.api.PermissionDataNode; import com.metamatrix.platform.admin.api.PermissionTreeView; import com.metamatrix.platform.admin.apiimpl.PermissionDataNodeImpl; -import com.metamatrix.platform.security.util.LogSecurityConstants; /** * Editor allows automatic creation of individual {@link com.metamatrix.common.actions.Actions} @@ -124,7 +124,7 @@ // They're all clonable but log anyway final Object[] params = { originalPerm }; final String msg = SecurityPlugin.Util.getString(SecurityMessagesKeys.SEC_API_0005, params); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, e, msg); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, e, msg); } } else { if (rpt != null) { @@ -138,7 +138,7 @@ final Object[] params = { originalPerm }; final String msg = SecurityPlugin.Util.getString(SecurityMessagesKeys.SEC_API_0011, params); - LogManager.logWarning(LogSecurityConstants.CTX_AUTHORIZATION, msg); + LogManager.logWarning(LogConstants.CTX_AUTHORIZATION, msg); } } @@ -175,11 +175,11 @@ // Create permissions for all modified nodes in tree BasicAuthorizationPermissionFactory permFactory = new BasicAuthorizationPermissionFactory(); - LogManager.logTrace(LogSecurityConstants.CTX_AUTHORIZATION,"modifyPermissions: Starting..."); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_AUTHORIZATION,"modifyPermissions: Starting..."); //$NON-NLS-1$ Iterator nodeItr = modifiedNodes.iterator(); while ( nodeItr.hasNext() ) { PermissionDataNodeImpl aNode = (PermissionDataNodeImpl) nodeItr.next(); - LogManager.logTrace(LogSecurityConstants.CTX_AUTHORIZATION,"modifyPermissions: Effected node: " + aNode); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_AUTHORIZATION,"modifyPermissions: Effected node: " + aNode); //$NON-NLS-1$ AuthorizationActions theActions = aNode.getActions(); String resourceName = aNode.getResourceName(); AuthorizationPermission newPerm = null; @@ -188,11 +188,11 @@ boolean isGroupNode = aNode.isGroupNode(); if ( aNode.isLeafNode() || isGroupNode ) { - LogManager.logTrace(LogSecurityConstants.CTX_AUTHORIZATION,"modifyPermissions: LEAF or GROUP - actions <" + theActions + ">"); //$NON-NLS-1$ //$NON-NLS-2$ + LogManager.logTrace(LogConstants.CTX_AUTHORIZATION,"modifyPermissions: LEAF or GROUP - actions <" + theActions + ">"); //$NON-NLS-1$ //$NON-NLS-2$ // Remove old permission on this node, if it exists oldPerm = getExistingPermission(aNode, policy); if ( oldPerm != null ) { - LogManager.logTrace(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace(LogConstants.CTX_AUTHORIZATION, "modifyPermissions: Removing permission: " + oldPerm); //$NON-NLS-1$ currentPerms.remove(oldPerm); permissionsToRemove.add(oldPerm); @@ -201,20 +201,20 @@ if ( ! theActions.equals(StandardAuthorizationActions.NONE) ) { if ( aNode.isLeafNode() ) { - LogManager.logTrace(LogSecurityConstants.CTX_AUTHORIZATION,"modifyPermissions: Creating LEAF permission."); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_AUTHORIZATION,"modifyPermissions: Creating LEAF permission."); //$NON-NLS-1$ // Create leaf permission newPerm = permFactory.create(resourceName, realm, theActions); - LogManager.logTrace(LogSecurityConstants.CTX_AUTHORIZATION,"modifyPermissions: Adding new ELEMENT perm: <" + newPerm.getResourceName() + " - " + newPerm.getActions() + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + LogManager.logTrace(LogConstants.CTX_AUTHORIZATION,"modifyPermissions: Adding new ELEMENT perm: <" + newPerm.getResourceName() + " - " + newPerm.getActions() + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ permissionsToAdd.add(newPerm); } else if (isGroupNode) { - LogManager.logTrace(LogSecurityConstants.CTX_AUTHORIZATION,"modifyPermissions: Creating GROUP " + theActions + " permission."); //$NON-NLS-1$ //$NON-NLS-2$ + LogManager.logTrace(LogConstants.CTX_AUTHORIZATION,"modifyPermissions: Creating GROUP " + theActions + " permission."); //$NON-NLS-1$ //$NON-NLS-2$ // Create new permissions newPerm = permFactory.create(resourceName, realm, theActions); - LogManager.logTrace(LogSecurityConstants.CTX_AUTHORIZATION,"modifyPermissions: Adding new GROUP perm: <" + newPerm.getResourceName() + " - " + newPerm.getActions() + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + LogManager.logTrace(LogConstants.CTX_AUTHORIZATION,"modifyPermissions: Adding new GROUP perm: <" + newPerm.getResourceName() + " - " + newPerm.getActions() + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ permissionsToAdd.add(newPerm); } Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/AuthorizationPermissionsImpl.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/AuthorizationPermissionsImpl.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/AuthorizationPermissionsImpl.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -29,7 +29,7 @@ import java.util.Set; import com.metamatrix.common.log.LogManager; -import com.metamatrix.platform.security.util.LogSecurityConstants; +import com.metamatrix.common.util.LogConstants; /** * This class represents a heterogeneous set of AuthorizationPermission instances. Like the AuthorizationPermission @@ -80,7 +80,7 @@ final Object[] params = { aPerm }; final String msg = SecurityPlugin.Util.getString(SecurityMessagesKeys.SEC_API_0005, params); //I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION,SecurityMessagesKeys.SEC_API_0005,e,aPerm); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, e, msg); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, e, msg); } } } Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/AuthorizationPolicyFactory.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/AuthorizationPolicyFactory.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/AuthorizationPolicyFactory.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -46,7 +46,7 @@ import org.xml.sax.SAXParseException; import com.metamatrix.common.log.LogManager; -import com.metamatrix.platform.security.util.LogSecurityConstants; +import com.metamatrix.common.util.LogConstants; /** * The class build the Policies from the xml file or converts the policies to xml file for importing and exporting of the policy @@ -93,7 +93,7 @@ docBuilder.setErrorHandler(new ErrorHandler() { public void warning(SAXParseException arg0) throws SAXException { - LogManager.logWarning(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logWarning(LogConstants.CTX_AUTHORIZATION, arg0, SecurityPlugin.Util.getString("AuthorizationPolicyFactory.parsing_warning", //$NON-NLS-1$ arg0.getMessage())); Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/BasicAuthorizationPermission.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/BasicAuthorizationPermission.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/api/BasicAuthorizationPermission.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -23,7 +23,7 @@ package com.metamatrix.platform.security.api; import com.metamatrix.common.log.LogManager; -import com.metamatrix.platform.security.util.LogSecurityConstants; +import com.metamatrix.common.util.LogConstants; /** * A BasicAuthorizationPermission defines access permissions for Metadata resources (i.e., MetadataID instances). @@ -131,7 +131,7 @@ // this.getRealm() + "] != that [" + request.getRealm() + "]"); return false; } - LogManager.logTrace( LogSecurityConstants.CTX_AUTHORIZATION, "implies(): Realms are equal"); //$NON-NLS-1$ + LogManager.logTrace( LogConstants.CTX_AUTHORIZATION, "implies(): Realms are equal"); //$NON-NLS-1$ // ----------------------- // Compare the actions ... @@ -141,7 +141,7 @@ // this.getActions() + "] != that [" + request.getActions() + "]"); return false; } - LogManager.logTrace( LogSecurityConstants.CTX_AUTHORIZATION, "implies(): Actions are implied"); //$NON-NLS-1$ + LogManager.logTrace( LogConstants.CTX_AUTHORIZATION, "implies(): Actions are implied"); //$NON-NLS-1$ BasicAuthorizationPermission that = (BasicAuthorizationPermission) request; // --------------------------- Deleted: trunk/common-internal/src/main/java/com/metamatrix/platform/security/util/LogSecurityConstants.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/util/LogSecurityConstants.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/util/LogSecurityConstants.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -1,46 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.platform.security.util; - -import com.metamatrix.common.util.LogCommonConstants; - -public interface LogSecurityConstants extends - LogCommonConstants { - - // ********************************************************************** - // PLEASE NOTE:!!!!!!!!!!!!!!!!! - // All constants defined here should also be defined in - // com.metamatrix.common.util.LogContextsUtil - // ********************************************************************** - - // Contexts - public static final String CTX_CLIENT_MONITOR = "CLIENT_MONITOR"; //$NON-NLS-1$ - public static final String CTX_SESSION_MONITOR = "SESSION_MONITOR"; //$NON-NLS-1$ - public static final String CTX_SESSION_CLEANUP = "SESSION_CLEANUP"; //$NON-NLS-1$ - public static final String CTX_SESSION = "SESSION"; //$NON-NLS-1$ - public static final String CTX_SESSION_CACHE = "SESSION_CACHE"; //$NON-NLS-1$ - public static final String CTX_MEMBERSHIP = "MEMBERSHIP"; //$NON-NLS-1$ - public static final String CTX_AUTHORIZATION = "AUTHORIZATION"; //$NON-NLS-1$ - public static final String CTX_AUDIT = "AUDIT"; //$NON-NLS-1$ - -} Modified: trunk/common-internal/src/test/java/com/metamatrix/common/log/TestLogManager.java =================================================================== --- trunk/common-internal/src/test/java/com/metamatrix/common/log/TestLogManager.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/common-internal/src/test/java/com/metamatrix/common/log/TestLogManager.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -23,14 +23,14 @@ package com.metamatrix.common.log; import java.util.ArrayList; +import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.util.Map; import junit.framework.TestCase; -import com.metamatrix.common.log.config.BasicLogConfiguration; import com.metamatrix.core.log.LogListener; -import com.metamatrix.core.log.LogMessage; import com.metamatrix.core.log.MessageLevel; /** @@ -38,6 +38,8 @@ */ public class TestLogManager extends TestCase { + String context = "SomeContext"; //$NON-NLS-1$ + /** * Constructor for TestLogManager. * @param name @@ -48,7 +50,9 @@ @Override protected void setUp() throws Exception { - LogManager.configuration = new BasicLogConfiguration(); + Map<String, Integer> contextMap = new HashMap<String, Integer>(); + contextMap.put(context, MessageLevel.DETAIL); + LogManager.configuration = new LogConfigurationImpl(contextMap); } // ========================================================================= @@ -58,13 +62,11 @@ /* * Test for boolean isMessageToBeRecorded(String, int) */ - public void testIsMessageToBeRecordedStringI() { - String context = "SomeContext"; //$NON-NLS-1$ - + public void testIsMessageToBeRecordedString() { assertTrue(LogManager.isMessageToBeRecorded(context, MessageLevel.CRITICAL) ); LogConfiguration cfg = LogManager.getLogConfigurationCopy(); - cfg.discardContext(context); + cfg.setLogLevel(context, MessageLevel.NONE); LogManager.setLogConfiguration(cfg); assertFalse(LogManager.isMessageToBeRecorded(context, MessageLevel.CRITICAL) ); } @@ -74,8 +76,9 @@ */ public void testLogMessage() throws Exception { + LogConfiguration cfg = LogManager.getLogConfigurationCopy(); - cfg.setMessageLevel( MessageLevel.INFO ); + cfg.setLogLevel(context, MessageLevel.INFO ); LogManager.setLogConfiguration(cfg); ListLogger listener = new ListLogger(6); @@ -91,7 +94,7 @@ for (Iterator iter = sentMsgList.iterator(); iter.hasNext();) { String msg = (String) iter.next(); - LogManager.logInfo("SomeContext", msg); //$NON-NLS-1$ + LogManager.logInfo(context, msg); } List recevedMsgList = listener.getLoggedMessages(); Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmin.java =================================================================== --- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmin.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmin.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -25,8 +25,10 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; +import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.Properties; import java.util.Set; @@ -56,7 +58,7 @@ import com.metamatrix.common.config.api.ComponentType; import com.metamatrix.common.config.api.ComponentTypeDefn; import com.metamatrix.common.config.api.ConnectorBinding; -import com.metamatrix.common.log.config.BasicLogConfiguration; +import com.metamatrix.common.log.LogConfigurationImpl; import com.metamatrix.common.object.PropertyDefinition; import com.metamatrix.common.util.crypto.CryptoException; import com.metamatrix.common.util.crypto.CryptoUtil; @@ -245,7 +247,7 @@ Object convertToNativeObjects(Object src) { if (src instanceof com.metamatrix.admin.api.objects.LogConfiguration) { com.metamatrix.admin.api.objects.LogConfiguration config = (com.metamatrix.admin.api.objects.LogConfiguration)src; - return covertLogConfiguration(config); + return covertToNativeLogConfiguration(config); } throw new UnsupportedOperationException(DQPEmbeddedPlugin.Util.getString("UnSupported_object_conversion")); //$NON-NLS-1$ } @@ -270,17 +272,22 @@ * Convert LogConfiguration to Admin Object */ private com.metamatrix.admin.api.objects.LogConfiguration covertLogConfiguration(final com.metamatrix.common.log.LogConfiguration src) { - MMLogConfiguration log = new MMLogConfiguration(); - log.setDiscardedContexts(src.getDiscardedContexts()); - log.setLogLevel(src.getMessageLevel()); - return log; + Map<String, Integer> contextMap = new HashMap<String, Integer>(); + for(String context:src.getContexts()) { + contextMap.put(context, src.getLogLevel(context)); + } + return new MMLogConfiguration(contextMap); } /** * Convert LogConfiguration to Admin Object */ - private com.metamatrix.common.log.LogConfiguration covertLogConfiguration(final com.metamatrix.admin.api.objects.LogConfiguration src) { - return new BasicLogConfiguration(src.getDiscardedContexts(), src.getLogLevel()); + private com.metamatrix.common.log.LogConfiguration covertToNativeLogConfiguration(final com.metamatrix.admin.api.objects.LogConfiguration src) { + Map<String, Integer> contextMap = new HashMap<String, Integer>(); + for(String context:src.getContexts()) { + contextMap.put(context, src.getLogLevel(context)); + } + return new LogConfigurationImpl(contextMap); } /** Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java =================================================================== --- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -259,18 +259,6 @@ } /** - * @see com.metamatrix.dqp.service.ConfigurationService#getLogLevel() - * @since 4.3 - */ - public String getLogLevel(){ - String level = getUserPreferences().getProperty(DQPEmbeddedProperties.DQP_LOGLEVEL); - if (level == null) { - level = "3"; //$NON-NLS-1$ - } - return level; - } - - /** * @see com.metamatrix.dqp.service.ConfigurationService#getVDBs() * @since 4.3 */ Added: trunk/embedded/src/main/java/com/metamatrix/jdbc/Log4JUtil.java =================================================================== --- trunk/embedded/src/main/java/com/metamatrix/jdbc/Log4JUtil.java (rev 0) +++ trunk/embedded/src/main/java/com/metamatrix/jdbc/Log4JUtil.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -0,0 +1,125 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ +package com.metamatrix.jdbc; + +import java.util.HashSet; +import java.util.Set; + +import org.apache.log4j.Level; +import org.apache.log4j.Logger; + +import com.metamatrix.core.log.MessageLevel; +import com.metamatrix.common.util.LogConstants; +import com.metamatrix.metadata.runtime.util.LogRuntimeMetadataConstants; + +class Log4JUtil { + private static final String ROOT_CONTEXT = "org.teiid."; //$NON-NLS-1$ + + /** + * Convert {@link MessageLevel} to {@link Level} + * @param level + * @return + */ + public static Level convert2Log4JLevel(int level) { + switch (level) { + case MessageLevel.CRITICAL: + return Level.FATAL; + case MessageLevel.ERROR: + return Level.ERROR; + case MessageLevel.WARNING: + return Level.WARN; + case MessageLevel.INFO: + return Level.INFO; + case MessageLevel.DETAIL: + case MessageLevel.TRACE: + return Level.DEBUG; + case MessageLevel.NONE: + return Level.OFF; + } + return Level.DEBUG; + } + + /** + * Convert {@link Level} to {@link MessageLevel} + * @param level + * @return + */ + public static int convert2MessageLevel(Level level) { + switch (level.toInt()) { + case Level.FATAL_INT: + return MessageLevel.CRITICAL; + case Level.ERROR_INT: + return MessageLevel.ERROR; + case Level.WARN_INT: + return MessageLevel.WARNING; + case Level.INFO_INT: + return MessageLevel.INFO; + case Level.DEBUG_INT: + return MessageLevel.DETAIL; + case Level.OFF_INT: + return MessageLevel.NONE; + } + return MessageLevel.DETAIL; + } + + /** + * Get the logger for the given context. + * @param context + * @return + */ + public static Logger getLogger(String context) { + Logger log4j = null; + if (context.indexOf('.') == -1) { + log4j = Logger.getLogger(ROOT_CONTEXT+context); + } + else { + log4j = Logger.getLogger(context); + } + return log4j; + } + + public static Set<String> getContexts(){ + HashSet<String> contexts = new HashSet<String>(); + contexts.add(ROOT_CONTEXT+com.metamatrix.dqp.util.LogConstants.CTX_DQP); + contexts.add(ROOT_CONTEXT+com.metamatrix.dqp.util.LogConstants.CTX_CONNECTOR); + contexts.add(ROOT_CONTEXT+com.metamatrix.dqp.util.LogConstants.CTX_BUFFER_MGR); + contexts.add(ROOT_CONTEXT+com.metamatrix.dqp.util.LogConstants.CTX_STORAGE_MGR); + contexts.add(ROOT_CONTEXT+com.metamatrix.dqp.util.LogConstants.CTX_TXN_LOG); + contexts.add(ROOT_CONTEXT+com.metamatrix.dqp.util.LogConstants.CTX_EXTENSION_SOURCE); + contexts.add(ROOT_CONTEXT+com.metamatrix.dqp.util.LogConstants.CTX_COMMANDLOGGING); + contexts.add(ROOT_CONTEXT+com.metamatrix.dqp.util.LogConstants.CTX_AUDITLOGGING); + + contexts.add(ROOT_CONTEXT+com.metamatrix.common.util.LogConstants.CTX_CONFIG); + contexts.add(ROOT_CONTEXT+com.metamatrix.common.util.LogConstants.CTX_COMMUNICATION); + contexts.add(ROOT_CONTEXT+com.metamatrix.common.util.LogConstants.CTX_POOLING); + contexts.add(ROOT_CONTEXT+com.metamatrix.common.util.LogConstants.CTX_SESSION); + contexts.add(ROOT_CONTEXT+com.metamatrix.common.util.LogConstants.CTX_AUTHORIZATION); + contexts.add(ROOT_CONTEXT+com.metamatrix.common.util.LogConstants.CTX_MEMBERSHIP); + contexts.add(ROOT_CONTEXT+com.metamatrix.common.util.LogConstants.CTX_AUTHORIZATION_ADMIN_API); + contexts.add(ROOT_CONTEXT+LogRuntimeMetadataConstants.CTX_RUNTIME_METADATA); + + contexts.add("com.arjuna"); //$NON-NLS-1$ + contexts.add("org.jboss"); //$NON-NLS-1$ + contexts.add("org.teiid"); //$NON-NLS-1$ + return contexts; + } +} Property changes on: trunk/embedded/src/main/java/com/metamatrix/jdbc/Log4JUtil.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/embedded/src/main/java/com/metamatrix/jdbc/LogConfigurationProvider.java =================================================================== --- trunk/embedded/src/main/java/com/metamatrix/jdbc/LogConfigurationProvider.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/embedded/src/main/java/com/metamatrix/jdbc/LogConfigurationProvider.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -21,12 +21,16 @@ */ package com.metamatrix.jdbc; +import java.util.Set; + +import org.apache.log4j.Level; +import org.apache.log4j.Logger; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import com.metamatrix.common.application.DQPConfigSource; import com.metamatrix.common.log.LogConfiguration; -import com.metamatrix.common.log.config.BasicLogConfiguration; import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.core.log.MessageLevel; import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin; @@ -40,16 +44,40 @@ @Override public LogConfiguration get() { - String logLevel = configSource.getProperties().getProperty(DQPEmbeddedProperties.DQP_LOGLEVEL); - int level = MessageLevel.WARNING; - if(logLevel != null && logLevel.trim().length() > 0) { - try { - level = Integer.parseInt(logLevel); - } catch(NumberFormatException e) { - throw new MetaMatrixRuntimeException(DQPEmbeddedPlugin.Util.getString("DQPComponent.Unable_to_parse_level") + logLevel); //$NON-NLS-1$ - } - } - return new BasicLogConfiguration(level); + return new Log4JLogConfiguration(); } + + static class Log4JLogConfiguration implements LogConfiguration { + + @Override + public Set<String> getContexts() { + return Log4JUtil.getContexts(); + } + + @Override + public int getLogLevel(String context) { + Logger log = Log4JUtil.getLogger(context); + return Log4JUtil.convert2MessageLevel(log.getLevel()); + } + + @Override + public boolean isEnabled(String context, int level) { + if ( context == null ) { + return false; + } + Level logLevel = Log4JUtil.convert2Log4JLevel(level); + if ( logLevel == Level.OFF) { + return false; + } + Logger log = Log4JUtil.getLogger(context); + return log.isEnabledFor(logLevel); + } + + @Override + public void setLogLevel(String context, int level) { + Logger log = Log4JUtil.getLogger(context); + log.setLevel(Log4JUtil.convert2Log4JLevel(level)); + } + } } Modified: trunk/embedded/src/main/java/com/metamatrix/jdbc/LogListernerProvider.java =================================================================== --- trunk/embedded/src/main/java/com/metamatrix/jdbc/LogListernerProvider.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/embedded/src/main/java/com/metamatrix/jdbc/LogListernerProvider.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -87,45 +87,18 @@ @Override public void log(int level, String context, Object msg) { - Logger log4j = getLogger(context); - log4j.log(convertLevel(level), msg); + Logger log4j = Log4JUtil.getLogger(context); + log4j.log(Log4JUtil.convert2Log4JLevel(level), msg); } public void log(int level, String context, Throwable t, Object msg) { - Logger log4j = getLogger(context); - log4j.log(convertLevel(level), msg, t); + Logger log4j = Log4JUtil.getLogger(context); + log4j.log(Log4JUtil.convert2Log4JLevel(level), msg, t); } - - private Logger getLogger(String context) { - Logger log4j = null; - if (context.indexOf('.') == -1) { - log4j = Logger.getLogger("org.teiid."+context); //$NON-NLS-1$ - } - else { - log4j = Logger.getLogger(context); - } - return log4j; - } - + @Override public void shutdown() { } - public Priority convertLevel(int level) { - switch (level) { - case MessageLevel.CRITICAL: - return Priority.FATAL; - case MessageLevel.ERROR: - return Priority.ERROR; - case MessageLevel.WARNING: - return Priority.WARN; - case MessageLevel.INFO: - return Priority.INFO; - case MessageLevel.DETAIL: - case MessageLevel.TRACE: - return Priority.DEBUG; - } - return Priority.DEBUG; - } } } Modified: trunk/embedded/src/main/java/com/metamatrix/platform/security/authorization/service/AuthorizationServiceImpl.java =================================================================== --- trunk/embedded/src/main/java/com/metamatrix/platform/security/authorization/service/AuthorizationServiceImpl.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/embedded/src/main/java/com/metamatrix/platform/security/authorization/service/AuthorizationServiceImpl.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -48,7 +48,6 @@ import com.metamatrix.common.application.exception.ApplicationInitializationException; import com.metamatrix.common.application.exception.ApplicationLifecycleException; import com.metamatrix.common.log.LogManager; -import com.metamatrix.common.util.LogContextsUtil; import com.metamatrix.common.util.PropertiesUtils; import com.metamatrix.common.vdb.api.VDBArchive; import com.metamatrix.core.log.MessageLevel; @@ -56,6 +55,7 @@ import com.metamatrix.dqp.service.AuditMessage; import com.metamatrix.dqp.service.AuthorizationService; import com.metamatrix.dqp.service.VDBService; +import com.metamatrix.dqp.util.LogConstants; import com.metamatrix.platform.PlatformPlugin; import com.metamatrix.platform.security.api.AuthorizationActions; import com.metamatrix.platform.security.api.AuthorizationPermission; @@ -70,7 +70,6 @@ import com.metamatrix.platform.security.api.StandardAuthorizationActions; import com.metamatrix.platform.security.api.service.AuthorizationServicePropertyNames; import com.metamatrix.platform.security.api.service.MembershipServiceInterface; -import com.metamatrix.platform.security.util.LogSecurityConstants; import com.metamatrix.platform.security.util.RolePermissionFactory; import com.metamatrix.platform.util.ErrorMessageKeys; import com.metamatrix.server.util.ServerAuditContexts; @@ -163,7 +162,7 @@ */ public Collection getInaccessibleResources(SessionToken sessionToken, String contextName, Collection requests) throws AuthorizationMgmtException { - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, new Object[]{"getInaccessibleResources(", sessionToken, ", ", contextName, ", ", requests, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + LogManager.logDetail(com.metamatrix.common.util.LogConstants.CTX_AUTHORIZATION, new Object[]{"getInaccessibleResources(", sessionToken, ", ", contextName, ", ", requests, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ List resources = new ArrayList(); if (requests != null && ! requests.isEmpty()) { @@ -175,7 +174,7 @@ // Audit - request AuditMessage msg = new AuditMessage( contextName, "getInaccessibleResources-request", sessionToken.getUsername(), resources.toArray()); //$NON-NLS-1$ - LogManager.log(MessageLevel.INFO, LogContextsUtil.CommonConstants.CTX_AUDITLOGGING, msg); + LogManager.log(MessageLevel.INFO, LogConstants.CTX_AUDITLOGGING, msg); if (isEntitled(sessionToken.getUsername())) { return Collections.EMPTY_LIST; @@ -204,10 +203,10 @@ if (results.isEmpty()) { msg = new AuditMessage( contextName, "getInaccessibleResources-granted all", sessionToken.getUsername(), resources.toArray()); //$NON-NLS-1$ - LogManager.log(MessageLevel.INFO, LogContextsUtil.CommonConstants.CTX_AUDITLOGGING, msg); + LogManager.log(MessageLevel.INFO, LogConstants.CTX_AUDITLOGGING, msg); } else { msg = new AuditMessage( contextName, "getInaccessibleResources-denied", sessionToken.getUsername(), resources.toArray()); //$NON-NLS-1$ - LogManager.log(MessageLevel.INFO, LogContextsUtil.CommonConstants.CTX_AUDITLOGGING, msg); + LogManager.log(MessageLevel.INFO, LogConstants.CTX_AUDITLOGGING, msg); } return results; } @@ -382,7 +381,7 @@ */ private Set<MetaMatrixPrincipalName> getGroupsForPrincipal(MetaMatrixPrincipalName principal) throws AuthorizationMgmtException, InvalidPrincipalException { - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(com.metamatrix.common.util.LogConstants.CTX_AUTHORIZATION, new Object[] {"getGroupsForPrincipal(", principal, ") - Getting all group memberships."}); //$NON-NLS-1$ //$NON-NLS-2$ // Get the set of all groups this Principal is a member of Set<MetaMatrixPrincipalName> allPrincipals = new HashSet<MetaMatrixPrincipalName>(); @@ -402,7 +401,7 @@ // HACK: Convert ALL member principals to MetaMatrixPrincipalName objs // since Auth and Memb svcs don't speak the same language. MetaMatrixPrincipalName member = new MetaMatrixPrincipalName((String) memberItr.next(), MetaMatrixPrincipal.TYPE_GROUP); - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(com.metamatrix.common.util.LogConstants.CTX_AUTHORIZATION, new Object[]{"getGroupsForPrincipal(", principal, ") - Adding membership <", member, ">"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ allPrincipals.add(member); } @@ -420,13 +419,13 @@ protected boolean isEntitled(String principal) { try { if (membershipServiceProxy.isSuperUser(principal) || !membershipServiceProxy.isSecurityEnabled()) { - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(com.metamatrix.common.util.LogConstants.CTX_AUTHORIZATION, new Object[]{ "Automatically entitling principal", principal}); //$NON-NLS-1$ return true; } } catch (MembershipServiceException e) { String msg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0075); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, e, msg); + LogManager.logError(com.metamatrix.common.util.LogConstants.CTX_AUTHORIZATION, e, msg); } return false; } Modified: trunk/embedded/src/main/java/com/metamatrix/platform/security/membership/service/MembershipServiceImpl.java =================================================================== --- trunk/embedded/src/main/java/com/metamatrix/platform/security/membership/service/MembershipServiceImpl.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/embedded/src/main/java/com/metamatrix/platform/security/membership/service/MembershipServiceImpl.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -50,6 +50,7 @@ import com.metamatrix.common.config.CurrentConfiguration; import com.metamatrix.common.config.api.AuthenticationProviderType; import com.metamatrix.common.log.LogManager; +import com.metamatrix.common.util.LogConstants; import com.metamatrix.common.util.PropertiesUtils; import com.metamatrix.common.util.crypto.CryptoException; import com.metamatrix.common.util.crypto.CryptoUtil; @@ -65,7 +66,6 @@ import com.metamatrix.platform.security.api.service.SuccessfulAuthenticationToken; import com.metamatrix.platform.security.membership.spi.MembershipDomain; import com.metamatrix.platform.security.membership.spi.MembershipSourceException; -import com.metamatrix.platform.security.util.LogSecurityConstants; import com.metamatrix.platform.util.ErrorMessageKeys; /** @@ -148,13 +148,13 @@ } isSecurityEnabled = Boolean.valueOf(env.getProperty(SECURITY_ENABLED)).booleanValue(); - LogManager.logDetail(LogSecurityConstants.CTX_MEMBERSHIP, "Security Enabled: " + isSecurityEnabled); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_MEMBERSHIP, "Security Enabled: " + isSecurityEnabled); //$NON-NLS-1$ try { //TODO: my caller should have already decrypted this for me adminCredentials = CryptoUtil.stringDecrypt(adminCredentials); } catch (CryptoException err) { - LogManager.logCritical(LogSecurityConstants.CTX_MEMBERSHIP, err, PlatformPlugin.Util.getString("MembershipServiceImpl.Root_password_decryption_failed")); //$NON-NLS-1$ + LogManager.logCritical(LogConstants.CTX_MEMBERSHIP, err, PlatformPlugin.Util.getString("MembershipServiceImpl.Root_password_decryption_failed")); //$NON-NLS-1$ throw new ApplicationInitializationException(err); } @@ -171,16 +171,16 @@ try { Properties domainProps = PropertiesUtils.getProperties(domainName + ".*", env); //$NON-NLS-1$ if (!Boolean.valueOf(domainProps.getProperty(DOMAIN_ACTIVE)).booleanValue()) { - LogManager.logDetail(LogSecurityConstants.CTX_MEMBERSHIP, "Skipping initilization of inactive domain " + domainName); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_MEMBERSHIP, "Skipping initilization of inactive domain " + domainName); //$NON-NLS-1$ continue; } MembershipDomain newDomain = createDomain(domainName, domainProps); - LogManager.logInfo(LogSecurityConstants.CTX_MEMBERSHIP, PlatformPlugin.Util.getString("MSG.014.407.0005", domainName)); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_MEMBERSHIP, PlatformPlugin.Util.getString("MSG.014.407.0005", domainName)); //$NON-NLS-1$ if(newDomain!=null) { this.domains.add(new MembershipDomainHolder(newDomain, domainName)); } } catch (Exception e){ - LogManager.logCritical(LogSecurityConstants.CTX_MEMBERSHIP, e, "Failed to load MembershipDomain"); //$NON-NLS-1$ + LogManager.logCritical(LogConstants.CTX_MEMBERSHIP, e, "Failed to load MembershipDomain"); //$NON-NLS-1$ } } } @@ -236,7 +236,7 @@ try { domainHolder.getMembershipDomain().shutdown(); } catch ( Exception e ) { - LogManager.logError(LogSecurityConstants.CTX_MEMBERSHIP, e, ErrorMessageKeys.SEC_MEMBERSHIP_0026); + LogManager.logError(LogConstants.CTX_MEMBERSHIP, e, ErrorMessageKeys.SEC_MEMBERSHIP_0026); } } this.domains.clear(); @@ -269,7 +269,7 @@ */ public AuthenticationToken authenticateUser(String username, Credentials credential, Serializable trustedPayload, String applicationName) { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {"authenticateUser", username, applicationName}); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {"authenticateUser", username, applicationName}); //$NON-NLS-1$ if (credential != null) { String password = new String(credential.getCredentialsAsCharArray()); @@ -279,7 +279,7 @@ } catch (CryptoException err) { //just log and allow the normal authentication flow String msg = PlatformPlugin.Util.getString("MembershipServiceImpl.Decrypt_failed", username); //$NON-NLS-1$ - LogManager.logWarning(LogSecurityConstants.CTX_MEMBERSHIP, err, msg); + LogManager.logWarning(LogConstants.CTX_MEMBERSHIP, err, msg); } } } @@ -292,11 +292,11 @@ if (isSecurityEnabled && allowedAddresses != null) { String address = DQPWorkContext.getWorkContext().getClientAddress(); if (address == null) { - LogManager.logWarning(LogSecurityConstants.CTX_MEMBERSHIP, PlatformPlugin.Util.getString("MembershipServiceImpl.unknown_host")); //$NON-NLS-1$ + LogManager.logWarning(LogConstants.CTX_MEMBERSHIP, PlatformPlugin.Util.getString("MembershipServiceImpl.unknown_host")); //$NON-NLS-1$ return new FailedAuthenticationToken(); } if (!allowedAddresses.matcher(address).matches() || address.equals(CurrentConfiguration.getInstance().getHostAddress().getHostAddress())) { - LogManager.logWarning(LogSecurityConstants.CTX_MEMBERSHIP, PlatformPlugin.Util.getString("MembershipServiceImpl.invalid_host", address, allowedAddresses.pattern())); //$NON-NLS-1$ + LogManager.logWarning(LogConstants.CTX_MEMBERSHIP, PlatformPlugin.Util.getString("MembershipServiceImpl.invalid_host", address, allowedAddresses.pattern())); //$NON-NLS-1$ return new FailedAuthenticationToken(); } } @@ -333,26 +333,26 @@ return new SuccessfulAuthenticationToken(auth.getPayload(), baseUsername + MembershipServiceInterface.AT + domain); } String msg = PlatformPlugin.Util.getString("MembershipServiceImpl.Null_authentication", entry.getDomainName(), username ); //$NON-NLS-1$ - LogManager.logError(LogSecurityConstants.CTX_MEMBERSHIP, msg); + LogManager.logError(LogConstants.CTX_MEMBERSHIP, msg); return new FailedAuthenticationToken(); } catch (LogonException le) { String msg = PlatformPlugin.Util.getString("MembershipServiceImpl.Logon_failed", entry.getDomainName(), username ); //$NON-NLS-1$ - LogManager.logWarning(LogSecurityConstants.CTX_MEMBERSHIP, le, msg); + LogManager.logWarning(LogConstants.CTX_MEMBERSHIP, le, msg); return new FailedAuthenticationToken(); } catch (InvalidUserException e) { String msg = PlatformPlugin.Util.getString("MembershipServiceImpl.Invalid_user", entry.getDomainName(), username ); //$NON-NLS-1$ - LogManager.logDetail(LogSecurityConstants.CTX_MEMBERSHIP, e, msg); + LogManager.logDetail(LogConstants.CTX_MEMBERSHIP, e, msg); } catch (UnsupportedCredentialException e) { String msg = PlatformPlugin.Util.getString("MembershipServiceImpl.Unsupported_credentials", entry.getDomainName(), username ); //$NON-NLS-1$ - LogManager.logDetail(LogSecurityConstants.CTX_MEMBERSHIP, e, msg); + LogManager.logDetail(LogConstants.CTX_MEMBERSHIP, e, msg); } catch (MembershipSourceException e) { //just skip this domain for now String msg = PlatformPlugin.Util.getString("MembershipServiceImpl.source_exception", entry.getDomainName()); //$NON-NLS-1$ - LogManager.logError(LogSecurityConstants.CTX_MEMBERSHIP, e, msg); + LogManager.logError(LogConstants.CTX_MEMBERSHIP, e, msg); } } String msg = PlatformPlugin.Util.getString("MembershipServiceImpl.Failed_authentication", username ); //$NON-NLS-1$ - LogManager.logDetail(LogSecurityConstants.CTX_MEMBERSHIP, msg); + LogManager.logDetail(LogConstants.CTX_MEMBERSHIP, msg); return new FailedAuthenticationToken(); } @@ -456,7 +456,7 @@ */ public MetaMatrixPrincipal getPrincipal(MetaMatrixPrincipalName principal) throws MembershipServiceException, InvalidPrincipalException { - LogManager.logTrace( LogSecurityConstants.CTX_MEMBERSHIP, new Object[] { "getPrincipal", principal }); //$NON-NLS-1$ + LogManager.logTrace( LogConstants.CTX_MEMBERSHIP, new Object[] { "getPrincipal", principal }); //$NON-NLS-1$ String name = principal.getName(); @@ -489,7 +489,7 @@ // Get the principal from this domain BasicMetaMatrixPrincipal result = new BasicMetaMatrixPrincipal(name, MetaMatrixPrincipal.TYPE_USER, results); // If there is a result, then return the principal ... - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[]{"The user \"",name,"\" was obtained from domain \"",domain.getDomainName(),"\""} ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[]{"The user \"",name,"\" was obtained from domain \"",domain.getDomainName(),"\""} ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ return result; } if (domain.getMembershipDomain().getGroupNames().contains(baseName)) { @@ -497,11 +497,11 @@ } } catch ( InvalidPrincipalException e ) { String msg = PlatformPlugin.Util.getString("MembershipServiceImpl.principal_does_not_exist", name, domain.getDomainName()); //$NON-NLS-1$ - LogManager.logError(LogSecurityConstants.CTX_MEMBERSHIP, e, msg); + LogManager.logError(LogConstants.CTX_MEMBERSHIP, e, msg); throw new InvalidPrincipalException(msg); } catch (Throwable e) { String msg = PlatformPlugin.Util.getString("MembershipServiceImpl.source_exception", domain.getDomainName()); //$NON-NLS-1$ - LogManager.logError(LogSecurityConstants.CTX_MEMBERSHIP, e, msg); + LogManager.logError(LogConstants.CTX_MEMBERSHIP, e, msg); throw new MembershipServiceException(msg); } throw new InvalidPrincipalException(PlatformPlugin.Util.getString("MembershipServiceImpl.principal_does_not_exist", name, domain.getDomainName())); //$NON-NLS-1$ @@ -527,7 +527,7 @@ */ public Set getGroupsForUser(String userName) throws MembershipServiceException, InvalidPrincipalException { - LogManager.logTrace( LogSecurityConstants.CTX_MEMBERSHIP, new Object[] { "getGroupsForUser", userName}); //$NON-NLS-1$ + LogManager.logTrace( LogConstants.CTX_MEMBERSHIP, new Object[] { "getGroupsForUser", userName}); //$NON-NLS-1$ MetaMatrixPrincipal principal = getPrincipal(new MetaMatrixPrincipalName(userName, MetaMatrixPrincipal.TYPE_USER)); @@ -549,7 +549,7 @@ * @see com.metamatrix.platform.security.api.service.MembershipServiceInterface#getGroupNames() */ public Set getGroupNames() throws MembershipServiceException { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {"getGroupNames"}); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {"getGroupNames"}); //$NON-NLS-1$ Set result = new HashSet(); Iterator iter = this.domains.iterator(); @@ -559,7 +559,7 @@ result.addAll( getDomainSpecificGroups(domain.getMembershipDomain().getGroupNames(), domain.getDomainName()) ); } catch (Throwable e) { String msg = PlatformPlugin.Util.getString("MembershipServiceImpl.source_exception", domain.getDomainName()); //$NON-NLS-1$ - LogManager.logError(LogSecurityConstants.CTX_MEMBERSHIP, e, msg); + LogManager.logError(LogConstants.CTX_MEMBERSHIP, e, msg); throw new MembershipServiceException(msg); } } @@ -575,7 +575,7 @@ public List getDomainNames() { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {"getDomainNames"}); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {"getDomainNames"}); //$NON-NLS-1$ List names = new ArrayList(); Iterator iter = this.domains.iterator(); @@ -591,7 +591,7 @@ public Set<String> getGroupsForDomain(String domainName) throws MembershipServiceException { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {"getGroupsForDomain", domainName}); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {"getGroupsForDomain", domainName}); //$NON-NLS-1$ MembershipDomainHolder dHolder = null; Iterator iter = this.domains.iterator(); @@ -609,7 +609,7 @@ return getDomainSpecificGroups(dHolder.getMembershipDomain().getGroupNames(), domainName); } catch (Throwable e) { String msg = PlatformPlugin.Util.getString("MembershipServiceImpl.source_exception", dHolder.getDomainName()); //$NON-NLS-1$ - LogManager.logError(LogSecurityConstants.CTX_MEMBERSHIP, e, msg); + LogManager.logError(LogConstants.CTX_MEMBERSHIP, e, msg); throw new MembershipServiceException(msg); } } Modified: trunk/embedded/src/main/java/com/metamatrix/platform/security/membership/spi/ldap/LDAPMembershipDomain.java =================================================================== --- trunk/embedded/src/main/java/com/metamatrix/platform/security/membership/spi/ldap/LDAPMembershipDomain.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/embedded/src/main/java/com/metamatrix/platform/security/membership/spi/ldap/LDAPMembershipDomain.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -49,13 +49,13 @@ import com.metamatrix.api.exception.security.LogonException; import com.metamatrix.api.exception.security.UnsupportedCredentialException; import com.metamatrix.common.log.LogManager; +import com.metamatrix.common.util.LogConstants; import com.metamatrix.platform.PlatformPlugin; import com.metamatrix.platform.security.api.Credentials; import com.metamatrix.platform.security.api.service.MembershipServiceInterface; import com.metamatrix.platform.security.api.service.SuccessfulAuthenticationToken; import com.metamatrix.platform.security.membership.spi.MembershipDomain; import com.metamatrix.platform.security.membership.spi.MembershipSourceException; -import com.metamatrix.platform.security.util.LogSecurityConstants; public class LDAPMembershipDomain implements MembershipDomain { @@ -133,7 +133,7 @@ public void initialize(Properties props) throws MembershipSourceException { this.domainName = props.getProperty(MembershipServiceInterface.DOMAIN_NAME); - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, "Initializing LDAP Domain: " + domainName); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, "Initializing LDAP Domain: " + domainName); //$NON-NLS-1$ ldapTxnTimeoutInMillis = props.getProperty(TXN_TIMEOUT_IN_MILLIS); @@ -164,7 +164,7 @@ if (props.getProperty(USERS_MEMBER_OF_ATTRIBUTE, "").trim().length() == 0 //$NON-NLS-1$ && props.getProperty(GROUPS_GROUP_MEMBER_ATTRIBUTE, "").trim().length() == 0) { //$NON-NLS-1$ - LogManager.logWarning(LogSecurityConstants.CTX_MEMBERSHIP, PlatformPlugin.Util.getString("LDAPMembershipDomain.Require_memberof_property", domainName ) ); //$NON-NLS-1$ + LogManager.logWarning(LogConstants.CTX_MEMBERSHIP, PlatformPlugin.Util.getString("LDAPMembershipDomain.Require_memberof_property", domainName ) ); //$NON-NLS-1$ } // Create the root context. @@ -175,12 +175,12 @@ // If password is blank, we will perform an anonymous bind. if (ldapAdminUserDN != null && ldapAdminUserPass != null) { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, domainName + ": Username was set to:" + ldapAdminUserDN); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, domainName + ": Username was set to:" + ldapAdminUserDN); //$NON-NLS-1$ adminContext.put(Context.SECURITY_AUTHENTICATION, LDAP_AUTH_TYPE); adminContext.put(Context.SECURITY_PRINCIPAL, this.ldapAdminUserDN); adminContext.put(Context.SECURITY_CREDENTIALS, this.ldapAdminUserPass); } else { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, domainName + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, domainName + ": admin dn was blank; performing anonymous bind."); //$NON-NLS-1$ adminContext.put(Context.SECURITY_AUTHENTICATION, "none"); //$NON-NLS-1$ } @@ -271,7 +271,7 @@ } public void shutdown() { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, domainName + ": shutdown()"); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, domainName + ": shutdown()"); //$NON-NLS-1$ } public SuccessfulAuthenticationToken authenticateUser(String username, @@ -282,7 +282,7 @@ LogonException, MembershipSourceException { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] { + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] { domainName, "authenticateUser username", username, "applicationName", applicationName}); //$NON-NLS-1$ //$NON-NLS-2$ if (username == null) { @@ -314,7 +314,7 @@ try { ctx.close(); } catch (NamingException ne) { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, ne, domainName + ": error closing context"); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, ne, domainName + ": error closing context"); //$NON-NLS-1$ } } } @@ -327,7 +327,7 @@ } public Set getGroupNames() throws MembershipSourceException { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] { + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] { domainName, " getGroupNames() called"}); //$NON-NLS-1$ DirContext ctx = null; @@ -340,7 +340,7 @@ try { ctx.close(); } catch (NamingException ne) { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, ne, domainName + ": error closing context"); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, ne, domainName + ": error closing context"); //$NON-NLS-1$ } } } @@ -359,7 +359,7 @@ public Set getGroupNamesForUser(String username) throws InvalidUserException, MembershipSourceException { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {domainName, "getGroupNamesForUser", username}); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {domainName, "getGroupNamesForUser", username}); //$NON-NLS-1$ if(username.length() == 0){ return Collections.EMPTY_SET; @@ -403,7 +403,7 @@ username = escapeLDAPSearchFilter(username); - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {domainName, "getUserEntry", username, "getGroups", String.valueOf(getGroups)}); //$NON-NLS-1$ //$NON-NLS-2$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {domainName, "getUserEntry", username, "getGroups", String.valueOf(getGroups)}); //$NON-NLS-1$ //$NON-NLS-2$ DirContext ctx = null; @@ -428,21 +428,21 @@ singleUserSearchFilter = "(&" + singleUserSearchFilter + context.searchFilter + ")"; //$NON-NLS-1$ //$NON-NLS-2$ } - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {domainName, "searching context", contextName, "with filter", singleUserSearchFilter, "and search scope", String.valueOf(context.searchScope)}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {domainName, "searching context", contextName, "with filter", singleUserSearchFilter, "and search scope", String.valueOf(context.searchScope)}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // We expect to receive only one user from this search, since the username attribute must be unique. NamingEnumeration usersEnumeration = ctx.search(contextName, singleUserSearchFilter, sControls); if (!usersEnumeration.hasMore()) { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {domainName, "no user match found in context", contextName}); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {domainName, "no user match found in context", contextName}); //$NON-NLS-1$ continue; } SearchResult foundUser = (SearchResult)usersEnumeration.next(); - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {domainName, "found user", username, "in context", contextName}); //$NON-NLS-1$ //$NON-NLS-2$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {domainName, "found user", username, "in context", contextName}); //$NON-NLS-1$ //$NON-NLS-2$ if (usersEnumeration.hasMore()) { LogManager - .logWarning(LogSecurityConstants.CTX_MEMBERSHIP, + .logWarning(LogConstants.CTX_MEMBERSHIP, domainName + ": Only expected one user when performing lookup. Check to ensure the display name is unique."); //$NON-NLS-1$ } @@ -470,7 +470,7 @@ } groupList.add(groupDN); LogManager - .logTrace(LogSecurityConstants.CTX_MEMBERSHIP, domainName + .logTrace(LogConstants.CTX_MEMBERSHIP, domainName + "-----Adding user's group: " + groupDN); //$NON-NLS-1$ } } @@ -480,7 +480,7 @@ } UserEntry ue = new UserEntry(dn, groupList); - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {domainName, "UserEntry retrieved for username", username, ue.getDn()}); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {domainName, "UserEntry retrieved for username", username, ue.getDn()}); //$NON-NLS-1$ return ue; } @@ -491,12 +491,12 @@ try { ctx.close(); } catch (NamingException ne) { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, ne, domainName + ": error closing context"); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, ne, domainName + ": error closing context"); //$NON-NLS-1$ } } } - LogManager.logInfo(LogSecurityConstants.CTX_MEMBERSHIP, + LogManager.logInfo(LogConstants.CTX_MEMBERSHIP, domainName + ": No user DN found for user: " + username + ", could not authenticate."); //$NON-NLS-1$ //$NON-NLS-2$ throw new InvalidUserException(username); } @@ -504,7 +504,7 @@ private Map getGroupNames(DirContext ctx, String userDn, boolean mustMatchDn) throws MembershipSourceException { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {domainName, "getGroupNames", userDn, "mustMatchDn", String.valueOf(mustMatchDn)}); //$NON-NLS-1$ //$NON-NLS-2$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {domainName, "getGroupNames", userDn, "mustMatchDn", String.valueOf(mustMatchDn)}); //$NON-NLS-1$ //$NON-NLS-2$ Map groupNames = new HashMap(); @@ -526,15 +526,15 @@ if (userDn != null && context.memberOfAttribute != null) { searchFilter = "(&(" + context.memberOfAttribute + "=" + userDn + ")" + searchFilter + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ } else if (mustMatchDn) { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {domainName, "skipping group context"}); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {domainName, "skipping group context"}); //$NON-NLS-1$ continue; } - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {domainName, "searching group context", contextName, "with filter", searchFilter, "and search scope", String.valueOf(context.searchScope)}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {domainName, "searching group context", contextName, "with filter", searchFilter, "and search scope", String.valueOf(context.searchScope)}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ NamingEnumeration groupsEnum = ctx.search(contextName, searchFilter, groupSC); - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {domainName, "Parsing through groups search results."}); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {domainName, "Parsing through groups search results."}); //$NON-NLS-1$ while (groupsEnum.hasMore()) { SearchResult curGroup = (SearchResult)groupsEnum.next(); @@ -562,7 +562,7 @@ groupNames.put(groupDN, groupDisplayName); - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {domainName, "Found groupDN", groupDN, "with display name", groupDisplayName}); //$NON-NLS-1$ //$NON-NLS-2$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {domainName, "Found groupDN", groupDN, "with display name", groupDisplayName}); //$NON-NLS-1$ //$NON-NLS-2$ } } } catch (NamingException err) { Modified: trunk/embedded/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java =================================================================== --- trunk/embedded/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/embedded/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -47,6 +47,7 @@ import com.metamatrix.common.application.exception.ApplicationLifecycleException; import com.metamatrix.common.comm.api.ServerConnection; import com.metamatrix.common.log.LogManager; +import com.metamatrix.common.util.LogConstants; import com.metamatrix.core.util.ArgCheck; import com.metamatrix.dqp.service.VDBService; import com.metamatrix.metadata.runtime.exception.VirtualDatabaseDoesNotExistException; @@ -60,7 +61,6 @@ import com.metamatrix.platform.security.api.service.AuthenticationToken; import com.metamatrix.platform.security.api.service.MembershipServiceInterface; import com.metamatrix.platform.security.api.service.SessionServiceInterface; -import com.metamatrix.platform.security.util.LogSecurityConstants; import com.metamatrix.platform.util.ErrorMessageKeys; import com.metamatrix.platform.util.LogMessageKeys; import com.metamatrix.platform.util.ProductInfoConstants; @@ -96,14 +96,14 @@ for (MetaMatrixSessionInfo info : sessionCache.values()) { try { if (currentTime - info.getLastPingTime() > ServerConnection.PING_INTERVAL * 5) { - LogManager.logInfo(LogSecurityConstants.CTX_SESSION, PlatformPlugin.Util.getString( "SessionServiceImpl.keepaliveFailed", info.getSessionID())); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_SESSION, PlatformPlugin.Util.getString( "SessionServiceImpl.keepaliveFailed", info.getSessionID())); //$NON-NLS-1$ closeSession(info.getSessionID()); } else if (sessionTimeLimit > 0 && currentTime - info.getTimeCreated() > sessionTimeLimit) { - LogManager.logInfo(LogSecurityConstants.CTX_SESSION, PlatformPlugin.Util.getString( "SessionServiceImpl.expireSession", info.getSessionID())); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_SESSION, PlatformPlugin.Util.getString( "SessionServiceImpl.expireSession", info.getSessionID())); //$NON-NLS-1$ closeSession(info.getSessionID()); } } catch (Exception e) { - LogManager.logDetail(LogSecurityConstants.CTX_SESSION, e, "error running session monitor, unable to monitor: " + info.getSessionID()); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_SESSION, e, "error running session monitor, unable to monitor: " + info.getSessionID()); //$NON-NLS-1$ } } } @@ -111,7 +111,7 @@ @Override public void closeSession(MetaMatrixSessionID sessionID) throws InvalidSessionException, SessionServiceException{ - LogManager.logDetail(LogSecurityConstants.CTX_SESSION, new Object[] {"closeSession", sessionID}); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_SESSION, new Object[] {"closeSession", sessionID}); //$NON-NLS-1$ MetaMatrixSessionInfo info = this.sessionCache.remove(sessionID); if (info == null) { throw new InvalidSessionException(ErrorMessageKeys.SEC_SESSION_0027, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_SESSION_0027, sessionID)); @@ -120,7 +120,7 @@ try { dqpCore.terminateConnection(info.getSessionToken().getSessionIDValue()); } catch (Exception e) { - LogManager.logWarning(LogSecurityConstants.CTX_SESSION,e,"Exception terminitating session"); //$NON-NLS-1$ + LogManager.logWarning(LogConstants.CTX_SESSION,e,"Exception terminitating session"); //$NON-NLS-1$ } } } @@ -269,12 +269,12 @@ MetaMatrixSessionID adminSessionID) throws AuthorizationException, SessionServiceException { Object[] params = {adminSessionID, terminatedSessionID}; - LogManager.logInfo(LogSecurityConstants.CTX_SESSION, PlatformPlugin.Util.getString( "SessionServiceImpl.terminateSession", params)); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_SESSION, PlatformPlugin.Util.getString( "SessionServiceImpl.terminateSession", params)); //$NON-NLS-1$ try { closeSession(terminatedSessionID); return true; } catch (InvalidSessionException e) { - LogManager.logWarning(LogSecurityConstants.CTX_SESSION,e,PlatformPlugin.Util.getString(LogMessageKeys.SEC_SESSION_0034, new Object[] {e.getMessage()})); + LogManager.logWarning(LogConstants.CTX_SESSION,e,PlatformPlugin.Util.getString(LogMessageKeys.SEC_SESSION_0034, new Object[] {e.getMessage()})); return false; } } Modified: trunk/embedded/src/main/resources/com/metamatrix/dqp/embedded/i18n.properties =================================================================== --- trunk/embedded/src/main/resources/com/metamatrix/dqp/embedded/i18n.properties 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/embedded/src/main/resources/com/metamatrix/dqp/embedded/i18n.properties 2009-06-19 14:17:27 UTC (rev 1068) @@ -38,7 +38,6 @@ ServerConfiguration.Props_file_null=Properties file name must be non-null ServerConfiguration.Err_interpreting_property=Error interpreting property \"{0}\" with value \"{1}\" as a URL. ServerConfiguration.Req_prop_not_specified=Required property \"{0}\" not specified -DQPComponent.Unable_to_parse_level=Unable to parse log level: VDBConfigFileReader.Connector_type_names_do_not_match=Connector type names do not match: \"{0}\" and \"{1}\". VDBConfigFileReader.No_connector_type_for_connector=Configuration has no connector type definition for type \"{0}\" for connector binding \"{1}\". Modified: trunk/engine/src/main/java/com/metamatrix/common/application/AbstractClassLoaderManager.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/common/application/AbstractClassLoaderManager.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/engine/src/main/java/com/metamatrix/common/application/AbstractClassLoaderManager.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -34,7 +34,7 @@ import com.metamatrix.common.classloader.URLFilteringClassLoader; import com.metamatrix.common.log.LogManager; import com.metamatrix.common.protocol.MetaMatrixURLStreamHandlerFactory; -import com.metamatrix.common.util.LogCommonConstants; +import com.metamatrix.dqp.util.LogConstants; public abstract class AbstractClassLoaderManager implements ClassLoaderManager { @@ -104,7 +104,7 @@ urls.add(url); } } catch (MalformedURLException e) { - LogManager.logError(LogCommonConstants.CTX_EXTENSION_SOURCE, "Invalid extension classpath entry " + urlString); //$NON-NLS-1$ + LogManager.logError(LogConstants.CTX_EXTENSION_SOURCE, "Invalid extension classpath entry " + urlString); //$NON-NLS-1$ } } Modified: trunk/engine/src/main/java/com/metamatrix/common/buffer/impl/BufferManagerImpl.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/common/buffer/impl/BufferManagerImpl.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/engine/src/main/java/com/metamatrix/common/buffer/impl/BufferManagerImpl.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -48,9 +48,9 @@ import com.metamatrix.common.lob.LobChunk; import com.metamatrix.common.log.LogManager; import com.metamatrix.common.types.Streamable; -import com.metamatrix.common.util.LogCommonConstants; import com.metamatrix.core.log.MessageLevel; import com.metamatrix.core.util.Assertion; +import com.metamatrix.dqp.util.LogConstants; import com.metamatrix.query.execution.QueryExecPlugin; /** @@ -184,7 +184,7 @@ case ManagedBatch.PINNED: stats.numPinnedBatches++; - if ( LogManager.isMessageToBeRecorded(LogCommonConstants.CTX_BUFFER_MGR, MessageLevel.TRACE )) { + if ( LogManager.isMessageToBeRecorded(LogConstants.CTX_BUFFER_MGR, MessageLevel.TRACE )) { stats.pinnedManagedBatches.add(batch); } @@ -251,8 +251,8 @@ TupleSourceInfo info = new TupleSourceInfo(newID, schema, types, getGroupInfo(groupName), tupleSourceType); tupleSourceMap.put(newID, info); - if (LogManager.isMessageToBeRecorded(LogCommonConstants.CTX_BUFFER_MGR, MessageLevel.DETAIL)) { - LogManager.logDetail(LogCommonConstants.CTX_BUFFER_MGR, new Object[]{"Creating TupleSource:", newID, "of type "+tupleSourceType}); //$NON-NLS-1$ //$NON-NLS-2$ + if (LogManager.isMessageToBeRecorded(LogConstants.CTX_BUFFER_MGR, MessageLevel.DETAIL)) { + LogManager.logDetail(LogConstants.CTX_BUFFER_MGR, new Object[]{"Creating TupleSource:", newID, "of type "+tupleSourceType}); //$NON-NLS-1$ //$NON-NLS-2$ } return newID; @@ -270,8 +270,8 @@ // this is a bogus tuple source ID return; } - if (LogManager.isMessageToBeRecorded(LogCommonConstants.CTX_BUFFER_MGR, MessageLevel.DETAIL)) { - LogManager.logDetail(LogCommonConstants.CTX_BUFFER_MGR, new Object[]{"Removing TupleSource:", tupleSourceID}); //$NON-NLS-1$ + if (LogManager.isMessageToBeRecorded(LogConstants.CTX_BUFFER_MGR, MessageLevel.DETAIL)) { + LogManager.logDetail(LogConstants.CTX_BUFFER_MGR, new Object[]{"Removing TupleSource:", tupleSourceID}); //$NON-NLS-1$ } // Remove from main map first @@ -326,8 +326,8 @@ public void removeTupleSources(String groupName) throws MetaMatrixComponentException { - if (LogManager.isMessageToBeRecorded(LogCommonConstants.CTX_BUFFER_MGR, MessageLevel.DETAIL)) { - LogManager.logDetail(LogCommonConstants.CTX_BUFFER_MGR, new Object[]{"Removing TupleSources for group", groupName}); //$NON-NLS-1$ + if (LogManager.isMessageToBeRecorded(LogConstants.CTX_BUFFER_MGR, MessageLevel.DETAIL)) { + LogManager.logDetail(LogConstants.CTX_BUFFER_MGR, new Object[]{"Removing TupleSources for group", groupName}); //$NON-NLS-1$ } // Get tuple sources to remove @@ -418,8 +418,8 @@ public void setStatus(TupleSourceID tupleSourceID, TupleSourceStatus status) throws TupleSourceNotFoundException, MetaMatrixComponentException { - if (LogManager.isMessageToBeRecorded(LogCommonConstants.CTX_BUFFER_MGR, MessageLevel.DETAIL)) { - LogManager.logDetail(LogCommonConstants.CTX_BUFFER_MGR, new Object[]{"Setting status for", tupleSourceID, "to", status}); //$NON-NLS-1$ //$NON-NLS-2$ + if (LogManager.isMessageToBeRecorded(LogConstants.CTX_BUFFER_MGR, MessageLevel.DETAIL)) { + LogManager.logDetail(LogConstants.CTX_BUFFER_MGR, new Object[]{"Setting status for", tupleSourceID, "to", status}); //$NON-NLS-1$ //$NON-NLS-2$ } TupleSourceInfo info = getTupleSourceInfo(tupleSourceID, true); @@ -467,8 +467,8 @@ public void addTupleBatch(TupleSourceID tupleSourceID, TupleBatch tupleBatch) throws TupleSourceNotFoundException, MetaMatrixComponentException { - if (LogManager.isMessageToBeRecorded(LogCommonConstants.CTX_BUFFER_MGR, MessageLevel.TRACE)) { - LogManager.logTrace(LogCommonConstants.CTX_BUFFER_MGR, new Object[]{"AddTupleBatch for", tupleSourceID, "with " + tupleBatch.getRowCount() + " rows"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + if (LogManager.isMessageToBeRecorded(LogConstants.CTX_BUFFER_MGR, MessageLevel.TRACE)) { + LogManager.logTrace(LogConstants.CTX_BUFFER_MGR, new Object[]{"AddTupleBatch for", tupleSourceID, "with " + tupleBatch.getRowCount() + " rows"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } if (tupleBatch.getRowCount() == 0 && !tupleBatch.getTerminationFlag()) { @@ -542,8 +542,8 @@ public TupleBatch pinTupleBatch(TupleSourceID tupleSourceID, int beginRow, int maxEndRow) throws TupleSourceNotFoundException, MemoryNotAvailableException, MetaMatrixComponentException { - if (LogManager.isMessageToBeRecorded(LogCommonConstants.CTX_BUFFER_MGR, MessageLevel.TRACE)) { - LogManager.logTrace(LogCommonConstants.CTX_BUFFER_MGR, new Object[]{"Pinning tupleBatch for", tupleSourceID, "beginRow:", beginRow, "maxEndRow:", maxEndRow}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + if (LogManager.isMessageToBeRecorded(LogConstants.CTX_BUFFER_MGR, MessageLevel.TRACE)) { + LogManager.logTrace(LogConstants.CTX_BUFFER_MGR, new Object[]{"Pinning tupleBatch for", tupleSourceID, "beginRow:", beginRow, "maxEndRow:", maxEndRow}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } this.pinRequests.incrementAndGet(); @@ -673,8 +673,8 @@ public void unpinTupleBatch(TupleSourceID tupleSourceID, int beginRow, int endRow) throws TupleSourceNotFoundException, MetaMatrixComponentException { - if (LogManager.isMessageToBeRecorded(LogCommonConstants.CTX_BUFFER_MGR, MessageLevel.TRACE)) { - LogManager.logTrace(LogCommonConstants.CTX_BUFFER_MGR, new Object[]{"Unpinning tupleBatch for", tupleSourceID, "beginRow: " + beginRow}); //$NON-NLS-1$ //$NON-NLS-2$ + if (LogManager.isMessageToBeRecorded(LogConstants.CTX_BUFFER_MGR, MessageLevel.TRACE)) { + LogManager.logTrace(LogConstants.CTX_BUFFER_MGR, new Object[]{"Unpinning tupleBatch for", tupleSourceID, "beginRow: " + beginRow}); //$NON-NLS-1$ //$NON-NLS-2$ } TupleSourceInfo info = getTupleSourceInfo(tupleSourceID, true); Modified: trunk/engine/src/main/java/com/metamatrix/common/buffer/impl/BufferStats.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/common/buffer/impl/BufferStats.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/engine/src/main/java/com/metamatrix/common/buffer/impl/BufferStats.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -28,8 +28,8 @@ import java.util.List; import com.metamatrix.common.log.LogManager; -import com.metamatrix.common.util.LogCommonConstants; import com.metamatrix.core.log.MessageLevel; +import com.metamatrix.dqp.util.LogConstants; /** * This encapsulates all the statistics for the BufferManagerImpl. The attribute @@ -66,38 +66,38 @@ * Log this set of stats. */ void log() { - LogManager.logInfo(LogCommonConstants.CTX_BUFFER_MGR, "\n"); //$NON-NLS-1$ - LogManager.logInfo(LogCommonConstants.CTX_BUFFER_MGR, "BUFFER MANAGER STATS"); //$NON-NLS-1$ - LogManager.logInfo(LogCommonConstants.CTX_BUFFER_MGR, " memoryFree = " + memoryFree); //$NON-NLS-1$ - LogManager.logInfo(LogCommonConstants.CTX_BUFFER_MGR, " memoryUsed = " + memoryUsed); //$NON-NLS-1$ - LogManager.logInfo(LogCommonConstants.CTX_BUFFER_MGR, " numTupleSources = " + numTupleSources); //$NON-NLS-1$ - LogManager.logInfo(LogCommonConstants.CTX_BUFFER_MGR, " numPersistentBatches = " + numPersistentBatches); //$NON-NLS-1$ - LogManager.logInfo(LogCommonConstants.CTX_BUFFER_MGR, " numPinnedBatches = " + numPinnedBatches); //$NON-NLS-1$ - LogManager.logInfo(LogCommonConstants.CTX_BUFFER_MGR, " numUnpinnedBatches = " + numUnpinnedBatches); //$NON-NLS-1$ - LogManager.logInfo(LogCommonConstants.CTX_BUFFER_MGR, " pinRequests = " + pinRequests); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_BUFFER_MGR, "\n"); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_BUFFER_MGR, "BUFFER MANAGER STATS"); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_BUFFER_MGR, " memoryFree = " + memoryFree); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_BUFFER_MGR, " memoryUsed = " + memoryUsed); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_BUFFER_MGR, " numTupleSources = " + numTupleSources); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_BUFFER_MGR, " numPersistentBatches = " + numPersistentBatches); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_BUFFER_MGR, " numPinnedBatches = " + numPinnedBatches); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_BUFFER_MGR, " numUnpinnedBatches = " + numUnpinnedBatches); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_BUFFER_MGR, " pinRequests = " + pinRequests); //$NON-NLS-1$ // pinSuccesses / pinRequests double pinSuccessRate = (pinRequests > 0) ? (((double)pinSuccesses / (double)pinRequests) * 100) : 100; - LogManager.logInfo(LogCommonConstants.CTX_BUFFER_MGR, " pinSuccessRate = " + pinSuccessRate); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_BUFFER_MGR, " pinSuccessRate = " + pinSuccessRate); //$NON-NLS-1$ // pinnedFromMemory / pinRequests double memoryHitRate = (pinRequests > 0) ? (((double)pinnedFromMemory / (double)pinRequests) * 100): 100; - LogManager.logInfo(LogCommonConstants.CTX_BUFFER_MGR, " memoryHitRate = " + memoryHitRate); //$NON-NLS-1$ - LogManager.logInfo(LogCommonConstants.CTX_BUFFER_MGR, " numCleanings = " + numCleanings); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_BUFFER_MGR, " memoryHitRate = " + memoryHitRate); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_BUFFER_MGR, " numCleanings = " + numCleanings); //$NON-NLS-1$ // totalCleaned / numCleanings long avgCleaned = (numCleanings > 0) ? (totalCleaned / numCleanings) : 0; - LogManager.logInfo(LogCommonConstants.CTX_BUFFER_MGR, " avgCleaned = " + avgCleaned); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_BUFFER_MGR, " avgCleaned = " + avgCleaned); //$NON-NLS-1$ - if ( LogManager.isMessageToBeRecorded(LogCommonConstants.CTX_BUFFER_MGR, MessageLevel.TRACE) ) { + if ( LogManager.isMessageToBeRecorded(LogConstants.CTX_BUFFER_MGR, MessageLevel.TRACE) ) { HashMap stackTraces = new HashMap(); if ( pinnedManagedBatches.isEmpty() ) { return; } - LogManager.logTrace(LogCommonConstants.CTX_BUFFER_MGR, "\n"); //$NON-NLS-1$ - LogManager.logTrace(LogCommonConstants.CTX_BUFFER_MGR, " =========== Pinned Batch Details: ==========="); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_BUFFER_MGR, "\n"); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_BUFFER_MGR, " =========== Pinned Batch Details: ==========="); //$NON-NLS-1$ int stackNumber = 1; @@ -105,7 +105,7 @@ Iterator it = pinnedManagedBatches.iterator(); while ( it.hasNext() ) { ManagedBatch batch = (ManagedBatch)it.next(); - LogManager.logTrace(LogCommonConstants.CTX_BUFFER_MGR, " TupleSourceID: " + batch.getTupleSourceID() + " Begin: " + batch.getBeginRow() + " End: " + batch.getEndRow()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + LogManager.logTrace(LogConstants.CTX_BUFFER_MGR, " TupleSourceID: " + batch.getTupleSourceID() + " Begin: " + batch.getBeginRow() + " End: " + batch.getEndRow()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ Integer stackKey = (Integer)stackTraces.get(batch.getCallStack()); @@ -117,10 +117,10 @@ stackTraces.put(batch.getCallStack(), stackKey); } - LogManager.logTrace(LogCommonConstants.CTX_BUFFER_MGR, " Pinned at: " + batch.getCallStackTimeStamp() + " by call# " + stackKey); //$NON-NLS-1$ //$NON-NLS-2$ + LogManager.logTrace(LogConstants.CTX_BUFFER_MGR, " Pinned at: " + batch.getCallStackTimeStamp() + " by call# " + stackKey); //$NON-NLS-1$ //$NON-NLS-2$ if (isFirst) { for (Iterator j = batch.getCallStack().iterator(); j.hasNext();) { - LogManager.logTrace( LogCommonConstants.CTX_BUFFER_MGR, " " + j.next() ); //$NON-NLS-1$ + LogManager.logTrace( LogConstants.CTX_BUFFER_MGR, " " + j.next() ); //$NON-NLS-1$ } } } Modified: trunk/engine/src/main/java/com/metamatrix/common/buffer/impl/MemoryState.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/common/buffer/impl/MemoryState.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/engine/src/main/java/com/metamatrix/common/buffer/impl/MemoryState.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -22,12 +22,17 @@ package com.metamatrix.common.buffer.impl; -import java.util.*; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import com.metamatrix.common.buffer.TupleSourceID; import com.metamatrix.common.log.LogManager; -import com.metamatrix.common.util.LogCommonConstants; import com.metamatrix.core.log.MessageLevel; +import com.metamatrix.dqp.util.LogConstants; /** * <p>This class represents the memory state of the BufferManagerImpl. The @@ -159,7 +164,7 @@ PINNED_BY_THREAD.set(theadPinned); } addPinnedInternal(theadPinned, batch); - if (LogManager.isMessageToBeRecorded(LogCommonConstants.CTX_BUFFER_MGR, MessageLevel.TRACE )) { + if (LogManager.isMessageToBeRecorded(LogConstants.CTX_BUFFER_MGR, MessageLevel.TRACE )) { batch.captureCallStack(); } } Modified: trunk/engine/src/main/java/com/metamatrix/common/buffer/storage/file/FileStorageManager.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/common/buffer/storage/file/FileStorageManager.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/engine/src/main/java/com/metamatrix/common/buffer/storage/file/FileStorageManager.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -47,10 +47,10 @@ import com.metamatrix.common.buffer.TupleSourceID; import com.metamatrix.common.buffer.TupleSourceNotFoundException; import com.metamatrix.common.log.LogManager; -import com.metamatrix.common.util.LogCommonConstants; import com.metamatrix.common.util.PropertiesUtils; import com.metamatrix.core.log.MessageLevel; import com.metamatrix.core.util.Assertion; +import com.metamatrix.dqp.util.LogConstants; import com.metamatrix.query.execution.QueryExecPlugin; /** * This class stores batches in files on disk in a specified directory. Every @@ -157,8 +157,8 @@ */ private File createFile(TupleSourceID sourceID, int fileNumber) throws MetaMatrixComponentException { File storageFile = new File(this.directory, FILE_PREFIX + sourceID.getIDValue() + "_" + fileNumber); //$NON-NLS-1$ - if (LogManager.isMessageToBeRecorded(LogCommonConstants.CTX_STORAGE_MGR, MessageLevel.DETAIL)) { - LogManager.logDetail(LogCommonConstants.CTX_STORAGE_MGR, "Creating temporary storage area file " + storageFile.getAbsoluteFile()); //$NON-NLS-1$ + if (LogManager.isMessageToBeRecorded(LogConstants.CTX_STORAGE_MGR, MessageLevel.DETAIL)) { + LogManager.logDetail(LogConstants.CTX_STORAGE_MGR, "Creating temporary storage area file " + storageFile.getAbsoluteFile()); //$NON-NLS-1$ } try { boolean created = storageFile.createNewFile(); @@ -202,7 +202,7 @@ } byte[] bytes = convertToBytes(batch, types); if (bytes.length > maxFileSize) { - LogManager.logWarning(LogCommonConstants.CTX_STORAGE_MGR, "Detected an attempt to save a batch (" + sourceID + ", begin=" + batch.getBeginRow()+ ", size=" + bytes.length + ") larger than the buffer max file size setting of " + maxFileSize + " bytes. The buffer manager will ignore the max file size setting for this batch, and create a buffer file dedicated to this batch. It may be necessary to reduce the buffer batch setting or increase the buffer max file size setting."); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + LogManager.logWarning(LogConstants.CTX_STORAGE_MGR, "Detected an attempt to save a batch (" + sourceID + ", begin=" + batch.getBeginRow()+ ", size=" + bytes.length + ") larger than the buffer max file size setting of " + maxFileSize + " bytes. The buffer manager will ignore the max file size setting for this batch, and create a buffer file dedicated to this batch. It may be necessary to reduce the buffer batch setting or increase the buffer max file size setting."); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ } FileInfo fileInfo = tsInfo.getMostRecentlyCreatedFile(); if (fileInfo == null || @@ -213,8 +213,8 @@ } long pointer = 0; - if (LogManager.isMessageToBeRecorded(LogCommonConstants.CTX_STORAGE_MGR, MessageLevel.DETAIL)) { - LogManager.logDetail(LogCommonConstants.CTX_STORAGE_MGR, "Adding batch to storage area file " + fileInfo.file.getAbsoluteFile() + " [ sourceID: " + sourceID + "batch: " + batch + " ]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + if (LogManager.isMessageToBeRecorded(LogConstants.CTX_STORAGE_MGR, MessageLevel.DETAIL)) { + LogManager.logDetail(LogConstants.CTX_STORAGE_MGR, "Adding batch to storage area file " + fileInfo.file.getAbsoluteFile() + " [ sourceID: " + sourceID + "batch: " + batch + " ]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ } try { // Get access to the file and remember whether we had to open it or not @@ -343,8 +343,8 @@ return; } - if (LogManager.isMessageToBeRecorded(LogCommonConstants.CTX_STORAGE_MGR, MessageLevel.DETAIL)) { - LogManager.logDetail(LogCommonConstants.CTX_STORAGE_MGR, "Removing storage for " + sourceID); //$NON-NLS-1$ + if (LogManager.isMessageToBeRecorded(LogConstants.CTX_STORAGE_MGR, MessageLevel.DETAIL)) { + LogManager.logDetail(LogConstants.CTX_STORAGE_MGR, "Removing storage for " + sourceID); //$NON-NLS-1$ } synchronized(info) { @@ -369,7 +369,7 @@ */ public synchronized void shutdown() { - LogManager.logDetail(LogCommonConstants.CTX_STORAGE_MGR, "Removing all storage area files "); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_STORAGE_MGR, "Removing all storage area files "); //$NON-NLS-1$ Iterator tsIter = tupleSourceMap.keySet().iterator(); @@ -378,7 +378,7 @@ try { removeBatches(key); } catch (MetaMatrixComponentException e) { - LogManager.logWarning(LogCommonConstants.CTX_STORAGE_MGR, e, "Shutdown failed while removing batches for tuple source: " + key); //$NON-NLS-1$ + LogManager.logWarning(LogConstants.CTX_STORAGE_MGR, e, "Shutdown failed while removing batches for tuple source: " + key); //$NON-NLS-1$ } } Modified: trunk/engine/src/main/java/com/metamatrix/common/lob/BufferManagerLobChunkStream.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/common/lob/BufferManagerLobChunkStream.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/engine/src/main/java/com/metamatrix/common/lob/BufferManagerLobChunkStream.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -31,7 +31,7 @@ import com.metamatrix.common.buffer.TupleSourceID; import com.metamatrix.common.buffer.TupleSourceNotFoundException; import com.metamatrix.common.log.LogManager; -import com.metamatrix.common.util.LogCommonConstants; +import com.metamatrix.dqp.util.LogConstants; public class BufferManagerLobChunkStream implements LobChunkProducer { TupleSourceID sourceId; @@ -49,11 +49,11 @@ return bufferMgr.getStreamablePart(sourceId, position); } catch (TupleSourceNotFoundException e) { String msg = CommonPlugin.Util.getString("BufferManagerLobChunkStream.no_tuple_source", new Object[] {sourceId}); //$NON-NLS-1$ - LogManager.logWarning(LogCommonConstants.CTX_BUFFER_MGR, e, msg); + LogManager.logWarning(LogConstants.CTX_BUFFER_MGR, e, msg); throw new IOException(msg); } catch (MetaMatrixComponentException e) { String msg = CommonPlugin.Util.getString("BufferManagerLobChunkStream.error_processing", new Object[] {sourceId}); //$NON-NLS-1$ - LogManager.logWarning(LogCommonConstants.CTX_BUFFER_MGR, e, msg); + LogManager.logWarning(LogConstants.CTX_BUFFER_MGR, e, msg); throw new IOException(msg); } } Modified: trunk/engine/src/main/java/com/metamatrix/dqp/service/ConfigurationService.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/dqp/service/ConfigurationService.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/engine/src/main/java/com/metamatrix/dqp/service/ConfigurationService.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -99,12 +99,6 @@ public URL getUDFFile(); /** - * Log Level - * @return configured log level or default one supplied. - */ - public String getLogLevel(); - - /** * Save the given vdb file into underlying persistent mechanism used by * this configuration service * @param vdb - VDB to be saved Modified: trunk/engine/src/main/java/com/metamatrix/dqp/service/DQPServiceNames.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/dqp/service/DQPServiceNames.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/engine/src/main/java/com/metamatrix/dqp/service/DQPServiceNames.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -22,7 +22,7 @@ package com.metamatrix.dqp.service; -import com.metamatrix.common.util.LogCommonConstants; +import com.metamatrix.dqp.util.LogConstants; /** @@ -80,7 +80,7 @@ null, null, null, - LogCommonConstants.CTX_TXN_LOG, + LogConstants.CTX_TXN_LOG, null, null, null, Modified: trunk/engine/src/main/java/com/metamatrix/dqp/service/TransactionService.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/dqp/service/TransactionService.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/engine/src/main/java/com/metamatrix/dqp/service/TransactionService.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -44,10 +44,6 @@ */ public interface TransactionService extends ApplicationService { public static final String MAX_TIMEOUT = "metamatrix.xatxnmgr.max_timeout"; //$NON-NLS-1$ - public static final String MAX_FILESIZE_MB= "metamatrix.xatxnmgr.max_log_filesize_in_mb"; //$NON-NLS-1$ - public static final String MAX_ROLLINGFILES= "metamatrix.xatxnmgr.max_rolled_log_files"; //$NON-NLS-1$ - public static final String TXN_MGR_LOG_DIR = "metamatrix.xatxnmgr.log_base_dir"; //$NON-NLS-1$ - public static final String SEPARATE_TXN_LOG = "metamatrix.xatxnmgr.separate_log"; //$NON-NLS-1$ public static final String TXN_STORE_DIR = "metamatrix.xatxnmgr.txnstore_dir"; //$NON-NLS-1$ public static final String TXN_STATUS_PORT = "metamatrix.xatxnmgr.txnstatus_port"; //$NON-NLS-1$ public static final String TXN_ENABLE_RECOVERY = "metamatrix.xatxnmgr.enable_recovery"; //$NON-NLS-1$ @@ -58,9 +54,6 @@ public static final String DEFAULT_TXN_MGR_LOG_DIR = "txnlog"; //$NON-NLS-1$ public static final String DEFAULT_TXN_TIMEOUT = "120"; //$NON-NLS-1$ //2 mins - public static final String DEFAULT_LOGFILE_SIZE= "10"; //$NON-NLS-1$ - public static final String DEFAULT_MAX_ROLLOVER_FILES = "10"; //$NON-NLS-1$ - public static final String DEFAULT_SEPARATE_TXN_LOG = "false"; //$NON-NLS-1$ public static final String DEFAULT_TXN_STATUS_PORT = "0"; //$NON-NLS-1$ // processor level methods Modified: trunk/engine/src/main/java/com/metamatrix/dqp/util/LogConstants.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/dqp/util/LogConstants.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/engine/src/main/java/com/metamatrix/dqp/util/LogConstants.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -22,14 +22,14 @@ package com.metamatrix.dqp.util; -//********************************************************************** -//PLEASE NOTE:!!!!!!!!!!!!!!!!! -//All constants defined here should also be defined in -//com.metamatrix.common.util.LogContextsUtil -//********************************************************************** - public interface LogConstants { - + // add the new contexts to the Log4JUtil.java class, for configuration purpose public static final String CTX_DQP = "DQP"; //$NON-NLS-1$ public static final String CTX_CONNECTOR = "CONNECTOR"; //$NON-NLS-1$ + public static final String CTX_BUFFER_MGR = "BUFFER_MGR"; //$NON-NLS-1$ + public static final String CTX_STORAGE_MGR = "STORAGE_MGR"; //$NON-NLS-1$ + public static final String CTX_TXN_LOG = "TXN_LOG"; //$NON-NLS-1$ + public static final String CTX_EXTENSION_SOURCE = "EXTENSION_MODULE"; //$NON-NLS-1$ + public static final String CTX_COMMANDLOGGING = "COMMAND_LOG"; //$NON-NLS-1$ + public static final String CTX_AUDITLOGGING = "AUDIT_LOG"; //$NON-NLS-1$ } Modified: trunk/engine/src/main/java/com/metamatrix/query/util/LogConstants.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/query/util/LogConstants.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/engine/src/main/java/com/metamatrix/query/util/LogConstants.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -22,9 +22,8 @@ package com.metamatrix.query.util; -import com.metamatrix.common.util.LogCommonConstants; -public interface LogConstants extends LogCommonConstants { +public interface LogConstants { //********************************************************************** //PLEASE NOTE:!!!!!!!!!!!!!!!!! Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorManager.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorManager.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorManager.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -68,7 +68,6 @@ import com.metamatrix.common.queue.WorkerPoolFactory; import com.metamatrix.common.queue.WorkerPoolStats; import com.metamatrix.common.stats.ConnectionPoolStats; -import com.metamatrix.common.util.LogContextsUtil; import com.metamatrix.common.util.PropertiesUtils; import com.metamatrix.core.MetaMatrixCoreException; import com.metamatrix.core.log.MessageLevel; @@ -625,7 +624,7 @@ } message = new CommandLogMessage(System.currentTimeMillis(), qr.getRequestID().toString(), id.getNodeID(), transactionID, modelName, connectorName, qr.getWorkContext().getConnectionID(), principal, finalRowCnt, isCancelled, errorOccurred, context); } - LogManager.log(MessageLevel.INFO, LogContextsUtil.CommonConstants.CTX_COMMANDLOGGING, message); + LogManager.log(MessageLevel.INFO, LogConstants.CTX_COMMANDLOGGING, message); } /** Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -57,7 +57,6 @@ import com.metamatrix.common.log.LogManager; import com.metamatrix.common.queue.WorkerPool; import com.metamatrix.common.queue.WorkerPoolFactory; -import com.metamatrix.common.util.LogContextsUtil; import com.metamatrix.common.util.PropertiesUtils; import com.metamatrix.common.xa.MMXid; import com.metamatrix.common.xa.XATransactionException; @@ -547,7 +546,7 @@ } message = new CommandLogMessage(System.currentTimeMillis(), rID.toString(), txnID, workContext.getConnectionID(), workContext.getUserName(), workContext.getVdbName(), workContext.getVdbVersion(), rowCount, isCancelled, errorOccurred); } - LogManager.log(MessageLevel.INFO, LogContextsUtil.CommonConstants.CTX_COMMANDLOGGING, message); + LogManager.log(MessageLevel.INFO, LogConstants.CTX_COMMANDLOGGING, message); } ProcessorDataManager getDataTierManager() { Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/LobWorkItem.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/LobWorkItem.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/LobWorkItem.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -35,7 +35,6 @@ import com.metamatrix.common.lob.LobChunk; import com.metamatrix.common.log.LogManager; import com.metamatrix.common.types.Streamable; -import com.metamatrix.common.util.LogContextsUtil.DQPConstants; import com.metamatrix.core.util.Assertion; import com.metamatrix.dqp.DQPPlugin; import com.metamatrix.dqp.message.RequestID; @@ -143,7 +142,7 @@ dqpCore.getBufferManager().unpinTupleBatch(referenceStreamId, batch.getBeginRow(), batch.getEndRow()); } } catch (MetaMatrixComponentException e) { - LogManager.logDetail(DQPConstants.CTX_DQP, e, "Call to unpin failed during lob stream creation"); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_DQP, e, "Call to unpin failed during lob stream creation"); //$NON-NLS-1$ } } } Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -56,7 +56,6 @@ import com.metamatrix.common.lob.LobChunk; import com.metamatrix.common.log.LogManager; import com.metamatrix.common.types.DataTypeManager; -import com.metamatrix.common.util.LogContextsUtil; import com.metamatrix.common.xa.XATransactionException; import com.metamatrix.core.MetaMatrixCoreException; import com.metamatrix.core.log.MessageLevel; @@ -667,7 +666,7 @@ transactionID = this.transactionContext.getTxnID(); } CommandLogMessage message = new CommandLogMessage(System.currentTimeMillis(), requestID.toString(), transactionID == null ? null : transactionID, requestID.getConnectionID(), dqpWorkContext.getUserName(), dqpWorkContext.getVdbName(), dqpWorkContext.getVdbVersion(), -1, false, true); - LogManager.log(MessageLevel.INFO, LogContextsUtil.CommonConstants.CTX_COMMANDLOGGING, message); + LogManager.log(MessageLevel.INFO, LogConstants.CTX_COMMANDLOGGING, message); } boolean isCanceled() { Modified: trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/util/LogRuntimeMetadataConstants.java =================================================================== --- trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/util/LogRuntimeMetadataConstants.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/util/LogRuntimeMetadataConstants.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -22,10 +22,8 @@ package com.metamatrix.metadata.runtime.util; -import com.metamatrix.common.util.LogCommonConstants; +public interface LogRuntimeMetadataConstants { -public interface LogRuntimeMetadataConstants extends LogCommonConstants{ - //********************************************************************** //PLEASE NOTE:!!!!!!!!!!!!!!!!! //All constants defined here should also be defined in Modified: trunk/server/src/main/java/com/metamatrix/admin/server/ServerConfigAdminImpl.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/server/ServerConfigAdminImpl.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/server/src/main/java/com/metamatrix/admin/server/ServerConfigAdminImpl.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -1358,29 +1358,30 @@ * @since 4.3 */ public LogConfiguration getLogConfiguration() throws AdminException { - com.metamatrix.common.log.LogConfiguration logConfig = null; - try { - logConfig = getConfigurationServiceProxy().getNextStartupConfiguration().getLogConfiguration(); - } catch (ConfigurationException e) { - throw new AdminComponentException(e); - } catch (ServiceException e) { - throw new AdminComponentException(e); - } - - MMLogConfiguration result = new MMLogConfiguration(); - if (logConfig != null) { - result.setLogLevel(logConfig.getMessageLevel()); - result.setDiscardedContexts(logConfig.getDiscardedContexts()); - - // get the Set of all contexts, remove the ones which are - // currently "discarded" - Set contextsSet = new HashSet(LogContextsUtil.ALL_CONTEXTS); - if (logConfig.getDiscardedContexts() != null) { - contextsSet.removeAll(logConfig.getDiscardedContexts()); - } - result.setIncludedContexts(contextsSet); - } // if - return result; +// com.metamatrix.common.log.LogConfiguration logConfig = null; +// try { +// logConfig = getConfigurationServiceProxy().getNextStartupConfiguration().getLogConfiguration(); +// } catch (ConfigurationException e) { +// throw new AdminComponentException(e); +// } catch (ServiceException e) { +// throw new AdminComponentException(e); +// } +// +// MMLogConfiguration result = new MMLogConfiguration(); +// if (logConfig != null) { +// result.setLogLevel(logConfig.getMessageLevel()); +// result.setDiscardedContexts(logConfig.getDiscardedContexts()); +// +// // get the Set of all contexts, remove the ones which are +// // currently "discarded" +// Set contextsSet = new HashSet(LogContextsUtil.ALL_CONTEXTS); +// if (logConfig.getDiscardedContexts() != null) { +// contextsSet.removeAll(logConfig.getDiscardedContexts()); +// } +// result.setIncludedContexts(contextsSet); +// } // if +// return result; + return null; } /** @@ -1388,56 +1389,56 @@ * @since 4.3 */ public void setLogConfiguration(LogConfiguration adminLogConfig) throws AdminException { - Configuration config = null; - try { - config = getConfigurationServiceProxy().getNextStartupConfiguration(); - } catch (ConfigurationException e) { - throw new AdminComponentException(e); - } catch (ServiceException e) { - throw new AdminComponentException(e); - } - - if (config != null) { - Set discardedCtx = adminLogConfig.getDiscardedContexts(); - Set includedCtx = adminLogConfig.getIncludedContexts(); - - // if both include CTX_ALL, do nothing - if ( discardedCtx.contains(LogConfiguration.CTX_ALL) && - includedCtx.contains(LogConfiguration.CTX_ALL) ) { - return; - } - // if CTX_ALL flag is contained, all other contexts are ignored - if ( discardedCtx.contains(LogConfiguration.CTX_ALL) ) { - discardedCtx = new HashSet(LogContextsUtil.ALL_CONTEXTS); - includedCtx = Collections.EMPTY_SET; - } else if ( includedCtx.contains(LogConfiguration.CTX_ALL) ) { - includedCtx = new HashSet(LogContextsUtil.ALL_CONTEXTS); - discardedCtx = Collections.EMPTY_SET; - } - - com.metamatrix.common.log.LogConfiguration logConfig = config.getLogConfiguration(); - - logConfig.setMessageLevel(adminLogConfig.getLogLevel()); - logConfig.recordContexts(includedCtx); - logConfig.discardContexts(discardedCtx); - LogManager.setLogConfiguration(logConfig); +// Configuration config = null; +// try { +// config = getConfigurationServiceProxy().getNextStartupConfiguration(); +// } catch (ConfigurationException e) { +// throw new AdminComponentException(e); +// } catch (ServiceException e) { +// throw new AdminComponentException(e); +// } +// +// if (config != null) { +// Set discardedCtx = adminLogConfig.getDiscardedContexts(); +// Set includedCtx = adminLogConfig.getIncludedContexts(); +// +// // if both include CTX_ALL, do nothing +// if ( discardedCtx.contains(LogConfiguration.CTX_ALL) && +// includedCtx.contains(LogConfiguration.CTX_ALL) ) { +// return; +// } +// // if CTX_ALL flag is contained, all other contexts are ignored +// if ( discardedCtx.contains(LogConfiguration.CTX_ALL) ) { +// discardedCtx = new HashSet(LogContextsUtil.ALL_CONTEXTS); +// includedCtx = Collections.EMPTY_SET; +// } else if ( includedCtx.contains(LogConfiguration.CTX_ALL) ) { +// includedCtx = new HashSet(LogContextsUtil.ALL_CONTEXTS); +// discardedCtx = Collections.EMPTY_SET; +// } +// +// com.metamatrix.common.log.LogConfiguration logConfig = config.getLogConfiguration(); +// +// logConfig.setMessageLevel(adminLogConfig.getLogLevel()); +// logConfig.recordContexts(includedCtx); +// logConfig.discardContexts(discardedCtx); +// LogManager.setLogConfiguration(logConfig); +// +// ConfigurationObjectEditor coe = null; +// try { +// coe = getConfigurationServiceProxy().createEditor(); +// coe.setLogConfiguration(config, logConfig); +// ModificationActionQueue maq = coe.getDestination(); +// java.util.List actions = maq.popActions(); +// getRuntimeStateAdminAPIHelper().setLogConfiguration(config, logConfig, actions, getUserName()); +// } catch (ConfigurationException e) { +// throw new AdminComponentException(e); +// } catch (ServiceException e) { +// throw new AdminComponentException(e); +// } catch (MetaMatrixComponentException e) { +// throw new AdminComponentException(e); +// } +// } // if - ConfigurationObjectEditor coe = null; - try { - coe = getConfigurationServiceProxy().createEditor(); - coe.setLogConfiguration(config, logConfig); - ModificationActionQueue maq = coe.getDestination(); - java.util.List actions = maq.popActions(); - getRuntimeStateAdminAPIHelper().setLogConfiguration(config, logConfig, actions, getUserName()); - } catch (ConfigurationException e) { - throw new AdminComponentException(e); - } catch (ServiceException e) { - throw new AdminComponentException(e); - } catch (MetaMatrixComponentException e) { - throw new AdminComponentException(e); - } - } // if - } /** Modified: trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/LogonImpl.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/LogonImpl.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/LogonImpl.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -39,6 +39,7 @@ import com.metamatrix.api.exception.security.SessionServiceException; import com.metamatrix.common.api.MMURL; import com.metamatrix.common.log.LogManager; +import com.metamatrix.common.util.LogConstants; import com.metamatrix.dqp.client.ResultsFuture; import com.metamatrix.jdbc.api.ConnectionProperties; import com.metamatrix.platform.security.api.Credentials; @@ -48,7 +49,6 @@ import com.metamatrix.platform.security.api.MetaMatrixSessionInfo; import com.metamatrix.platform.security.api.SessionToken; import com.metamatrix.platform.security.api.service.SessionServiceInterface; -import com.metamatrix.platform.security.util.LogSecurityConstants; import com.metamatrix.platform.service.api.exception.ServiceException; import com.metamatrix.platform.service.api.exception.ServiceStateException; import com.metamatrix.platform.util.ProductInfoConstants; @@ -89,7 +89,7 @@ connProps); // logon MetaMatrixSessionID sessionID = updateDQPContext(sessionInfo); - LogManager.logDetail(LogSecurityConstants.CTX_SESSION, new Object[] { + LogManager.logDetail(LogConstants.CTX_SESSION, new Object[] { "Logon successful for \"", user, "\" - created SessionID \"", "" + sessionID, "\"" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ return new LogonResult(sessionInfo.getSessionToken(), sessionInfo.getProductInfo(), clusterName); } catch (MetaMatrixAuthenticationException e) { Modified: trunk/server/src/main/java/com/metamatrix/common/extensionmodule/ExtensionModuleManager.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/common/extensionmodule/ExtensionModuleManager.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/server/src/main/java/com/metamatrix/common/extensionmodule/ExtensionModuleManager.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -45,9 +45,9 @@ import com.metamatrix.common.log.LogManager; import com.metamatrix.common.messaging.MessageBus; import com.metamatrix.common.util.ErrorMessageKeys; -import com.metamatrix.common.util.LogCommonConstants; import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.core.util.ArgCheck; +import com.metamatrix.dqp.util.LogConstants; import com.metamatrix.platform.admin.api.ExtensionSourceAdminAPI; import com.metamatrix.server.ResourceFinder; @@ -117,7 +117,7 @@ */ public static final int SOURCE_CONTENTS_LENGTH_LIMIT = 1000000000; //1Gb - private static final String LOG_CONTEXT = LogCommonConstants.CTX_EXTENSION_SOURCE; + private static final String LOG_CONTEXT = LogConstants.CTX_EXTENSION_SOURCE; /** * The transaction mgr for ManagedConnections. Copied: trunk/server/src/main/java/com/metamatrix/common/util/LogCommonConstants.java (from rev 1061, trunk/common-internal/src/main/java/com/metamatrix/common/util/LogCommonConstants.java) =================================================================== --- trunk/server/src/main/java/com/metamatrix/common/util/LogCommonConstants.java (rev 0) +++ trunk/server/src/main/java/com/metamatrix/common/util/LogCommonConstants.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -0,0 +1,43 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package com.metamatrix.common.util; + +public interface LogCommonConstants { + + public static final String CTX_DBIDGEN = "DBIDGEN"; //$NON-NLS-1$ + + public static final String CTX_LOGON = "LOGON"; //$NON-NLS-1$ + public static final String CTX_SERVICE = "SERVICE"; //$NON-NLS-1$ + public static final String CTX_PROXY = "PROXY"; //$NON-NLS-1$ + public static final String CTX_CONTROLLER = "CONTROLLER"; //$NON-NLS-1$ + public static final String CTX_CONFIG = "CONFIG"; //$NON-NLS-1$ + public static final String CTX_LOGGING = "LOG"; //$NON-NLS-1$ + public static final String CTX_MESSAGE_BUS = "MESSAGE_BUS"; //$NON-NLS-1$ + public static final String CTX_STANDARD_OUT = "STDOUT"; //$NON-NLS-1$ + public static final String CTX_STANDARD_ERR = "STDERR"; //$NON-NLS-1$ + public static final String CTX_DISTRIB_CACHE = "DISTRIB_CACHE"; //$NON-NLS-1$ + public static final String CTX_XA_TXN = "XA_TXN"; //$NON-NLS-1$ + public static final String CTX_EXTENSION_SOURCE_JDBC = "JDBC_EXT_MODULE_TRANSACTION"; //$NON-NLS-1$ + public static final String CTX_POOLING = "RESOURCE_POOLING"; //$NON-NLS-1$ + +} Copied: trunk/server/src/main/java/com/metamatrix/common/util/LogContextsUtil.java (from rev 1067, trunk/common-internal/src/main/java/com/metamatrix/common/util/LogContextsUtil.java) =================================================================== --- trunk/server/src/main/java/com/metamatrix/common/util/LogContextsUtil.java (rev 0) +++ trunk/server/src/main/java/com/metamatrix/common/util/LogContextsUtil.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -0,0 +1,208 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package com.metamatrix.common.util; + +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +/** + * <p> + * Utility class which includes the Set of all String logging contexts used by all parts of the server. + * </p> + * <p> + * Due to build implementations, this class must define all logging contexts, which may be redundantly defined elsewhere. + * </p> + */ +public class LogContextsUtil { + + // ******************************************************************* + // TO ADD NEW CONTEXTS: + // Please add a context to the appropriate inner class, or create + // an appropriate new inner class. Then, also add that context to + // the ALL_CONTEXTS set, which is built in the static block at the + // end of this file. + // + // ******************************************************************* + + + public static class CommonConstants { + + // Contexts + public static final String CTX_DBIDGEN = "DBIDGEN"; //$NON-NLS-1$ + public static final String CTX_LOGON = "LOGON"; //$NON-NLS-1$ + public static final String CTX_SERVICE = "SERVICE"; //$NON-NLS-1$ + public static final String CTX_PROXY = "PROXY"; //$NON-NLS-1$ + public static final String CTX_CONTROLLER = "CONTROLLER"; //$NON-NLS-1$ + public static final String CTX_CONFIG = "CONFIG"; //$NON-NLS-1$ + public static final String CTX_LOGGING = "LOG"; //$NON-NLS-1$ + public static final String CTX_MESSAGE_BUS = "MESSAGE_BUS"; //$NON-NLS-1$ + public static final String CTX_STANDARD_OUT = "STDOUT"; //$NON-NLS-1$ + public static final String CTX_STANDARD_ERR = "STDERR"; //$NON-NLS-1$ + public static final String CTX_DISTRIB_CACHE = "DISTRIB_CACHE"; //$NON-NLS-1$ + public static final String CTX_POOLING = "RESOURCE_POOLING"; //$NON-NLS-1$ + public static final String CTX_BUFFER_MGR = "BUFFER_MGR"; //$NON-NLS-1$ + public static final String CTX_STORAGE_MGR = "STORAGE_MGR"; //$NON-NLS-1$ + public static final String CTX_XA_TXN = "XA_TXN"; //$NON-NLS-1$ + public static final String CTX_TXN_LOG = "TXN_LOG"; //$NON-NLS-1$ + public static final String CTX_EXTENSION_SOURCE = "EXTENSION_MODULE"; //$NON-NLS-1$ + public static final String CTX_EXTENSION_SOURCE_JDBC = "JDBC_EXT_MODULE_TRANSACTION"; //$NON-NLS-1$ + public static final String CTX_COMMUNICATION = "COMMUNICATION"; //$NON-NLS-1$ + public static final String CTX_COMMANDLOGGING = "COMMAND_LOG"; //$NON-NLS-1$ + public static final String CTX_AUDITLOGGING = "AUDIT_LOG"; //$NON-NLS-1$ + } + + public static class SecurityConstants { + + public static final String CTX_CLIENT_MONITOR = "CLIENT_MONITOR"; //$NON-NLS-1$ + public static final String CTX_SESSION_MONITOR = "SESSION_MONITOR"; //$NON-NLS-1$ + public static final String CTX_SESSION_CLEANUP = "SESSION_CLEANUP"; //$NON-NLS-1$ + public static final String CTX_SESSION = "SESSION"; //$NON-NLS-1$ + public static final String CTX_SESSION_CACHE = "SESSION_CACHE"; //$NON-NLS-1$ + public static final String CTX_MEMBERSHIP = "MEMBERSHIP"; //$NON-NLS-1$ + public static final String CTX_AUTHORIZATION = "AUTHORIZATION"; //$NON-NLS-1$ + public static final String CTX_AUDIT = "AUDIT"; //$NON-NLS-1$ + } + + public static class PlatformConstants { + + public static final String CTX_REGISTRY = "REGISTRY"; //$NON-NLS-1$ + public static final String CTX_VM_CONTROLLER = "VM_CONTROLLER"; //$NON-NLS-1$ + public static final String CTX_SERVICE_CONTROLLER = "SERVICE_CONTROLLER"; //$NON-NLS-1$ + public static final String CTX_RUNTIME_ADMIN = "RUNTIME_ADMIN"; //$NON-NLS-1$ + } + + public static class PlatformAdminConstants { + + // Platform Admin API + public static final String CTX_ADMIN = "ADMIN"; //$NON-NLS-1$ + public static final String CTX_AUDIT_ADMIN = "AUDIT_ADMIN"; //$NON-NLS-1$ + public static final String CTX_ADMIN_API = "ADMIN_API"; //$NON-NLS-1$ + public static final String CTX_ADMIN_API_CONNECTION = "ADMIN_API_CONNECTION"; //$NON-NLS-1$ + public static final String CTX_AUTHORIZATION_ADMIN_API = "AUTHORIZATION_ADMIN_API"; //$NON-NLS-1$ + public static final String CTX_CONFIGURATION_ADMIN_API = "CONFIGURATION_ADMIN_API"; //$NON-NLS-1$ + public static final String CTX_RUNTIME_STATE_ADMIN_API = "RUNTIME_STATE_ADMIN_API"; //$NON-NLS-1$ + public static final String CTX_EXTENSION_SOURCE_ADMIN_API = "EXTENSION_SOURCE_ADMIN_API"; //$NON-NLS-1$ + + // Server Admin API + public static final String CTX_RUNTIME_METADATA_ADMIN_API = "RUNTIME_METADATA_ADMIN_API"; //$NON-NLS-1$ + } + + public static class RuntimeMetadataConstants { + + public static final String CTX_RUNTIME_METADATA = "RUNTIME_METADATA"; //$NON-NLS-1$ + } + + public static class QueryConstants { + + public static final String CTX_FUNCTION_TREE = "FUNCTION_TREE"; //$NON-NLS-1$ + public static final String CTX_QUERY_PLANNER = "QUERY_PLANNER"; //$NON-NLS-1$ + public static final String CTX_QUERY_RESOLVER = "QUERY_RESOLVER"; //$NON-NLS-1$ + public static final String CTX_XML_PLANNER = "XML_QUERY_PLANNER"; //$NON-NLS-1$ + public static final String CTX_XML_PLAN = "XML_PLAN"; //$NON-NLS-1$ + } + + public static class DQPConstants { + + public static final String CTX_DQP = "DQP"; //$NON-NLS-1$ + public static final String CTX_CONNECTOR = "CONNECTOR"; //$NON-NLS-1$ + } + + public static class ServerConstants { + + public static final String CTX_ROUTER = "ROUTER"; //$NON-NLS-1$ + public static final String CTX_QUERY_SERVICE = "QUERY_SERVICE"; //$NON-NLS-1$ + } + + /** + * The Set of all String logging contexts of all parts of the server. + */ + public static final Set ALL_CONTEXTS; + public static final String CTX_CONFIG = "CONFIG"; //$NON-NLS-1$ + + // this will need to be updated as any new contexts are added to the + // various "logging contants" interfaces of the different projects + static { + Set allContexts = new HashSet(); + + allContexts.add(CommonConstants.CTX_DBIDGEN); + allContexts.add(CommonConstants.CTX_LOGON); + allContexts.add(CommonConstants.CTX_SERVICE); + allContexts.add(CommonConstants.CTX_PROXY); + allContexts.add(CommonConstants.CTX_CONTROLLER); + allContexts.add(CommonConstants.CTX_CONFIG); + allContexts.add(CommonConstants.CTX_LOGGING); + allContexts.add(CommonConstants.CTX_DISTRIB_CACHE); + allContexts.add(CommonConstants.CTX_MESSAGE_BUS); + allContexts.add(CommonConstants.CTX_POOLING); + allContexts.add(CommonConstants.CTX_BUFFER_MGR); + allContexts.add(CommonConstants.CTX_STORAGE_MGR); + allContexts.add(CommonConstants.CTX_XA_TXN); + allContexts.add(CommonConstants.CTX_STANDARD_OUT); + allContexts.add(CommonConstants.CTX_STANDARD_ERR); + allContexts.add(CommonConstants.CTX_EXTENSION_SOURCE); + allContexts.add(CommonConstants.CTX_EXTENSION_SOURCE_JDBC); + allContexts.add(CommonConstants.CTX_COMMUNICATION); + + allContexts.add(SecurityConstants.CTX_CLIENT_MONITOR); + allContexts.add(SecurityConstants.CTX_SESSION_MONITOR); + allContexts.add(SecurityConstants.CTX_SESSION_CLEANUP); + allContexts.add(SecurityConstants.CTX_SESSION); + allContexts.add(SecurityConstants.CTX_SESSION_CACHE); + allContexts.add(SecurityConstants.CTX_MEMBERSHIP); + allContexts.add(SecurityConstants.CTX_AUTHORIZATION); + allContexts.add(SecurityConstants.CTX_AUDIT); + + allContexts.add(PlatformConstants.CTX_REGISTRY); + allContexts.add(PlatformConstants.CTX_VM_CONTROLLER); + allContexts.add(PlatformConstants.CTX_SERVICE_CONTROLLER); + allContexts.add(PlatformConstants.CTX_RUNTIME_ADMIN); + + allContexts.add(PlatformAdminConstants.CTX_ADMIN); + allContexts.add(PlatformAdminConstants.CTX_AUDIT_ADMIN); + allContexts.add(PlatformAdminConstants.CTX_ADMIN_API); + allContexts.add(PlatformAdminConstants.CTX_ADMIN_API_CONNECTION); + allContexts.add(PlatformAdminConstants.CTX_AUTHORIZATION_ADMIN_API); + allContexts.add(PlatformAdminConstants.CTX_CONFIGURATION_ADMIN_API); + allContexts.add(PlatformAdminConstants.CTX_RUNTIME_STATE_ADMIN_API); + allContexts.add(PlatformAdminConstants.CTX_EXTENSION_SOURCE_ADMIN_API); + + allContexts.add(PlatformAdminConstants.CTX_RUNTIME_METADATA_ADMIN_API); + + allContexts.add(RuntimeMetadataConstants.CTX_RUNTIME_METADATA); + + allContexts.add(QueryConstants.CTX_FUNCTION_TREE); + allContexts.add(QueryConstants.CTX_QUERY_PLANNER); + allContexts.add(QueryConstants.CTX_QUERY_RESOLVER); + allContexts.add(QueryConstants.CTX_XML_PLANNER); + allContexts.add(QueryConstants.CTX_XML_PLAN); + + allContexts.add(DQPConstants.CTX_DQP); + allContexts.add(DQPConstants.CTX_CONNECTOR); + + allContexts.add(ServerConstants.CTX_ROUTER); + allContexts.add(ServerConstants.CTX_QUERY_SERVICE); + + ALL_CONTEXTS = Collections.unmodifiableSet(allContexts); + } +} Modified: trunk/server/src/main/java/com/metamatrix/platform/security/authorization/service/AuthorizationServiceImpl.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/platform/security/authorization/service/AuthorizationServiceImpl.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/server/src/main/java/com/metamatrix/platform/security/authorization/service/AuthorizationServiceImpl.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -53,6 +53,7 @@ import com.metamatrix.common.connection.TransactionMgr; import com.metamatrix.common.log.LogManager; import com.metamatrix.common.properties.UnmodifiableProperties; +import com.metamatrix.common.util.LogConstants; import com.metamatrix.common.util.LogContextsUtil; import com.metamatrix.core.log.MessageLevel; import com.metamatrix.dqp.ResourceFinder; @@ -83,7 +84,6 @@ import com.metamatrix.platform.security.authorization.spi.AuthorizationSourceConnectionException; import com.metamatrix.platform.security.authorization.spi.AuthorizationSourceException; import com.metamatrix.platform.security.authorization.spi.AuthorizationSourceTransaction; -import com.metamatrix.platform.security.util.LogSecurityConstants; import com.metamatrix.platform.security.util.RolePermissionFactory; import com.metamatrix.platform.service.api.exception.ServiceClosedException; import com.metamatrix.platform.service.api.exception.ServiceException; @@ -152,7 +152,7 @@ try { this.retries = Integer.parseInt(retryValue); } catch (Exception e) { - LogManager.logWarning(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0001, retryValue, Integer.toString(this.retries))); + LogManager.logWarning(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0001, retryValue, Integer.toString(this.retries))); } } @@ -192,12 +192,12 @@ protected void closeService() throws Exception { if ( ! serviceClosed ) { String instanceName = this.getInstanceName(); - LogManager.logInfo(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(LogMessageKeys.SEC_AUTHORIZATION_0001, instanceName)); + LogManager.logInfo(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(LogMessageKeys.SEC_AUTHORIZATION_0001, instanceName)); serviceClosed = true; auditManager.stop(); - LogManager.logInfo(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(LogMessageKeys.SEC_AUTHORIZATION_0002, instanceName)); + LogManager.logInfo(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(LogMessageKeys.SEC_AUTHORIZATION_0002, instanceName)); } } @@ -209,7 +209,7 @@ try { this.closeService(); } catch (Exception e) { - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, e, + LogManager.logError(LogConstants.CTX_AUTHORIZATION, e, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0009)); } } @@ -222,7 +222,7 @@ try { this.closeService(); } catch (Exception e) { - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, e, + LogManager.logError(LogConstants.CTX_AUTHORIZATION, e, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0009)); } } @@ -243,7 +243,7 @@ */ public boolean checkAccess(SessionToken sessionToken, String contextName, AuthorizationPermission request) throws InvalidSessionException, AuthorizationMgmtException { - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, new Object[]{"checkAccess(", sessionToken, ", ", contextName, ", ", request, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[]{"checkAccess(", sessionToken, ", ", contextName, ", ", request, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ // Audit - request AuditMessage msg = new AuditMessage(contextName, "checkAccess-request", sessionToken.getUsername(), new Object[]{request.getResourceName()}); //$NON-NLS-1$ @@ -301,7 +301,7 @@ */ public Collection getInaccessibleResources(SessionToken sessionToken, String context, Collection requests) throws InvalidSessionException, AuthorizationMgmtException { - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, new Object[]{"getInaccessibleResources(", sessionToken, ", ", context, ", ", requests, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[]{"getInaccessibleResources(", sessionToken, ", ", context, ", ", requests, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ List resources = new ArrayList(); if (requests != null && ! requests.isEmpty()) { @@ -422,7 +422,7 @@ */ public List getGroupEntitlements(AuthorizationRealm realm, String fullyQualifiedGroupName) throws AuthorizationMgmtException { - LogManager.logTrace(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace(LogConstants.CTX_AUTHORIZATION, new Object[]{"getGroupEntitlements(", realm, fullyQualifiedGroupName, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ boolean success = false; Exception exception = null; @@ -446,12 +446,12 @@ break; } catch (ManagedConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0023); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0023, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0023, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0024); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0024, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0024, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceException e) { @@ -460,7 +460,7 @@ } finally { completeTransaction(success, transaction); } - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, "Attempting to retry getting entitlements for resource."); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, "Attempting to retry getting entitlements for resource."); //$NON-NLS-1$ } if (!success) { // Let caller know that none of the calls were successful. @@ -534,7 +534,7 @@ */ public List getElementEntitlements(AuthorizationRealm realm, String elementNamePattern) throws AuthorizationMgmtException { - LogManager.logTrace(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace(LogConstants.CTX_AUTHORIZATION, new Object[]{"getElementEntitlements(", realm, elementNamePattern, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ boolean success = false; Exception exception = null; @@ -552,12 +552,12 @@ break; } catch (ManagedConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0023); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0023, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0023, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0024); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0024, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0024, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceException e) { @@ -566,7 +566,7 @@ } finally { completeTransaction(success, transaction); } - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, "Attempting to retry getting entitlements for resource."); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, "Attempting to retry getting entitlements for resource."); //$NON-NLS-1$ } if (!success) { // Let caller know that none of the calls were successful. @@ -626,7 +626,7 @@ private Collection getRealmNames() throws AuthorizationMgmtException { - LogManager.logTrace(LogSecurityConstants.CTX_AUTHORIZATION, new Object[]{"getRealmNames()"}); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_AUTHORIZATION, new Object[]{"getRealmNames()"}); //$NON-NLS-1$ boolean success = false; Exception exception = null; String exceptionMsg = null; @@ -643,12 +643,12 @@ break; } catch (ManagedConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0023); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0023, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0023, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0024); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString( ErrorMessageKeys.SEC_AUTHORIZATION_0024, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString( ErrorMessageKeys.SEC_AUTHORIZATION_0024, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceException e) { @@ -657,7 +657,7 @@ } finally { completeTransaction(success, transaction); } - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, "Attempting to retry getting entitlements for resource."); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, "Attempting to retry getting entitlements for resource."); //$NON-NLS-1$ } if (!success) { // Let caller know that none of the calls were successful. @@ -683,7 +683,7 @@ */ public Collection getRealmNames(SessionToken caller) throws InvalidSessionException, AuthorizationException, AuthorizationMgmtException { - LogManager.logTrace(LogSecurityConstants.CTX_AUTHORIZATION, new Object[]{"getRealmNames(", caller, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ + LogManager.logTrace(LogConstants.CTX_AUTHORIZATION, new Object[]{"getRealmNames(", caller, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ return getRealmNames(); } @@ -698,7 +698,7 @@ */ public boolean containsPolicy(SessionToken caller, AuthorizationPolicyID policyID) throws InvalidSessionException, AuthorizationException, AuthorizationMgmtException { - LogManager.logTrace(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace(LogConstants.CTX_AUTHORIZATION, new Object[]{"containsPolicy(", caller, ", ", policyID, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ boolean success = false; Exception exception = null; @@ -716,22 +716,22 @@ break; } catch (ManagedConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0029, policyID); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0029, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0029, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0030, policyID); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString( ErrorMessageKeys.SEC_AUTHORIZATION_0030, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString( ErrorMessageKeys.SEC_AUTHORIZATION_0030, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0031, policyID); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0031, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0031, e, exceptionMsg)); throw new AuthorizationMgmtException(e, ErrorMessageKeys.SEC_AUTHORIZATION_0031, exceptionMsg); } finally { completeTransaction(success, transaction); } - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, "Attempting to retry search for policy ID."); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, "Attempting to retry search for policy ID."); //$NON-NLS-1$ } if (!success) { // Let caller know that none of the calls were successful. @@ -750,7 +750,7 @@ */ public Collection findAllPolicyIDs(SessionToken caller) throws InvalidSessionException, AuthorizationException, AuthorizationMgmtException { - LogManager.logTrace(LogSecurityConstants.CTX_AUTHORIZATION, new Object[]{"findAllPolicyIDs(", caller, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ + LogManager.logTrace(LogConstants.CTX_AUTHORIZATION, new Object[]{"findAllPolicyIDs(", caller, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ boolean success = false; Exception exception = null; String exceptionMsg = null; @@ -767,22 +767,22 @@ break; } catch (ManagedConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0032); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0032, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0032, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0033); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0033, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0033, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0034); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0034, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0034, e, exceptionMsg)); throw new AuthorizationMgmtException(e, ErrorMessageKeys.SEC_AUTHORIZATION_0034, exceptionMsg); } finally { completeTransaction(success, transaction); } - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, "Attempting to retry search for all policy IDs."); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, "Attempting to retry search for all policy IDs."); //$NON-NLS-1$ } if (!success) { // Let caller know that none of the calls were successful. @@ -808,7 +808,7 @@ */ public Collection findPolicyIDs(SessionToken caller, Collection principals) throws InvalidSessionException, AuthorizationException, AuthorizationMgmtException { - LogManager.logTrace(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace(LogConstants.CTX_AUTHORIZATION, new Object[]{"findPolicyIDs(", caller, ", ", principals, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ Set allPolicyIDs = new HashSet(); Iterator pItr = principals.iterator(); @@ -826,7 +826,7 @@ } } catch (MetaMatrixSecurityException e) { String msg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0035, principal); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0035, e, msg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0035, e, msg)); return Collections.EMPTY_SET; } } @@ -846,7 +846,7 @@ */ public Collection getPolicies(SessionToken caller, Collection policyIDs) throws InvalidSessionException, AuthorizationException, AuthorizationMgmtException { - LogManager.logTrace(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace(LogConstants.CTX_AUTHORIZATION, new Object[]{"getPolicies(", caller, ", ", policyIDs, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ return this.getPolicies(policyIDs); } @@ -864,7 +864,7 @@ */ public AuthorizationPolicy getPolicy(SessionToken caller, AuthorizationPolicyID policyID) throws InvalidSessionException, AuthorizationException, AuthorizationMgmtException { - LogManager.logTrace(LogSecurityConstants.CTX_AUTHORIZATION, new Object[]{"getPolicy(", caller, ", ", policyID, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + LogManager.logTrace(LogConstants.CTX_AUTHORIZATION, new Object[]{"getPolicy(", caller, ", ", policyID, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ boolean success = false; Exception exception = null; String exceptionMsg = null; @@ -881,12 +881,12 @@ break; } catch (ManagedConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0037, policyID); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString( ErrorMessageKeys.SEC_AUTHORIZATION_0037, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString( ErrorMessageKeys.SEC_AUTHORIZATION_0037, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0038, policyID); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0038, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0038, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceException e) { @@ -895,7 +895,7 @@ } finally { completeTransaction(success, transaction); } - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, new Object[]{"Attempting to retry getting policy for ID (", policyID, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[]{"Attempting to retry getting policy for ID (", policyID, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ } if (!success) { // Let caller know that none of the calls were successful. @@ -914,7 +914,7 @@ } transaction.close(); } catch (Exception e) { - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0015,e)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0015,e)); } } } @@ -928,7 +928,7 @@ */ public boolean isCallerInRole(SessionToken caller, String roleName) throws AuthorizationMgmtException { - LogManager.logTrace(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace(LogConstants.CTX_AUTHORIZATION, new Object[]{"isCallerInRole(", caller, roleName, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ try { return hasPolicy(caller, RolePermissionFactory.getRealm(), roleName); @@ -963,12 +963,12 @@ break; } catch (ManagedConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0040); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0040, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0040, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0041); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0041, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0041, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceException e) { @@ -977,7 +977,7 @@ } finally { completeTransaction(success, transaction); } - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, "Attempting to retry getting role descriptions."); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, "Attempting to retry getting role descriptions."); //$NON-NLS-1$ } if (!success) { // Let caller know that none of the calls were successful. @@ -1015,12 +1015,12 @@ break; } catch (ManagedConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0043, roleName.toString()); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString( ErrorMessageKeys.SEC_AUTHORIZATION_0043, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString( ErrorMessageKeys.SEC_AUTHORIZATION_0043, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0044, roleName.toString()); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0044, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0044, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceException e) { @@ -1029,7 +1029,7 @@ } finally { completeTransaction(success, transaction); } - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[]{"Attempting to retry getting principals for role \"", roleName.toString(), "\"."}); //$NON-NLS-1$ //$NON-NLS-2$ } if (!success) { @@ -1085,7 +1085,7 @@ protected boolean isEntitled(String principal) { try { if (membershipServiceProxy.isSuperUser(principal) || !membershipServiceProxy.isSecurityEnabled()) { - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[]{ "Automatically entitling principal", principal}); //$NON-NLS-1$ return true; } @@ -1121,11 +1121,11 @@ break; } catch (ManagedConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0050, principal.toString()); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString( ErrorMessageKeys.SEC_AUTHORIZATION_0050, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString( ErrorMessageKeys.SEC_AUTHORIZATION_0050, e, exceptionMsg)); success = false; } catch (AuthorizationSourceConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0051, principal.toString()); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0051, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0051, e, exceptionMsg)); success = false; } catch (AuthorizationSourceException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0052, principal.toString()); @@ -1138,7 +1138,7 @@ transaction.close(); } catch (Exception e) { String msg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0053, principal.toString()); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0053, e, msg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0053, e, msg)); throw new AuthorizationMgmtException(e, ErrorMessageKeys.SEC_AUTHORIZATION_0053, msg); } } @@ -1153,7 +1153,7 @@ transaction.close(); } catch (Exception e) { String msg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0054, principal.toString()); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0054, e, msg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0054, e, msg)); throw new AuthorizationMgmtException(e, msg); } } @@ -1161,7 +1161,7 @@ transaction = null; // ensure the transaction is not retained } // Try again... - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[]{ "Attempting to retry removing principal \"", principal.toString(), "\" from ALL policies."}); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -1200,12 +1200,12 @@ break; } catch (ManagedConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0055, realm.toString()); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0055, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0055, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0056, realm.toString()); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0056, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0056, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceException e) { @@ -1214,7 +1214,7 @@ } finally { completeTransaction(success, transaction); } - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[]{"Attempting to retry getting Authorization PolicyIDs with permissions belonging to realm \"", realm.toString(), "\"."}); //$NON-NLS-1$ //$NON-NLS-2$ } if (!success) { @@ -1257,12 +1257,12 @@ break; } catch (ManagedConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0058, realm.toString()); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0058, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0058, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0059, realm.toString()); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0059, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0059, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceException e) { @@ -1272,7 +1272,7 @@ completeTransaction(success, transaction); transaction = null; // ensure the transaction is not retained } - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[]{"Attempting to retry getting Authorization Policies belonging to realm \"", realm.toString(), "\"."}); //$NON-NLS-1$ //$NON-NLS-2$ } if (!success) { @@ -1336,12 +1336,12 @@ break; } catch (ManagedConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0058, realm.toString()); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0058, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0058, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0059, realm.toString()); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0059, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0059, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceException e) { @@ -1351,7 +1351,7 @@ completeTransaction(success, transaction); transaction = null; // ensure the transaction is not retained } - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[]{"Attempting to retry getting Authorization Policies belonging to realm \"", realm.toString(), "\"."}); //$NON-NLS-1$ //$NON-NLS-2$ } if (!success) { @@ -1406,12 +1406,12 @@ break; } catch (ManagedConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0058, realm.toString()); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0058, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0058, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0059, realm.toString()); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0059, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0059, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceException e) { @@ -1421,7 +1421,7 @@ completeTransaction(success, transaction); transaction = null; // ensure the transaction is not retained } - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[]{"Attempting to retry getting Authorization Policies belonging to realm \"", realm.toString(), "\"."}); //$NON-NLS-1$ //$NON-NLS-2$ } if (!success) { @@ -1449,7 +1449,7 @@ */ public PermissionDataNode fillPermissionNodeTree(PermissionDataNode root, AuthorizationPolicyID policyID) throws AuthorizationMgmtException { - LogManager.logTrace(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace(LogConstants.CTX_AUTHORIZATION, new Object[]{"fillPermissionNodeTree(", root, policyID, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ Set permissions = this.getPermissionsForPolicy(policyID); Collection exceptions = Collections.EMPTY_LIST; @@ -1499,12 +1499,12 @@ break; } catch (ManagedConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0061, policyID.toString()); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0061, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0061, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0062, policyID.toString()); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0062, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0062, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceException e) { @@ -1514,7 +1514,7 @@ completeTransaction(success, transaction); transaction = null; // ensure the transaction is not retained } - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, new Object[]{"Attempting to retry getting permissions for policy \"", policyID.toString(), "\"."}); //$NON-NLS-1$ //$NON-NLS-2$ + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[]{"Attempting to retry getting permissions for policy \"", policyID.toString(), "\"."}); //$NON-NLS-1$ //$NON-NLS-2$ } if (!success) { // Let caller know that none of the calls were successful. @@ -1538,7 +1538,7 @@ */ public Set executeTransaction(SessionToken administrator, List actions) throws InvalidSessionException, AuthorizationException, AuthorizationMgmtException { - LogManager.logTrace(LogSecurityConstants.CTX_AUTHORIZATION, new Object[]{"executeTransaction(", administrator, actions, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ + LogManager.logTrace(LogConstants.CTX_AUTHORIZATION, new Object[]{"executeTransaction(", administrator, actions, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ if (administrator == null) { throw new IllegalArgumentException(PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0064)); } @@ -1546,7 +1546,7 @@ if (actions == null) { throw new IllegalArgumentException(PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0065)); } - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[]{"Executing transaction with ", new Integer(actions.size()), " action(s)"}); //$NON-NLS-1$ //$NON-NLS-2$ Set result = new HashSet(); if (actions.isEmpty()) { @@ -1576,7 +1576,7 @@ currentAction = (ActionDefinition) iter.next(); currentTarget = currentAction.getTarget(); actionsWithSameTarget.add(currentAction); - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[]{"Target: <", currentTarget, "> First action: <", currentAction, ">"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } @@ -1612,7 +1612,7 @@ // Add this next action ... currentAction = nextAction; actionsWithSameTarget.add(currentAction); - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, new Object[]{"Target: ", currentTarget, " action: ", currentAction}); //$NON-NLS-1$ //$NON-NLS-2$ + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[]{"Target: ", currentTarget, " action: ", currentAction}); //$NON-NLS-1$ //$NON-NLS-2$ } // Process the last set of actions ... if (actionsWithSameTarget.size() != 0) { @@ -1628,11 +1628,11 @@ } catch (AuthorizationMgmtException e) { String msg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0066,printActions(actions)); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, e, msg); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, e, msg); throw e; } catch (Exception e) { String msg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0066,printActions(actions)); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, e, msg); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, e, msg); throw new AuthorizationMgmtException(e); } finally { if (transaction != null) { @@ -1643,7 +1643,7 @@ } catch (ManagedConnectionException e) { Object params = new Object[] {printActions(actions)}; String msg = PlatformPlugin.Util.getString("AuthorizationServiceImpl.Error_committing_transaction_after_executing_actions__{0}", params); //$NON-NLS-1$ - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, e, msg); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, e, msg); } } else { // rollback the transaction @@ -1651,7 +1651,7 @@ transaction.rollback(); } catch (ManagedConnectionException e) { String msg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0067,printActions(actions)); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, e, msg); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, e, msg); } } @@ -1659,7 +1659,7 @@ transaction.close(); } catch (Exception e) { String msg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0015,printActions(actions)); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, e, msg); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, e, msg); } transaction = null; // ensure the transaction is not retained } @@ -1701,12 +1701,12 @@ break; } catch (ManagedConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0068); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0068, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0068, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0069); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0069, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0069, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceException e) { @@ -1719,7 +1719,7 @@ completeTransaction(success, transaction); transaction = null; // ensure the transaction is not retained } - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, "Attempting to retry search for policy IDs belonging to principal collection."); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, "Attempting to retry search for policy IDs belonging to principal collection."); //$NON-NLS-1$ } if (!success) { // Let caller know that none of the calls were successful. @@ -1763,12 +1763,12 @@ break; } catch (ManagedConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0068); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0068, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0068, e, exceptionMsg)); exception = e; success = false; } catch ( AuthorizationSourceConnectionException e ) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0069); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0069, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0069, e, exceptionMsg)); exception = e; success = false; } catch ( AuthorizationSourceException e ) { @@ -1781,7 +1781,7 @@ completeTransaction(success, transaction); transaction = null; // ensure the transaction is not retained } - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, "Attempting to retry search for policy IDs belonging to principal collection."); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, "Attempting to retry search for policy IDs belonging to principal collection."); //$NON-NLS-1$ } if (!success) { // Let caller know that none of the calls were successful. @@ -1817,12 +1817,12 @@ break; } catch (ManagedConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0072); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString( ErrorMessageKeys.SEC_AUTHORIZATION_0072, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString( ErrorMessageKeys.SEC_AUTHORIZATION_0072, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0073); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0073, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0073, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceException e) { @@ -1832,7 +1832,7 @@ completeTransaction(success, transaction); transaction = null; // ensure the transaction is not retained } - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, "Attempting to retry search for policies with ID collection."); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, "Attempting to retry search for policies with ID collection."); //$NON-NLS-1$ } if (!success) { // Let caller know that none of the calls were successful. @@ -1890,7 +1890,7 @@ */ private Collection getPoliciesForPrincipal(MetaMatrixPrincipalName user, SessionToken session, AuthorizationRealm realm) throws AuthorizationMgmtException, InvalidPrincipalException { - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[]{"getPoliciesForPrincipal(", user, ", ", realm, ") - Trying cache first."}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // Look for policYIDs... try the cache first. @@ -1900,12 +1900,12 @@ // If there are cached policies for this user, check if any are for given realm // if not, we have to check the store, so null out the applicablePolicyIDs ref. if ( ! hasPolicyIDsForRealm(applicablePolicyIDs, realm) ) { - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[]{"getPoliciesForPrincipal(", user, ", ", realm, //$NON-NLS-1$ //$NON-NLS-2$ ") - Principal has no policyIDs cached for the given realm."}); //$NON-NLS-1$ applicablePolicyIDs.clear(); } else { - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[]{"getPoliciesForPrincipal(", user, ", ", realm, //$NON-NLS-1$ //$NON-NLS-2$ ") - Found poliyIDs cached for the principal in the given realm."}); //$NON-NLS-1$ } @@ -1913,7 +1913,7 @@ } if ( applicablePolicyIDs == null || applicablePolicyIDs.size() == 0 ) { // If the cache result is null, then this principal's applicable policy IDs have not been cached ... - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[]{"getPoliciesForPrincipal(", user, ", ", realm, //$NON-NLS-1$ //$NON-NLS-2$ ") - No policyIDs found in cache, going to store."}); //$NON-NLS-1$ // Go to the store @@ -1922,7 +1922,7 @@ // If there still aren't any applicable policyIDs, then principal is not authorized (to do anything) if ( applicablePolicyIDs == null || applicablePolicyIDs.size() == 0 ) { - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[]{"getPoliciesForPrincipal(", user, ", ", realm, //$NON-NLS-1$ //$NON-NLS-2$ ") - No policyIDs found for realm - no authorization."}); //$NON-NLS-1$ // Return empty set signifying principal has NO permissions @@ -1930,7 +1930,7 @@ } // Found some policyIDs for principal in store... - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[]{"getPoliciesForPrincipal(", user, ", ", realm, //$NON-NLS-1$ //$NON-NLS-2$ ") - Found policyIDs in store - caching: ", applicablePolicyIDs}); //$NON-NLS-1$ // Cache this principal's policyIDs @@ -1939,7 +1939,7 @@ Collection policies = new HashSet(); // Look for policies by policyID... Try the cache first - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[]{"getPoliciesForPrincipal(", user, ", ", realm, //$NON-NLS-1$ //$NON-NLS-2$ ") - Looking up policies in cache by policyID."}); //$NON-NLS-1$ policies = this.authorizationCache.findPolicies(applicablePolicyIDs); @@ -1948,24 +1948,24 @@ // of his policies. if ( policies == null || policies.size() == 0 || policies.size() < applicablePolicyIDs.size() ) { // Policies were not cached against PolicyIDs... Go to store - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[]{"getPoliciesForPrincipal(", user, ", ", realm, //$NON-NLS-1$ //$NON-NLS-2$ ") - No policies were found in cache, going to store."}); //$NON-NLS-1$ policies = this.getPolicies(applicablePolicyIDs); if ( policies != null && policies.size() > 0 ) { - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[]{"getPoliciesForPrincipal(", user, ", ", realm, //$NON-NLS-1$ //$NON-NLS-2$ ") - Found policies in store - caching."}); //$NON-NLS-1$ // Cache retrieved policies, if any this.authorizationCache.cachePoliciesWithIDs(policies); } } else { - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[]{"getPoliciesForPrincipal(", user, ", ", realm, //$NON-NLS-1$ //$NON-NLS-2$ ") - Found policies <", policies, "> in cache."}); //$NON-NLS-1$ //$NON-NLS-2$ } - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[]{"getPoliciesForPrincipal(", user, ", ", realm, //$NON-NLS-1$ //$NON-NLS-2$ ") - Returning these Policies for principal: <", policies, ">"}); //$NON-NLS-1$ //$NON-NLS-2$ return policies; @@ -1984,15 +1984,15 @@ while ( ID_itr.hasNext() ) { AuthorizationPolicyID id = (AuthorizationPolicyID) ID_itr.next(); AuthorizationRealm aRealm = id.getRealm(); - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[] {"hasPolicyIDsForRealm() - Comparing realms: <", aRealm, "> <", theRealmOfInterest, ">"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ if ( aRealm.equals(theRealmOfInterest) ) { - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, "hasPolicyIDsForRealm() - Realms are equal."); //$NON-NLS-1$ return true; } } - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, "hasPolicyIDsForRealm() - No realms found to be equal."); //$NON-NLS-1$ return false; } @@ -2007,7 +2007,7 @@ */ private Collection getGroupsForPrincipal(MetaMatrixPrincipalName principal) throws AuthorizationMgmtException, InvalidPrincipalException { - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[] {"getGroupsForPrincipal(", principal, ") - Getting all group memberships."}); //$NON-NLS-1$ //$NON-NLS-2$ // Get the set of all groups this Principal is a member of Set allPrincipals = new HashSet(); @@ -2027,7 +2027,7 @@ // HACK: Convert ALL member principals to MetaMatrixPrincipalName objs // since Auth and Memb svcs don't speak the same language. MetaMatrixPrincipalName member = new MetaMatrixPrincipalName((String) memberItr.next(), MetaMatrixPrincipal.TYPE_GROUP); - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[]{"getGroupsForPrincipal(", principal, ") - Adding membership <", member, ">"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ allPrincipals.add(member); } @@ -2071,19 +2071,19 @@ } catch (ManagedConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString( "AuthorizationServiceImpl.Exception_while_getting_dependant_permissions_for_request_{0}", request); //$NON-NLS-1$ - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, e, exceptionMsg); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, e, exceptionMsg); exception = e; success = false; } catch (AuthorizationSourceConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString( "AuthorizationServiceImpl.Failure_communicating_with_authorization_source_while_getting_dependant_permissions_for_request_{0}", request); //$NON-NLS-1$ - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, e, exceptionMsg); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, e, exceptionMsg); exception = e; success = false; } catch (AuthorizationSourceException e) { exceptionMsg = PlatformPlugin.Util.getString( "AuthorizationServiceImpl.Unknown_exception_communicating_with_authorization_source_while_getting_dependant_permissions_for_request_{0}", request); //$NON-NLS-1$ - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, e, exceptionMsg); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, e, exceptionMsg); throw new AuthorizationMgmtException(e, exceptionMsg); } finally { if ( transaction != null ) { @@ -2095,12 +2095,12 @@ } transaction.close(); } catch (Exception e) { - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, e, PlatformPlugin.Util.getString("AuthorizationServiceImpl.Unable_to_close_transaction.")); //$NON-NLS-1$ + LogManager.logError(LogConstants.CTX_AUTHORIZATION, e, PlatformPlugin.Util.getString("AuthorizationServiceImpl.Unable_to_close_transaction.")); //$NON-NLS-1$ } transaction = null; // ensure the transaction is not retained } } - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, "Attempting to retry search for policies with ID collection."); //$NON-NLS-1$ } if ( !success ) { @@ -2125,7 +2125,7 @@ private void executeTransactionsOnTarget(AuthorizationSourceTransaction transaction, List actions, Object target, SessionToken administrator, Set affectedObjects) throws AuthorizationMgmtException { - LogManager.logTrace(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace(LogConstants.CTX_AUTHORIZATION, new Object[]{"executeTransactionsOnTarget(", administrator, actions, target, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ // Execute the action(s) ... Set results = null; @@ -2133,7 +2133,7 @@ String exceptionMsg = null; boolean success = false; - LogManager.logTrace(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace(LogConstants.CTX_AUTHORIZATION, new Object[]{"Executing ", new Integer(actions.size()), " action(s) on target \"", target, "\""}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ if (target instanceof AuthorizationPolicyID) { AuthorizationPolicyID policyID = (AuthorizationPolicyID) target; @@ -2156,12 +2156,12 @@ // break; } catch (AuthorizationSourceConnectionException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0076, target); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0076, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0076, e, exceptionMsg)); exception = e; success = false; } catch (AuthorizationSourceException e) { exceptionMsg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0076, target); - LogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0076, e, exceptionMsg)); + LogManager.logError(LogConstants.CTX_AUTHORIZATION, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0076, e, exceptionMsg)); exception = e; success = false; } @@ -2289,7 +2289,7 @@ // delete the current the one if (options.containsOption(AdminOptions.OnConflict.OVERWRITE)) { overWritten = true; - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, new Object[] { + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[] { "overwriting existing role", sourcePolicyID.getDisplayName()}); //$NON-NLS-1$ aoe.remove(existingPolicy.getAuthorizationPolicyID()); } @@ -2304,7 +2304,7 @@ StandardAuthorizationActions.NONE_LABEL, PlatformPlugin.Util.getString("AuthorizationServiceImpl.Ignored")); //$NON-NLS-1$ } - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, new Object[] { + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, new Object[] { "ignoring existing role", sourcePolicyID.getDisplayName()}); //$NON-NLS-1$ continue; } @@ -2333,7 +2333,7 @@ // Commit the actions we've built up List actions = aoe.getDestination().getActions(); - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, "migrateEntitlements(" //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, "migrateEntitlements(" //$NON-NLS-1$ + targetVDBName + " " + targetVDBVersion //$NON-NLS-1$ + ") executing [" //$NON-NLS-1$ + actions.size() + "] for [" //$NON-NLS-1$ Modified: trunk/server/src/main/java/com/metamatrix/platform/security/authorization/spi/jdbc/JDBCAuthorizationReader.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/platform/security/authorization/spi/jdbc/JDBCAuthorizationReader.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/server/src/main/java/com/metamatrix/platform/security/authorization/spi/jdbc/JDBCAuthorizationReader.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -32,6 +32,7 @@ import com.metamatrix.common.log.I18nLogManager; import com.metamatrix.common.log.LogManager; +import com.metamatrix.common.util.LogConstants; import com.metamatrix.platform.PlatformPlugin; import com.metamatrix.platform.security.api.AuthorizationActions; import com.metamatrix.platform.security.api.AuthorizationPermission; @@ -44,7 +45,6 @@ import com.metamatrix.platform.security.api.StandardAuthorizationActions; import com.metamatrix.platform.security.authorization.spi.AuthorizationSourceConnectionException; import com.metamatrix.platform.security.authorization.spi.AuthorizationSourceException; -import com.metamatrix.platform.security.util.LogSecurityConstants; import com.metamatrix.platform.util.ErrorMessageKeys; @@ -71,7 +71,7 @@ Set pRoles = new HashSet(); String sql = JDBCNames.SELECT_ROLE_NAMES_FOR_PRINCIPAL_NAME; sql = sql.toUpperCase(); - LogManager.logTrace( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace( LogConstants.CTX_AUTHORIZATION, new Object[] { "getRoleNamesForPrincipal(", principal, ")", "SQL: ", sql }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // DEBUG: //Object[] OUT = new Object[] { "getRoleNamesForPrincipal(", principals, ")", "SQL: ", sql }; @@ -102,7 +102,7 @@ try { statement.close(); } catch ( SQLException se ) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); } statement = null; } @@ -140,7 +140,7 @@ // Get new copy of policy ID String sql = JDBCNames.SELECT_POLICYID_FOR_NAME; sql = sql.toUpperCase(); - LogManager.logDetail( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail( LogConstants.CTX_AUTHORIZATION, new Object[] { "getPolicy-1(", policyID, ")", "SQL: ", sql }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // DEBUG: //Object[] OUT2 = new Object[] { "\ngetPolicy-1(", policyID, ")", sql }; @@ -167,7 +167,7 @@ // Get the policy's principals sql = JDBCNames.SELECT_PRINCIPALS_FOR_POLICY_NAME; sql = sql.toUpperCase(); - LogManager.logTrace( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace( LogConstants.CTX_AUTHORIZATION, new Object[] { "getPolicy-2(", policyID, ")", "SQL: ", sql }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // DEBUG: //Object[] OUT2 = new Object[] { "\ngetPolicy-2(", policyID, ")", sql }; @@ -197,7 +197,7 @@ statement.close(); // statement = null; } catch ( SQLException se ) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); } } } @@ -227,7 +227,7 @@ AuthorizationPermissionFactory permFactory = null; String sql = JDBCNames.SELECT_PERMISSIONS_FOR_POLICY_NAME; sql = sql.toUpperCase(); - LogManager.logTrace( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace( LogConstants.CTX_AUTHORIZATION, new Object[] { "getPermissionsForPolicy(", policyID, ")", "SQL: ", sql }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // DEBUG: //Object[] out = new Object[] { "\ngetPermissionsForPolicy(", policyID, ")", sql }; @@ -282,7 +282,7 @@ statement.close(); // statement = null; } catch ( SQLException se ) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); } } } Modified: trunk/server/src/main/java/com/metamatrix/platform/security/authorization/spi/jdbc/JDBCAuthorizationTransaction.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/platform/security/authorization/spi/jdbc/JDBCAuthorizationTransaction.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/server/src/main/java/com/metamatrix/platform/security/authorization/spi/jdbc/JDBCAuthorizationTransaction.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -50,6 +50,7 @@ import com.metamatrix.common.id.dbid.DBIDGeneratorException; import com.metamatrix.common.log.I18nLogManager; import com.metamatrix.common.log.LogManager; +import com.metamatrix.common.util.LogConstants; import com.metamatrix.platform.PlatformPlugin; import com.metamatrix.platform.security.api.AuthorizationActions; import com.metamatrix.platform.security.api.AuthorizationModel; @@ -65,7 +66,6 @@ import com.metamatrix.platform.security.authorization.spi.AuthorizationSourceConnectionException; import com.metamatrix.platform.security.authorization.spi.AuthorizationSourceException; import com.metamatrix.platform.security.authorization.spi.AuthorizationSourceTransaction; -import com.metamatrix.platform.security.util.LogSecurityConstants; import com.metamatrix.platform.security.util.RolePermissionFactory; import com.metamatrix.platform.util.ErrorMessageKeys; @@ -119,7 +119,7 @@ String sql = JDBCNames.SELECT_ACTIONS_PERM_FACTORY_AND_POLICYNAME_FOR_RESOURCE_IN_REALM; sql = sql.toUpperCase(); - LogManager.logTrace( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace( LogConstants.CTX_AUTHORIZATION, new Object[] { "addPermissionsWithResourcesToParent(", parent, resources, realm,")", "SQL: ", sql }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // Get a Map of Permission->PolicyID for the Policies this new parent of these resources @@ -192,7 +192,7 @@ try { statement.close(); } catch(SQLException e) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,e); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,e); } statement = null; @@ -238,7 +238,7 @@ String sql = JDBCNames.DELETE_PERMISSIONS_WITH_RESOURCES_IN; sql = sql.toUpperCase(); - LogManager.logTrace( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace( LogConstants.CTX_AUTHORIZATION, new Object[] { "removePermissionsWithResources(", resources, realm,")", "SQL: ", sql }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // Collect the IN clause @@ -254,7 +254,7 @@ inBuf.setLength(inBuf.length() - 2); } inBuf.append("))"); //$NON-NLS-1$ - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, "Removing permissions with resources: " + inBuf.toString() + "<->" + realm.getRealmName()); //$NON-NLS-1$ //$NON-NLS-2$ @@ -272,7 +272,7 @@ try { statement.close(); } catch ( SQLException e ) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,e); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,e); } statement = null; } @@ -297,7 +297,7 @@ String sql = JDBCNames.SELECT_DEPENDANT_RESOURCES_FOR_RESOURCE_IN_REALM; sql = sql.toUpperCase(); - LogManager.logTrace(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace(LogConstants.CTX_AUTHORIZATION, new Object[]{"getDependantPermissions(", request, ")", "SQL: ", sql}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ PreparedStatement statement = null; @@ -321,7 +321,7 @@ try { statement.close(); } catch ( SQLException e ) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,e); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,e); } statement = null; } @@ -383,7 +383,7 @@ */ public Map getGroupEntitlements(AuthorizationRealm realm, String fullyQualifiedGroupName) throws AuthorizationSourceConnectionException, AuthorizationSourceException { - LogManager.logTrace( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace( LogConstants.CTX_AUTHORIZATION, new Object[] { "getGroupEntitlements(", realm, ", ", fullyQualifiedGroupName, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // Get SQL string and create PreparedStatement @@ -434,7 +434,7 @@ */ public Map getElementEntitlements(AuthorizationRealm realm, String elementNamePattern) throws AuthorizationSourceConnectionException, AuthorizationSourceException { - LogManager.logTrace( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace( LogConstants.CTX_AUTHORIZATION, new Object[] { "getElementEntitlements(", realm, ", ", elementNamePattern, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // Get SQL string and create PreparedStatement @@ -467,7 +467,7 @@ */ private Map getEntitlementsForResourceInRealm(PreparedStatement statement, boolean isGroup) throws AuthorizationSourceConnectionException, AuthorizationSourceException { - LogManager.logTrace( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace( LogConstants.CTX_AUTHORIZATION, new Object[] { "getEntitlementsForResourceInRealm(", statement, ", isGroup=", new Boolean(isGroup) }); //$NON-NLS-1$ //$NON-NLS-2$ Map resourceToEntitlementMap = new HashMap(); @@ -522,7 +522,7 @@ try { statement.close(); } catch ( SQLException se ) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); } statement = null; } @@ -542,7 +542,7 @@ String sql = JDBCNames.SELECT_ALL_REALM_NAMES; sql = sql.toUpperCase(); - LogManager.logTrace( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace( LogConstants.CTX_AUTHORIZATION, new Object[] { "getRealmNames()", "SQL: ", sql }); //$NON-NLS-1$ //$NON-NLS-2$ // DEBUG: //Object[] OUT = new Object[] { "getRealmNames()", "SQL: ", sql }; @@ -566,7 +566,7 @@ statement.close(); statement = null; } catch ( SQLException se ) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); } } } @@ -585,7 +585,7 @@ Map roles = new HashMap(); String sql = JDBCNames.SELECT_ALL_ROLES_AND_DESCRITPIONS; sql = sql.toUpperCase(); - LogManager.logTrace( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace( LogConstants.CTX_AUTHORIZATION, new Object[] { "getRoleDescriptions()", "SQL: ", sql }); //$NON-NLS-1$ //$NON-NLS-2$ // DEBUG: //Object[] OUT = new Object[] { "getRoleDescriptions()", "SQL: ", sql }; @@ -614,7 +614,7 @@ try { statement.close(); } catch ( SQLException se ) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); } statement = null; } @@ -640,7 +640,7 @@ Set principals = new HashSet(); String sql = JDBCNames.SELECT_PRINCIPALS_FOR_ROLE_NAME; sql = sql.toUpperCase(); - LogManager.logTrace( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace( LogConstants.CTX_AUTHORIZATION, new Object[] { "getPrincipalsForRole(", roleName, ")", "SQL: ", sql }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // DEBUG: //Object[] OUT = new Object[] { "getPrincipalsForRole(", roleName, ")", "SQL: ", sql }; @@ -668,7 +668,7 @@ try { statement.close(); } catch ( SQLException se ) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); } statement = null; } @@ -695,7 +695,7 @@ Set roleNames = new HashSet(); String sql = JDBCNames.SELECT_ROLE_NAMES_FOR_PRINCIPAL_NAME; sql = sql.toUpperCase(); - LogManager.logTrace( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace( LogConstants.CTX_AUTHORIZATION, new Object[] { "getRoleNamesForPrincipal(", principals, ")", "SQL: ", sql }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // DEBUG: //Object[] OUT = new Object[] { "getRoleNamesForPrincipal(", principals, ")", "SQL: ", sql }; @@ -732,7 +732,7 @@ try { statement.close(); } catch ( SQLException se ) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); } statement = null; } @@ -784,7 +784,7 @@ // select policyName from authPolicies String sql = JDBCNames.SELECT_ALL_POLICIES; sql = sql.toUpperCase(); - LogManager.logDetail( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail( LogConstants.CTX_AUTHORIZATION, new Object[] { "findAllPolicyIDs()", "SQL: ", sql }); //$NON-NLS-1$ //$NON-NLS-2$ // DEBUG: //Object[] OUT = new Object[] { "findAllPolicyIDs()", "SQL: ", sql }; @@ -804,7 +804,7 @@ statement.close(); statement = null; } catch ( SQLException se ) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); } } } @@ -834,7 +834,7 @@ String sql = JDBCNames.SELECT_POLICY_NAMES_WITH_PERMISSIONS_IN_REALM; sql = sql.toUpperCase(); - LogManager.logTrace( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace( LogConstants.CTX_AUTHORIZATION, new Object[] { "getPolicyIDsWithPermissionsInRealm(", realm, ")", "SQL: ", sql }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // DEBUG: //Object[] OUT = new Object[] { "getPolicyIDsWithPermissionsInRealm(", realm, ")", sql }; @@ -857,7 +857,7 @@ statement.close(); statement = null; } catch ( SQLException se ) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); } } } @@ -888,7 +888,7 @@ String sql = JDBCNames.SELECT_POLICY_NAMES_FOR_REALM; sql = sql.toUpperCase(); - LogManager.logTrace( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace( LogConstants.CTX_AUTHORIZATION, new Object[] { "getPolicyIDsInRealm(", realm, ")", "SQL: ", sql }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // DEBUG: //Object[] OUT = new Object[] { "getPolicyIDsWithPermissionsInRealm(", realm, ")", sql }; @@ -910,7 +910,7 @@ statement.close(); statement = null; } catch ( SQLException se ) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); } } } @@ -942,7 +942,7 @@ String sql = JDBCNames.SELECT_POLICY_NAMES_FOR_REALM_STARTS_WITH; sql = sql.toUpperCase(); - LogManager.logTrace( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace( LogConstants.CTX_AUTHORIZATION, new Object[] { "getPolicyIDsInPartialRealm(", realm, ")", "SQL: ", sql }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // DEBUG: //Object[] OUT = new Object[] { "getPolicyIDsInPartialRealm(", realm, ")", sql }; @@ -963,7 +963,7 @@ statement.close(); statement = null; } catch ( SQLException se ) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); } } } @@ -993,7 +993,7 @@ // select policyName from authPolicies for each principal String sql = JDBCNames.SELECT_POLICY_NAMES_FOR_PRINCIPALS_IN_REALM; sql = sql.toUpperCase(); - LogManager.logTrace( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace( LogConstants.CTX_AUTHORIZATION, new Object[] { "findPolicyIDs(", principals, realmName, ")", "SQL: ", sql }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // DEBUG: //Object[] OUT = new Object[] { "findPolicyIDs(", principals, realmName, ")", sql }; @@ -1024,7 +1024,7 @@ statement.close(); statement = null; } catch ( SQLException se ) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); } } } @@ -1053,7 +1053,7 @@ // select policyName from authPolicies for each principal String sql = JDBCNames.SELECT_POLICY_NAMES_FOR_PRINCIPALS; sql = sql.toUpperCase(); - LogManager.logTrace( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace( LogConstants.CTX_AUTHORIZATION, new Object[] { "findPolicyIDs(", principals, ")", "SQL: ", sql }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // DEBUG: //Object[] OUT = new Object[] { "findPolicyIDs(", principals ")", sql }; @@ -1081,7 +1081,7 @@ statement.close(); statement = null; } catch ( SQLException se ) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); } } } @@ -1110,7 +1110,7 @@ String sql = JDBCNames.SELECT_POLICY_NAMES_WITH_RESOURCE_IN_REALM; sql = sql.toUpperCase(); - LogManager.logTrace( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace( LogConstants.CTX_AUTHORIZATION, new Object[] { "getPolicIDsForResourceInRealm(", realm, resourceName, ")", "SQL: ", sql }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // DEBUG: //Object[] OUT = new Object[] { "getPolicIDsForResourceInRealm(", realm, resourceName, ")", sql }; @@ -1132,7 +1132,7 @@ statement.close(); statement = null; } catch ( SQLException se ) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); } } } @@ -1208,7 +1208,7 @@ PreparedStatement statement = null; String sql = JDBCNames.DELETE_PRINCIPAL_FROM_ALL_POLICIES; - LogManager.logTrace( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace( LogConstants.CTX_AUTHORIZATION, new Object[] { "removePrincipalFromAllPolicies(", principal, ")", "SQL: ", sql }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // DEBUG: //Object[] OUT = new Object[] { "getPolicIDsForResourceInRealm(", realm, resourceName, ")", sql }; @@ -1219,7 +1219,7 @@ statement = jdbcConnection.prepareStatement(sql); statement.setString(1, principalName); statement.execute(); - LogManager.logDetail( LogSecurityConstants.CTX_AUTHORIZATION, "Deleted principal " + principalName + " from policies."); //$NON-NLS-1$ //$NON-NLS-2$ + LogManager.logDetail( LogConstants.CTX_AUTHORIZATION, "Deleted principal " + principalName + " from policies."); //$NON-NLS-1$ //$NON-NLS-2$ removed = true; } catch ( SQLException e ) { throw new AuthorizationSourceException(e, ErrorMessageKeys.SEC_AUTHORIZATION_0109, @@ -1231,7 +1231,7 @@ statement.close(); statement = null; } catch ( SQLException se ) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); } } } @@ -1274,7 +1274,7 @@ //==================== if(action instanceof CreateObject) { AuthorizationPolicy policy = (AuthorizationPolicy) args[DEFALT_ARRAY_INDEX]; - LogManager.logDetail( LogSecurityConstants.CTX_AUTHORIZATION, "Creating Policy: " + targetPolicyID); //$NON-NLS-1$ + LogManager.logDetail( LogConstants.CTX_AUTHORIZATION, "Creating Policy: " + targetPolicyID); //$NON-NLS-1$ if(policy != null){ // table = JDBCNames.AuthPolicyUpdateView.TABLE; this.addPolicyIntoAuthPolicies(policy); @@ -1296,7 +1296,7 @@ MetaMatrixPrincipalName newPrincipal = (MetaMatrixPrincipalName) args[DEFALT_ARRAY_INDEX]; if( newPrincipal != null){ - LogManager.logDetail( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail( LogConstants.CTX_AUTHORIZATION, "Adding Principal " + newPrincipal + " to Policy: " + targetPolicyID); //$NON-NLS-1$ //$NON-NLS-2$ this.addPrincipal(policyUID, newPrincipal, grantor); } @@ -1306,7 +1306,7 @@ Set newPrincipals = (Set) args[DEFALT_ARRAY_INDEX]; if ( (newPrincipals != null) && (!newPrincipals.isEmpty())){ - LogManager.logDetail( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail( LogConstants.CTX_AUTHORIZATION, "Adding Principals " + newPrincipals + " to Policy: " + targetPolicyID); //$NON-NLS-1$ //$NON-NLS-2$ this.addPrincipals(policyUID, newPrincipals, grantor); } @@ -1317,7 +1317,7 @@ AuthorizationPermission newPerm= (AuthorizationPermission) args[DEFALT_ARRAY_INDEX]; if( newPerm != null){ - LogManager.logDetail( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail( LogConstants.CTX_AUTHORIZATION, "Adding Permission " + newPerm + " to Policy: " + targetPolicyID); //$NON-NLS-1$ //$NON-NLS-2$ this.addPermission(policyUID, newPerm); } @@ -1327,7 +1327,7 @@ AuthorizationPermissions newPerms = (AuthorizationPermissions) args[DEFALT_ARRAY_INDEX]; if( newPerms != null){ - LogManager.logDetail( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail( LogConstants.CTX_AUTHORIZATION, "Adding Permissions " + newPerms + " to Policy: " + targetPolicyID); //$NON-NLS-1$ //$NON-NLS-2$ this.addPermissions(policyUID, newPerms ); } @@ -1344,7 +1344,7 @@ // // Exchange description String newDescription = (String) args[DEFALT_ARRAY_INDEX + 1]; - LogManager.logDetail( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail( LogConstants.CTX_AUTHORIZATION, "Setting description: " + newDescription + " on Policy: " + targetPolicyID); //$NON-NLS-1$ //$NON-NLS-2$ updateAuthPolicy(policyUID, newDescription); @@ -1368,7 +1368,7 @@ //newPermissions.removeAll(oldPermissions); if( (permsToRemove != null) && (!permsToRemove.isEmpty())) { - LogManager.logDetail( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail( LogConstants.CTX_AUTHORIZATION, "Removing Permissions: " + permsToRemove + " from Policy: " + targetPolicyID); //$NON-NLS-1$ //$NON-NLS-2$ executeBatchRemovePermissions(policyUID, permsToRemove.iterator()); @@ -1381,7 +1381,7 @@ // table = JDBCNames.AuthPermissionsUpdateView.TABLE; if( permsToRemove != null){ - LogManager.logDetail( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail( LogConstants.CTX_AUTHORIZATION, "Removing Permissions: " + permsToRemove + " from Policy: " + targetPolicyID); //$NON-NLS-1$ //$NON-NLS-2$ executeBatchRemovePermissions(policyUID, permsToRemove.iterator()); @@ -1394,7 +1394,7 @@ // table = JDBCNames.AuthPermissionsUpdateView.TABLE; if( permToRemove != null){ - LogManager.logDetail( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail( LogConstants.CTX_AUTHORIZATION, "Removing Permission: " + permToRemove + " from Policy: " + targetPolicyID); //$NON-NLS-1$ //$NON-NLS-2$ this.removePermission( policyUID, permToRemove); } @@ -1404,7 +1404,7 @@ // table = JDBCNames.AuthPrincipalsUpdateView.TABLE; Set principalsToRemove = (Set) args[DEFALT_ARRAY_INDEX]; if( (principalsToRemove != null) && (!principalsToRemove.isEmpty())) { - LogManager.logDetail( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail( LogConstants.CTX_AUTHORIZATION, "Removing Principals: " + principalsToRemove + " from Policy: " + targetPolicyID); //$NON-NLS-1$ //$NON-NLS-2$ this.removePrincipals(policyUID, principalsToRemove); } @@ -1414,7 +1414,7 @@ MetaMatrixPrincipalName principalToRemove = (MetaMatrixPrincipalName) args[DEFALT_ARRAY_INDEX]; // table = JDBCNames.AuthPrincipalsUpdateView.TABLE; if( (principalToRemove != null) ) { - LogManager.logDetail( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail( LogConstants.CTX_AUTHORIZATION, "Removing Principal: " + principalToRemove + " to Policy: " + targetPolicyID); //$NON-NLS-1$ //$NON-NLS-2$ // boolean removed = this.removePrincipal(policyUID, principalToRemove); @@ -1428,12 +1428,12 @@ policyUID = this.getPolicyUID(targetPolicyID); } - LogManager.logDetail( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail( LogConstants.CTX_AUTHORIZATION, "Destroying Policy: " + targetPolicyID); //$NON-NLS-1$ // Remove all permissions from policy // table = JDBCNames.AuthPermissionsUpdateView.TABLE; // String criteria = JDBCNames.AuthPermissionsUpdateView.Columns.POLICY_UID.getNameInSource(); - LogManager.logDetail( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail( LogConstants.CTX_AUTHORIZATION, "Removing all Permissions from Policy: " + targetPolicyID); //$NON-NLS-1$ this.removeAll(JDBCNames.DELETE_ALL_PERMISSIONS_FOR_POLICY, policyUID); //table, criteria, policyUID); @@ -1441,7 +1441,7 @@ // Remove all principals from policy // table = JDBCNames.AuthPrincipalsUpdateView.TABLE; // criteria = JDBCNames.AuthPrincipalsUpdateView.Columns.POLICY_UID.getNameInSource(); - LogManager.logDetail( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail( LogConstants.CTX_AUTHORIZATION, "Removing all Principals from Policy: " + targetPolicyID); //$NON-NLS-1$ this.removeAll(JDBCNames.DELETE_ALL_PRINCIPALS_FOR_POLICY,policyUID); // table, criteria, policyUID); @@ -1449,7 +1449,7 @@ // Remove the policy // table = JDBCNames.AuthPolicyUpdateView.TABLE; // criteria = JDBCNames.AuthPolicyUpdateView.Columns.POLICY_UID.getNameInSource(); - LogManager.logDetail( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail( LogConstants.CTX_AUTHORIZATION, "Removing the Policy: " + targetPolicyID); //$NON-NLS-1$ this.removeAll(JDBCNames.DELETE_ALL_POLICIES_FOR_POLICY, policyUID); // table, criteria, policyUID); @@ -1538,7 +1538,7 @@ statement.execute(); - LogManager.logDetail( LogSecurityConstants.CTX_AUTHORIZATION, "Inserted permissions for policy " + perm.getResourceName()); //$NON-NLS-1$ + LogManager.logDetail( LogConstants.CTX_AUTHORIZATION, "Inserted permissions for policy " + perm.getResourceName()); //$NON-NLS-1$ } catch ( DBIDGeneratorException e ) { String msg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0108, perm.getResourceName(), perm.getRealmName()); throw new AuthorizationSourceException(e, ErrorMessageKeys.SEC_AUTHORIZATION_0111, msg); @@ -1553,7 +1553,7 @@ statement.close(); statement = null; } catch ( SQLException se ) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); } } } @@ -1606,7 +1606,7 @@ try{ statement = jdbcConnection.prepareStatement(sql); - LogManager.logTrace( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace( LogConstants.CTX_AUTHORIZATION, new Object[] { "removePermission(", policyUID, perm.getRealm(),")", "SQL: ", sql }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ statement.setLong(1, policyUID.longValue()); @@ -1614,7 +1614,7 @@ statement.execute(); - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, "Removed permission: " + policyUID + "<->" + perm.getRealm()); //$NON-NLS-1$ //$NON-NLS-2$ // /DEBUG: @@ -1630,7 +1630,7 @@ statement.close(); statement = null; } catch ( SQLException se ) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); } } } @@ -1669,7 +1669,7 @@ statement.close(); statement = null; } catch (SQLException se) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085, se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085, se); } } } @@ -1699,7 +1699,7 @@ statement.execute(); // policyIDs = this.populatePolicyIDs(results); - LogManager.logDetail( LogSecurityConstants.CTX_AUTHORIZATION, "Inserted principal " + principal.getName()); //$NON-NLS-1$ + LogManager.logDetail( LogConstants.CTX_AUTHORIZATION, "Inserted principal " + principal.getName()); //$NON-NLS-1$ // } catch ( DBIDGeneratorException e ) { // String msg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0108, perm.getResourceName(), perm.getRealmName()); @@ -1709,7 +1709,7 @@ statement.close(); statement = null; } catch ( SQLException se ) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); } } } @@ -1746,7 +1746,7 @@ try{ statement = jdbcConnection.prepareStatement(sql); - LogManager.logTrace( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace( LogConstants.CTX_AUTHORIZATION, new Object[] { "removePrincipal(", policyUID, principal,")", "SQL: ", sql }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ statement.setLong(1, policyUID.longValue()); @@ -1754,7 +1754,7 @@ statement.execute(); - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, "Removed principal: " + policyUID + "<->" + principal); //$NON-NLS-1$ //$NON-NLS-2$ // /DEBUG: @@ -1767,7 +1767,7 @@ statement.close(); statement = null; } catch ( SQLException se ) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); } } } @@ -1782,7 +1782,7 @@ Iterator iter = principals.iterator(); boolean allRemoved = true; - LogManager.logTrace( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace( LogConstants.CTX_AUTHORIZATION, new Object[] { "removePrincipals(", policyUID, ")" }); //$NON-NLS-1$ //$NON-NLS-2$ while( iter.hasNext() ){ @@ -1838,13 +1838,13 @@ try { statement = jdbcConnection.prepareStatement(sql); - LogManager.logTrace(LogSecurityConstants.CTX_AUTHORIZATION, new Object[] { + LogManager.logTrace(LogConstants.CTX_AUTHORIZATION, new Object[] { "removePermissionsForRealm(", realmUID, ")", "SQL: ", sql}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ statement.setLong(1, realmUID.longValue()); statement.execute(); - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, "Removed AUTHPERMISSIONS for realm: " + realmUID); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, "Removed AUTHPERMISSIONS for realm: " + realmUID); //$NON-NLS-1$ } finally { close(statement); } @@ -1862,13 +1862,13 @@ try { statement = jdbcConnection.prepareStatement(sql); - LogManager.logTrace(LogSecurityConstants.CTX_AUTHORIZATION, new Object[] { + LogManager.logTrace(LogConstants.CTX_AUTHORIZATION, new Object[] { "removeRealm(", realmUID, ")", "SQL: ", sql}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ statement.setLong(1, realmUID.longValue()); statement.execute(); - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, "Removed AUTHREALM: " + realmUID); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, "Removed AUTHREALM: " + realmUID); //$NON-NLS-1$ } finally { close(statement); } @@ -1890,13 +1890,13 @@ try { statement = jdbcConnection.prepareStatement(sql); - LogManager.logTrace(LogSecurityConstants.CTX_AUTHORIZATION, new Object[] { + LogManager.logTrace(LogConstants.CTX_AUTHORIZATION, new Object[] { "removePrincipalsForRealm(", realm, ")", "SQL: ", sql}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ statement.setString(1, policyName); statement.execute(); - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, "Removed AUTHPRINCIPALS for realm: " + realm); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, "Removed AUTHPRINCIPALS for realm: " + realm); //$NON-NLS-1$ } finally { close(statement); } @@ -1917,13 +1917,13 @@ try { statement = jdbcConnection.prepareStatement(sql); - LogManager.logTrace(LogSecurityConstants.CTX_AUTHORIZATION, new Object[] { + LogManager.logTrace(LogConstants.CTX_AUTHORIZATION, new Object[] { "removePoliciesForRealm(", realm, ")", "SQL: ", sql}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ statement.setString(1, policyName); statement.execute(); - LogManager.logDetail(LogSecurityConstants.CTX_AUTHORIZATION, "Removed AUTHPOLICIES for realm: " + realm); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_AUTHORIZATION, "Removed AUTHPOLICIES for realm: " + realm); //$NON-NLS-1$ } finally { close(statement); } @@ -1962,7 +1962,7 @@ statement.execute(); - LogManager.logDetail( LogSecurityConstants.CTX_AUTHORIZATION, "Inserted policy " + nameValue); //$NON-NLS-1$ + LogManager.logDetail( LogConstants.CTX_AUTHORIZATION, "Inserted policy " + nameValue); //$NON-NLS-1$ } catch ( DBIDGeneratorException e ) { String msg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_AUTHORIZATION_0116, nameValue); throw new AuthorizationSourceConnectionException(e, ErrorMessageKeys.SEC_AUTHORIZATION_0116, msg); @@ -1973,7 +1973,7 @@ statement.close(); statement = null; } catch ( SQLException se ) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); } } } @@ -1993,7 +1993,7 @@ // select policyID from AuthPolicies where name like ? String sql = JDBCNames.SELECT_POLICYUID_FOR_POLICY_NAME; sql = sql.toUpperCase(); - LogManager.logTrace( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace( LogConstants.CTX_AUTHORIZATION, new Object[] { "getPolicyUID(", policyID, ")", "SQL: ", sql }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // DEBUG: //Object[] OUT = new Object[] { "getPolicyUID(", policyID, ")", "SQL: ", sql }; @@ -2020,7 +2020,7 @@ statement.close(); statement = null; } catch ( SQLException se ) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); } } } @@ -2051,7 +2051,7 @@ String sql = JDBCNames.SELECT_AUTH_REALM_BY_NAME; sql = sql.toUpperCase(); - LogManager.logTrace( LogSecurityConstants.CTX_AUTHORIZATION, + LogManager.logTrace( LogConstants.CTX_AUTHORIZATION, new Object[] { "getRealmUID()", "SQL: ", sql }); //$NON-NLS-1$ //$NON-NLS-2$ try { @@ -2104,7 +2104,7 @@ try { statement.close(); } catch ( SQLException e ) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0121, + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0121, e); } @@ -2139,7 +2139,7 @@ try { statement.close(); } catch ( SQLException e ) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0121, + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0121, e); } } @@ -2198,7 +2198,7 @@ statement.close(); statement = null; } catch(SQLException se) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); } } } @@ -2261,7 +2261,7 @@ prepStatement.close(); } } catch (SQLException se) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); } @@ -2343,7 +2343,7 @@ prepStatement.close(); } } catch (SQLException se) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); } } @@ -2398,7 +2398,7 @@ prepStatement.close(); } } catch (SQLException se) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085,se); } } @@ -2412,7 +2412,7 @@ statement.close(); statement = null; } catch (SQLException se) { - I18nLogManager.logError(LogSecurityConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085, se); + I18nLogManager.logError(LogConstants.CTX_AUTHORIZATION, ErrorMessageKeys.SEC_AUTHORIZATION_0085, se); } } } Modified: trunk/server/src/main/java/com/metamatrix/platform/security/membership/service/MembershipServiceImpl.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/platform/security/membership/service/MembershipServiceImpl.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/server/src/main/java/com/metamatrix/platform/security/membership/service/MembershipServiceImpl.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -53,6 +53,7 @@ import com.metamatrix.common.config.api.AuthenticationProviderType; import com.metamatrix.common.config.model.ComponentCryptoUtil; import com.metamatrix.common.log.LogManager; +import com.metamatrix.common.util.LogConstants; import com.metamatrix.common.util.crypto.CryptoException; import com.metamatrix.common.util.crypto.CryptoUtil; import com.metamatrix.core.util.StringUtil; @@ -64,7 +65,6 @@ import com.metamatrix.platform.security.api.service.MembershipServiceInterface; import com.metamatrix.platform.security.membership.spi.MembershipDomain; import com.metamatrix.platform.security.membership.spi.MembershipSourceException; -import com.metamatrix.platform.security.util.LogSecurityConstants; import com.metamatrix.platform.service.api.exception.ServiceException; import com.metamatrix.platform.service.api.exception.ServiceStateException; import com.metamatrix.platform.service.controller.AbstractService; @@ -148,13 +148,13 @@ } isSecurityEnabled = Boolean.valueOf(env.getProperty(SECURITY_ENABLED)).booleanValue(); - LogManager.logDetail(LogSecurityConstants.CTX_MEMBERSHIP, "Security Enabled: " + isSecurityEnabled); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_MEMBERSHIP, "Security Enabled: " + isSecurityEnabled); //$NON-NLS-1$ try { //TODO: my caller should have already decrypted this for me adminCredentials = CryptoUtil.stringDecrypt(adminCredentials); } catch (CryptoException err) { - LogManager.logCritical(LogSecurityConstants.CTX_MEMBERSHIP, err, PlatformPlugin.Util.getString("MembershipServiceImpl.Root_password_decryption_failed")); //$NON-NLS-1$ + LogManager.logCritical(LogConstants.CTX_MEMBERSHIP, err, PlatformPlugin.Util.getString("MembershipServiceImpl.Root_password_decryption_failed")); //$NON-NLS-1$ throw new ServiceException(err); } @@ -177,18 +177,18 @@ Properties props = ComponentCryptoUtil.getDecryptedProperties(provider); if (!Boolean.valueOf(props.getProperty(DOMAIN_ACTIVE)).booleanValue()) { - LogManager.logDetail(LogSecurityConstants.CTX_MEMBERSHIP, "Skipping initilization of inactive domain " + domainName); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_MEMBERSHIP, "Skipping initilization of inactive domain " + domainName); //$NON-NLS-1$ continue; } newDomain = createDomain(domainName, props); } - LogManager.logInfo(LogSecurityConstants.CTX_MEMBERSHIP, PlatformPlugin.Util.getString(LogMessageKeys.SEC_MEMBERSHIP_0005, domainName)); + LogManager.logInfo(LogConstants.CTX_MEMBERSHIP, PlatformPlugin.Util.getString(LogMessageKeys.SEC_MEMBERSHIP_0005, domainName)); if(newDomain!=null) { this.domains.add(new MembershipDomainHolder(newDomain, domainName)); } } catch (Throwable e) { String msg = PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_MEMBERSHIP_0021, domainName); - LogManager.logCritical(LogSecurityConstants.CTX_MEMBERSHIP, e, msg); + LogManager.logCritical(LogConstants.CTX_MEMBERSHIP, e, msg); setInitException(new ServiceException(e, msg)); } } @@ -201,9 +201,9 @@ */ protected void closeService() throws Exception { String instanceName = this.getInstanceName(); - LogManager.logInfo(LogSecurityConstants.CTX_MEMBERSHIP, PlatformPlugin.Util.getString(LogMessageKeys.SEC_MEMBERSHIP_0001, instanceName)); + LogManager.logInfo(LogConstants.CTX_MEMBERSHIP, PlatformPlugin.Util.getString(LogMessageKeys.SEC_MEMBERSHIP_0001, instanceName)); this.shutdownDomains(); - LogManager.logInfo(LogSecurityConstants.CTX_MEMBERSHIP, PlatformPlugin.Util.getString(LogMessageKeys.SEC_MEMBERSHIP_0002, instanceName)); + LogManager.logInfo(LogConstants.CTX_MEMBERSHIP, PlatformPlugin.Util.getString(LogMessageKeys.SEC_MEMBERSHIP_0002, instanceName)); } /** @@ -254,7 +254,7 @@ try { domainHolder.getMembershipDomain().shutdown(); } catch ( Exception e ) { - LogManager.logError(LogSecurityConstants.CTX_MEMBERSHIP, e, ErrorMessageKeys.SEC_MEMBERSHIP_0026); + LogManager.logError(LogConstants.CTX_MEMBERSHIP, e, ErrorMessageKeys.SEC_MEMBERSHIP_0026); } } this.domains.clear(); @@ -304,7 +304,7 @@ */ public AuthenticationToken authenticateUser(String username, Credentials credential, Serializable trustedPayload, String applicationName) { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {"authenticateUser", username, applicationName}); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {"authenticateUser", username, applicationName}); //$NON-NLS-1$ if (credential != null) { String password = new String(credential.getCredentialsAsCharArray()); @@ -314,7 +314,7 @@ } catch (CryptoException err) { //just log and allow the normal authentication flow String msg = PlatformPlugin.Util.getString("MembershipServiceImpl.Decrypt_failed", username); //$NON-NLS-1$ - LogManager.logWarning(LogSecurityConstants.CTX_MEMBERSHIP, err, msg); + LogManager.logWarning(LogConstants.CTX_MEMBERSHIP, err, msg); } } } @@ -327,11 +327,11 @@ if (isSecurityEnabled && allowedAddresses != null) { String address = DQPWorkContext.getWorkContext().getClientAddress(); if (address == null) { - LogManager.logWarning(LogSecurityConstants.CTX_MEMBERSHIP, PlatformPlugin.Util.getString("MembershipServiceImpl.unknown_host")); //$NON-NLS-1$ + LogManager.logWarning(LogConstants.CTX_MEMBERSHIP, PlatformPlugin.Util.getString("MembershipServiceImpl.unknown_host")); //$NON-NLS-1$ return new FailedAuthenticationToken(); } if (!allowedAddresses.matcher(address).matches() || address.equals(CurrentConfiguration.getInstance().getHostAddress().getHostAddress())) { - LogManager.logWarning(LogSecurityConstants.CTX_MEMBERSHIP, PlatformPlugin.Util.getString("MembershipServiceImpl.invalid_host", address, allowedAddresses.pattern())); //$NON-NLS-1$ + LogManager.logWarning(LogConstants.CTX_MEMBERSHIP, PlatformPlugin.Util.getString("MembershipServiceImpl.invalid_host", address, allowedAddresses.pattern())); //$NON-NLS-1$ return new FailedAuthenticationToken(); } } @@ -368,26 +368,26 @@ return new SuccessfulAuthenticationToken(auth.getPayload(), baseUsername + MembershipServiceInterface.AT + domain); } String msg = PlatformPlugin.Util.getString("MembershipServiceImpl.Null_authentication", entry.getDomainName(), username ); //$NON-NLS-1$ - LogManager.logError(LogSecurityConstants.CTX_MEMBERSHIP, msg); + LogManager.logError(LogConstants.CTX_MEMBERSHIP, msg); return new FailedAuthenticationToken(); } catch (LogonException le) { String msg = PlatformPlugin.Util.getString("MembershipServiceImpl.Logon_failed", entry.getDomainName(), username ); //$NON-NLS-1$ - LogManager.logWarning(LogSecurityConstants.CTX_MEMBERSHIP, le, msg); + LogManager.logWarning(LogConstants.CTX_MEMBERSHIP, le, msg); return new FailedAuthenticationToken(); } catch (InvalidUserException e) { String msg = PlatformPlugin.Util.getString("MembershipServiceImpl.Invalid_user", entry.getDomainName(), username ); //$NON-NLS-1$ - LogManager.logDetail(LogSecurityConstants.CTX_MEMBERSHIP, e, msg); + LogManager.logDetail(LogConstants.CTX_MEMBERSHIP, e, msg); } catch (UnsupportedCredentialException e) { String msg = PlatformPlugin.Util.getString("MembershipServiceImpl.Unsupported_credentials", entry.getDomainName(), username ); //$NON-NLS-1$ - LogManager.logDetail(LogSecurityConstants.CTX_MEMBERSHIP, e, msg); + LogManager.logDetail(LogConstants.CTX_MEMBERSHIP, e, msg); } catch (MembershipSourceException e) { //just skip this domain for now String msg = PlatformPlugin.Util.getString("MembershipServiceImpl.source_exception", entry.getDomainName()); //$NON-NLS-1$ - LogManager.logError(LogSecurityConstants.CTX_MEMBERSHIP, e, msg); + LogManager.logError(LogConstants.CTX_MEMBERSHIP, e, msg); } } String msg = PlatformPlugin.Util.getString("MembershipServiceImpl.Failed_authentication", username ); //$NON-NLS-1$ - LogManager.logDetail(LogSecurityConstants.CTX_MEMBERSHIP, msg); + LogManager.logDetail(LogConstants.CTX_MEMBERSHIP, msg); return new FailedAuthenticationToken(); } @@ -491,7 +491,7 @@ */ public MetaMatrixPrincipal getPrincipal(MetaMatrixPrincipalName principal) throws MembershipServiceException, InvalidPrincipalException { - LogManager.logTrace( LogSecurityConstants.CTX_MEMBERSHIP, new Object[] { "getPrincipal", principal }); //$NON-NLS-1$ + LogManager.logTrace( LogConstants.CTX_MEMBERSHIP, new Object[] { "getPrincipal", principal }); //$NON-NLS-1$ String name = principal.getName(); @@ -524,7 +524,7 @@ // Get the principal from this domain BasicMetaMatrixPrincipal result = new BasicMetaMatrixPrincipal(name, MetaMatrixPrincipal.TYPE_USER, results); // If there is a result, then return the principal ... - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[]{"The user \"",name,"\" was obtained from domain \"",domain.getDomainName(),"\""} ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[]{"The user \"",name,"\" was obtained from domain \"",domain.getDomainName(),"\""} ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ return result; } if (domain.getMembershipDomain().getGroupNames().contains(baseName)) { @@ -532,11 +532,11 @@ } } catch ( InvalidPrincipalException e ) { String msg = PlatformPlugin.Util.getString("MembershipServiceImpl.principal_does_not_exist", name, domain.getDomainName()); //$NON-NLS-1$ - LogManager.logError(LogSecurityConstants.CTX_MEMBERSHIP, e, msg); + LogManager.logError(LogConstants.CTX_MEMBERSHIP, e, msg); throw new InvalidPrincipalException(msg); } catch (Throwable e) { String msg = PlatformPlugin.Util.getString("MembershipServiceImpl.source_exception", domain.getDomainName()); //$NON-NLS-1$ - LogManager.logError(LogSecurityConstants.CTX_MEMBERSHIP, e, msg); + LogManager.logError(LogConstants.CTX_MEMBERSHIP, e, msg); throw new MembershipServiceException(msg); } throw new InvalidPrincipalException(PlatformPlugin.Util.getString("MembershipServiceImpl.principal_does_not_exist", name, domain.getDomainName())); //$NON-NLS-1$ @@ -562,7 +562,7 @@ */ public Set getGroupsForUser(String userName) throws MembershipServiceException, InvalidPrincipalException { - LogManager.logTrace( LogSecurityConstants.CTX_MEMBERSHIP, new Object[] { "getGroupsForUser", userName}); //$NON-NLS-1$ + LogManager.logTrace( LogConstants.CTX_MEMBERSHIP, new Object[] { "getGroupsForUser", userName}); //$NON-NLS-1$ MetaMatrixPrincipal principal = getPrincipal(new MetaMatrixPrincipalName(userName, MetaMatrixPrincipal.TYPE_USER)); @@ -587,7 +587,7 @@ * @see com.metamatrix.platform.security.api.service.MembershipServiceInterface#getGroupNames() */ public Set getGroupNames() throws MembershipServiceException { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {"getGroupNames"}); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {"getGroupNames"}); //$NON-NLS-1$ Set result = new HashSet(); Iterator iter = this.domains.iterator(); @@ -597,7 +597,7 @@ result.addAll( getDomainSpecificGroups(domain.getMembershipDomain().getGroupNames(), domain.getDomainName()) ); } catch (Throwable e) { String msg = PlatformPlugin.Util.getString("MembershipServiceImpl.source_exception", domain.getDomainName()); //$NON-NLS-1$ - LogManager.logError(LogSecurityConstants.CTX_MEMBERSHIP, e, msg); + LogManager.logError(LogConstants.CTX_MEMBERSHIP, e, msg); throw new MembershipServiceException(msg); } } @@ -613,7 +613,7 @@ public List getDomainNames() { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {"getDomainNames"}); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {"getDomainNames"}); //$NON-NLS-1$ List names = new ArrayList(); Iterator iter = this.domains.iterator(); @@ -629,7 +629,7 @@ public Set<String> getGroupsForDomain(String domainName) throws MembershipServiceException { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {"getGroupsForDomain", domainName}); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {"getGroupsForDomain", domainName}); //$NON-NLS-1$ MembershipDomainHolder dHolder = null; Iterator iter = this.domains.iterator(); @@ -647,7 +647,7 @@ return getDomainSpecificGroups(dHolder.getMembershipDomain().getGroupNames(), domainName); } catch (Throwable e) { String msg = PlatformPlugin.Util.getString("MembershipServiceImpl.source_exception", dHolder.getDomainName()); //$NON-NLS-1$ - LogManager.logError(LogSecurityConstants.CTX_MEMBERSHIP, e, msg); + LogManager.logError(LogConstants.CTX_MEMBERSHIP, e, msg); throw new MembershipServiceException(msg); } } Modified: trunk/server/src/main/java/com/metamatrix/platform/security/membership/spi/ldap/LDAPMembershipDomain.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/platform/security/membership/spi/ldap/LDAPMembershipDomain.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/server/src/main/java/com/metamatrix/platform/security/membership/spi/ldap/LDAPMembershipDomain.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -49,13 +49,13 @@ import com.metamatrix.api.exception.security.LogonException; import com.metamatrix.api.exception.security.UnsupportedCredentialException; import com.metamatrix.common.log.LogManager; +import com.metamatrix.common.util.LogConstants; import com.metamatrix.platform.PlatformPlugin; import com.metamatrix.platform.security.api.Credentials; import com.metamatrix.platform.security.api.service.MembershipServiceInterface; import com.metamatrix.platform.security.membership.service.SuccessfulAuthenticationToken; import com.metamatrix.platform.security.membership.spi.MembershipDomain; import com.metamatrix.platform.security.membership.spi.MembershipSourceException; -import com.metamatrix.platform.security.util.LogSecurityConstants; import com.metamatrix.platform.service.api.exception.ServiceStateException; public class LDAPMembershipDomain implements @@ -134,7 +134,7 @@ public void initialize(Properties props) throws ServiceStateException { this.domainName = props.getProperty(MembershipServiceInterface.DOMAIN_NAME); - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, "Initializing LDAP Domain: " + domainName); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, "Initializing LDAP Domain: " + domainName); //$NON-NLS-1$ ldapTxnTimeoutInMillis = props.getProperty(TXN_TIMEOUT_IN_MILLIS); @@ -165,7 +165,7 @@ if (props.getProperty(USERS_MEMBER_OF_ATTRIBUTE, "").trim().length() == 0 //$NON-NLS-1$ && props.getProperty(GROUPS_GROUP_MEMBER_ATTRIBUTE, "").trim().length() == 0) { //$NON-NLS-1$ - LogManager.logWarning(LogSecurityConstants.CTX_MEMBERSHIP, PlatformPlugin.Util.getString("LDAPMembershipDomain.Require_memberof_property", domainName ) ); //$NON-NLS-1$ + LogManager.logWarning(LogConstants.CTX_MEMBERSHIP, PlatformPlugin.Util.getString("LDAPMembershipDomain.Require_memberof_property", domainName ) ); //$NON-NLS-1$ } // Create the root context. @@ -176,12 +176,12 @@ // If password is blank, we will perform an anonymous bind. if (ldapAdminUserDN != null && ldapAdminUserPass != null) { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, domainName + ": Username was set to:" + ldapAdminUserDN); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, domainName + ": Username was set to:" + ldapAdminUserDN); //$NON-NLS-1$ adminContext.put(Context.SECURITY_AUTHENTICATION, LDAP_AUTH_TYPE); adminContext.put(Context.SECURITY_PRINCIPAL, this.ldapAdminUserDN); adminContext.put(Context.SECURITY_CREDENTIALS, this.ldapAdminUserPass); } else { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, domainName + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, domainName + ": admin dn was blank; performing anonymous bind."); //$NON-NLS-1$ adminContext.put(Context.SECURITY_AUTHENTICATION, "none"); //$NON-NLS-1$ } @@ -272,7 +272,7 @@ } public void shutdown() throws ServiceStateException { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, domainName + ": shutdown()"); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, domainName + ": shutdown()"); //$NON-NLS-1$ } public SuccessfulAuthenticationToken authenticateUser(String username, @@ -283,7 +283,7 @@ LogonException, MembershipSourceException { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] { + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] { domainName, "authenticateUser username", username, "applicationName", applicationName}); //$NON-NLS-1$ //$NON-NLS-2$ if (username == null) { @@ -315,7 +315,7 @@ try { ctx.close(); } catch (NamingException ne) { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, ne, domainName + ": error closing context"); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, ne, domainName + ": error closing context"); //$NON-NLS-1$ } } } @@ -328,7 +328,7 @@ } public Set getGroupNames() throws MembershipSourceException { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] { + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] { domainName, " getGroupNames() called"}); //$NON-NLS-1$ DirContext ctx = null; @@ -341,7 +341,7 @@ try { ctx.close(); } catch (NamingException ne) { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, ne, domainName + ": error closing context"); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, ne, domainName + ": error closing context"); //$NON-NLS-1$ } } } @@ -360,7 +360,7 @@ public Set getGroupNamesForUser(String username) throws InvalidUserException, MembershipSourceException { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {domainName, "getGroupNamesForUser", username}); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {domainName, "getGroupNamesForUser", username}); //$NON-NLS-1$ if(username.length() == 0){ return Collections.EMPTY_SET; @@ -404,7 +404,7 @@ username = escapeLDAPSearchFilter(username); - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {domainName, "getUserEntry", username, "getGroups", String.valueOf(getGroups)}); //$NON-NLS-1$ //$NON-NLS-2$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {domainName, "getUserEntry", username, "getGroups", String.valueOf(getGroups)}); //$NON-NLS-1$ //$NON-NLS-2$ DirContext ctx = null; @@ -429,21 +429,21 @@ singleUserSearchFilter = "(&" + singleUserSearchFilter + context.searchFilter + ")"; //$NON-NLS-1$ //$NON-NLS-2$ } - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {domainName, "searching context", contextName, "with filter", singleUserSearchFilter, "and search scope", String.valueOf(context.searchScope)}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {domainName, "searching context", contextName, "with filter", singleUserSearchFilter, "and search scope", String.valueOf(context.searchScope)}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // We expect to receive only one user from this search, since the username attribute must be unique. NamingEnumeration usersEnumeration = ctx.search(contextName, singleUserSearchFilter, sControls); if (!usersEnumeration.hasMore()) { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {domainName, "no user match found in context", contextName}); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {domainName, "no user match found in context", contextName}); //$NON-NLS-1$ continue; } SearchResult foundUser = (SearchResult)usersEnumeration.next(); - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {domainName, "found user", username, "in context", contextName}); //$NON-NLS-1$ //$NON-NLS-2$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {domainName, "found user", username, "in context", contextName}); //$NON-NLS-1$ //$NON-NLS-2$ if (usersEnumeration.hasMore()) { LogManager - .logWarning(LogSecurityConstants.CTX_MEMBERSHIP, + .logWarning(LogConstants.CTX_MEMBERSHIP, domainName + ": Only expected one user when performing lookup. Check to ensure the display name is unique."); //$NON-NLS-1$ } @@ -471,7 +471,7 @@ } groupList.add(groupDN); LogManager - .logTrace(LogSecurityConstants.CTX_MEMBERSHIP, domainName + .logTrace(LogConstants.CTX_MEMBERSHIP, domainName + "-----Adding user's group: " + groupDN); //$NON-NLS-1$ } } @@ -481,7 +481,7 @@ } UserEntry ue = new UserEntry(dn, groupList); - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {domainName, "UserEntry retrieved for username", username, ue.getDn()}); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {domainName, "UserEntry retrieved for username", username, ue.getDn()}); //$NON-NLS-1$ return ue; } @@ -492,12 +492,12 @@ try { ctx.close(); } catch (NamingException ne) { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, ne, domainName + ": error closing context"); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, ne, domainName + ": error closing context"); //$NON-NLS-1$ } } } - LogManager.logInfo(LogSecurityConstants.CTX_MEMBERSHIP, + LogManager.logInfo(LogConstants.CTX_MEMBERSHIP, domainName + ": No user DN found for user: " + username + ", could not authenticate."); //$NON-NLS-1$ //$NON-NLS-2$ throw new InvalidUserException(username); } @@ -505,7 +505,7 @@ private Map getGroupNames(DirContext ctx, String userDn, boolean mustMatchDn) throws MembershipSourceException { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {domainName, "getGroupNames", userDn, "mustMatchDn", String.valueOf(mustMatchDn)}); //$NON-NLS-1$ //$NON-NLS-2$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {domainName, "getGroupNames", userDn, "mustMatchDn", String.valueOf(mustMatchDn)}); //$NON-NLS-1$ //$NON-NLS-2$ Map groupNames = new HashMap(); @@ -527,15 +527,15 @@ if (userDn != null && context.memberOfAttribute != null) { searchFilter = "(&(" + context.memberOfAttribute + "=" + userDn + ")" + searchFilter + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ } else if (mustMatchDn) { - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {domainName, "skipping group context"}); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {domainName, "skipping group context"}); //$NON-NLS-1$ continue; } - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {domainName, "searching group context", contextName, "with filter", searchFilter, "and search scope", String.valueOf(context.searchScope)}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {domainName, "searching group context", contextName, "with filter", searchFilter, "and search scope", String.valueOf(context.searchScope)}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ NamingEnumeration groupsEnum = ctx.search(contextName, searchFilter, groupSC); - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {domainName, "Parsing through groups search results."}); //$NON-NLS-1$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {domainName, "Parsing through groups search results."}); //$NON-NLS-1$ while (groupsEnum.hasMore()) { SearchResult curGroup = (SearchResult)groupsEnum.next(); @@ -563,7 +563,7 @@ groupNames.put(groupDN, groupDisplayName); - LogManager.logTrace(LogSecurityConstants.CTX_MEMBERSHIP, new Object[] {domainName, "Found groupDN", groupDN, "with display name", groupDisplayName}); //$NON-NLS-1$ //$NON-NLS-2$ + LogManager.logTrace(LogConstants.CTX_MEMBERSHIP, new Object[] {domainName, "Found groupDN", groupDN, "with display name", groupDisplayName}); //$NON-NLS-1$ //$NON-NLS-2$ } } } catch (NamingException err) { Modified: trunk/server/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/server/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -46,6 +46,7 @@ import com.metamatrix.common.id.dbid.DBIDController; import com.metamatrix.common.id.dbid.DBIDGenerator; import com.metamatrix.common.log.LogManager; +import com.metamatrix.common.util.LogConstants; import com.metamatrix.common.util.PropertiesUtils; import com.metamatrix.core.util.ArgCheck; import com.metamatrix.dqp.ResourceFinder; @@ -62,7 +63,6 @@ import com.metamatrix.platform.security.api.service.MembershipServiceInterface; import com.metamatrix.platform.security.api.service.SessionServiceInterface; import com.metamatrix.platform.security.membership.service.AuthenticationToken; -import com.metamatrix.platform.security.util.LogSecurityConstants; import com.metamatrix.platform.service.api.exception.ServiceException; import com.metamatrix.platform.service.api.exception.ServiceStateException; import com.metamatrix.platform.service.controller.AbstractService; @@ -128,14 +128,14 @@ for (MetaMatrixSessionInfo info : sessionCache.values()) { try { if (currentTime - info.getLastPingTime() > ServerConnection.PING_INTERVAL * 5) { - LogManager.logInfo(LogSecurityConstants.CTX_SESSION, PlatformPlugin.Util.getString( "SessionServiceImpl.keepaliveFailed", info.getSessionID())); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_SESSION, PlatformPlugin.Util.getString( "SessionServiceImpl.keepaliveFailed", info.getSessionID())); //$NON-NLS-1$ closeSession(info.getSessionID()); } else if (sessionTimeLimit > 0 && currentTime - info.getTimeCreated() > sessionTimeLimit) { - LogManager.logInfo(LogSecurityConstants.CTX_SESSION, PlatformPlugin.Util.getString( "SessionServiceImpl.expireSession", info.getSessionID())); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_SESSION, PlatformPlugin.Util.getString( "SessionServiceImpl.expireSession", info.getSessionID())); //$NON-NLS-1$ closeSession(info.getSessionID()); } } catch (Exception e) { - LogManager.logDetail(LogSecurityConstants.CTX_SESSION, e, "error running session monitor, unable to monitor: " + info.getSessionID()); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_SESSION, e, "error running session monitor, unable to monitor: " + info.getSessionID()); //$NON-NLS-1$ } } } @@ -165,7 +165,7 @@ @Override public void closeSession(MetaMatrixSessionID sessionID) throws InvalidSessionException, SessionServiceException{ - LogManager.logDetail(LogSecurityConstants.CTX_SESSION, new Object[] {"closeSession", sessionID}); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_SESSION, new Object[] {"closeSession", sessionID}); //$NON-NLS-1$ MetaMatrixSessionInfo info = this.sessionCache.remove(sessionID); if (info == null) { throw new InvalidSessionException(ErrorMessageKeys.SEC_SESSION_0027, PlatformPlugin.Util.getString(ErrorMessageKeys.SEC_SESSION_0027, sessionID)); @@ -174,7 +174,7 @@ try { queryTerminationHandler.cleanup(info.getSessionToken()); } catch (Exception e) { - LogManager.logWarning(LogSecurityConstants.CTX_SESSION,e,PlatformPlugin.Util.getString(LogMessageKeys.SEC_SESSION_0028, DataServerSessionTerminationHandler.class.getName())); + LogManager.logWarning(LogConstants.CTX_SESSION,e,PlatformPlugin.Util.getString(LogMessageKeys.SEC_SESSION_0028, DataServerSessionTerminationHandler.class.getName())); } } } @@ -342,12 +342,12 @@ MetaMatrixSessionID adminSessionID) throws AuthorizationException, SessionServiceException { Object[] params = {adminSessionID, terminatedSessionID}; - LogManager.logInfo(LogSecurityConstants.CTX_SESSION, PlatformPlugin.Util.getString( "SessionServiceImpl.terminateSession", params)); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_SESSION, PlatformPlugin.Util.getString( "SessionServiceImpl.terminateSession", params)); //$NON-NLS-1$ try { closeSession(terminatedSessionID); return true; } catch (InvalidSessionException e) { - LogManager.logWarning(LogSecurityConstants.CTX_SESSION,e,PlatformPlugin.Util.getString(LogMessageKeys.SEC_SESSION_0034, new Object[] {e.getMessage()})); + LogManager.logWarning(LogConstants.CTX_SESSION,e,PlatformPlugin.Util.getString(LogMessageKeys.SEC_SESSION_0034, new Object[] {e.getMessage()})); return false; } } Copied: trunk/server/src/main/java/com/metamatrix/platform/security/util/LogSecurityConstants.java (from rev 1067, trunk/common-internal/src/main/java/com/metamatrix/platform/security/util/LogSecurityConstants.java) =================================================================== --- trunk/server/src/main/java/com/metamatrix/platform/security/util/LogSecurityConstants.java (rev 0) +++ trunk/server/src/main/java/com/metamatrix/platform/security/util/LogSecurityConstants.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -0,0 +1,36 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package com.metamatrix.platform.security.util; + + +public interface LogSecurityConstants { + + // ********************************************************************** + // PLEASE NOTE:!!!!!!!!!!!!!!!!! + // All constants defined here should also be defined in + // com.metamatrix.common.util.LogContextsUtil + // ********************************************************************** + + public static final String CTX_AUDIT = "AUDIT"; //$NON-NLS-1$ + +} Modified: trunk/server/src/main/java/com/metamatrix/server/LogConfigurationProvider.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/server/LogConfigurationProvider.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/server/src/main/java/com/metamatrix/server/LogConfigurationProvider.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -21,10 +21,11 @@ */ package com.metamatrix.server; -import java.util.Arrays; import java.util.Collection; import java.util.EventObject; +import java.util.HashMap; import java.util.HashSet; +import java.util.Map; import java.util.Set; import com.google.inject.Inject; @@ -34,9 +35,8 @@ import com.metamatrix.common.config.api.Configuration; import com.metamatrix.common.config.api.exceptions.ConfigurationException; import com.metamatrix.common.log.LogConfiguration; +import com.metamatrix.common.log.LogConfigurationImpl; import com.metamatrix.common.log.LogManager; -import com.metamatrix.common.log.config.BasicLogConfiguration; -import com.metamatrix.common.log.config.LogConfigurationException; import com.metamatrix.common.messaging.MessageBus; import com.metamatrix.common.messaging.MessagingException; import com.metamatrix.common.util.LogContextsUtil; @@ -58,8 +58,9 @@ @Override public LogConfiguration get() { - try { - final LogConfiguration orig = (LogConfiguration)CurrentConfiguration.getInstance().getConfiguration().getLogConfiguration().clone(); + //final LogConfiguration orig = CurrentConfiguration.getInstance().getConfiguration().getLogConfiguration(); + Map<String, Integer> contextMap = new HashMap<String, Integer>(); + final LogConfiguration orig = new LogConfigurationImpl(contextMap); try { this.messsgeBus.addListener(ConfigurationChangeEvent.class, new EventObjectListener() { @@ -70,10 +71,13 @@ int level = Integer.parseInt(currentConfig.getProperty(LOG_LEVEL_PROPERTY_NAME)); String[] contexts = getContext(); - BasicLogConfiguration newConfig = new BasicLogConfiguration(Arrays.asList(contexts), level); - if (!newConfig.equals(LogManager.getLogConfigurationCopy())) { - LogManager.setLogConfiguration(newConfig); - } + Map<String, Integer> contextMap = new HashMap<String, Integer>(); + for(String context:contexts) { + contextMap.put(context, level); + } + + LogConfigurationImpl newConfig = new LogConfigurationImpl(contextMap); + LogManager.setLogConfiguration(newConfig); } catch( ConfigurationException ce ) { LogManager.logError(LogContextsUtil.CommonConstants.CTX_MESSAGE_BUS, ce, ce.getMessage()); } @@ -103,14 +107,5 @@ throw new MetaMatrixRuntimeException(e); } return orig; - - } catch ( ConfigurationException e ) { - try { - return BasicLogConfiguration.createLogConfiguration(System.getProperties()); - } catch ( LogConfigurationException e1) { - throw new MetaMatrixRuntimeException(e1); - } - } - } } Modified: trunk/server/src/main/java/com/metamatrix/server/admin/api/ServerAdminLogConstants.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/server/admin/api/ServerAdminLogConstants.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/server/src/main/java/com/metamatrix/server/admin/api/ServerAdminLogConstants.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -22,9 +22,8 @@ package com.metamatrix.server.admin.api; -import com.metamatrix.platform.admin.api.PlatformAdminLogConstants; -public interface ServerAdminLogConstants extends PlatformAdminLogConstants { +public interface ServerAdminLogConstants { //********************************************************************** //PLEASE NOTE:!!!!!!!!!!!!!!!!! Modified: trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformTransactionService.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformTransactionService.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformTransactionService.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -64,12 +64,7 @@ throw new ApplicationInitializationException(e); } - String hostLogDir = host.getLogDirectory(); - String txnLogDir = env.getProperty(TransactionService.TXN_MGR_LOG_DIR, TransactionService.DEFAULT_TXN_MGR_LOG_DIR); - String logDir = FileUtils.buildDirectoryPath(new String[] {hostLogDir, txnLogDir}); - props.putAll(env); - props.setProperty(TransactionService.TXN_MGR_LOG_DIR, logDir); props.setProperty(TransactionService.HOSTNAME, host.getFullName()); props.setProperty(TransactionService.VMNAME, CurrentConfiguration.getInstance().getProcessName()); props.setProperty(TransactionService.TXN_STORE_DIR, host.getDataDirectory()); Modified: trunk/server/src/main/java/com/metamatrix/server/util/LogConstants.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/server/util/LogConstants.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/server/src/main/java/com/metamatrix/server/util/LogConstants.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -22,7 +22,7 @@ package com.metamatrix.server.util; -public interface LogConstants extends com.metamatrix.query.util.LogConstants { +public interface LogConstants { //********************************************************************** //PLEASE NOTE:!!!!!!!!!!!!!!!!! Modified: trunk/txn-jbossts/src/main/java/com/metamatrix/xa/arjuna/ArjunaTransactionProvider.java =================================================================== --- trunk/txn-jbossts/src/main/java/com/metamatrix/xa/arjuna/ArjunaTransactionProvider.java 2009-06-18 16:08:34 UTC (rev 1067) +++ trunk/txn-jbossts/src/main/java/com/metamatrix/xa/arjuna/ArjunaTransactionProvider.java 2009-06-19 14:17:27 UTC (rev 1068) @@ -23,7 +23,6 @@ package com.metamatrix.xa.arjuna; import java.io.File; -import java.io.IOException; import java.util.Properties; import javax.resource.spi.XATerminator; @@ -31,12 +30,6 @@ import javax.transaction.TransactionManager; import javax.transaction.xa.XAException; -import org.apache.log4j.AppenderSkeleton; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; -import org.apache.log4j.PatternLayout; -import org.apache.log4j.RollingFileAppender; -import org.apache.log4j.spi.LoggingEvent; import org.teiid.dqp.internal.transaction.TransactionProvider; import com.arjuna.ats.arjuna.common.Configuration; @@ -52,11 +45,8 @@ import com.arjuna.ats.internal.jta.transaction.arjunacore.jca.XATerminatorImple; import com.arjuna.ats.jta.common.Environment; import com.arjuna.ats.jta.common.jtaPropertyManager; -import com.metamatrix.common.log.LogManager; -import com.metamatrix.common.util.LogCommonConstants; import com.metamatrix.common.xa.MMXid; import com.metamatrix.common.xa.XATransactionException; -import com.metamatrix.core.log.MessageLevel; import com.metamatrix.dqp.service.TransactionService; public class ArjunaTransactionProvider implements TransactionProvider {