[teiid-commits] teiid SVN: r2196 - in trunk/console/src/main/java/org/teiid/rhq: plugin and 3 other directories.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Tue Jun 8 12:32:11 EDT 2010
Author: tejones
Date: 2010-06-08 12:32:10 -0400 (Tue, 08 Jun 2010)
New Revision: 2196
Modified:
trunk/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java
trunk/console/src/main/java/org/teiid/rhq/plugin/Facet.java
trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformComponent.java
trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformDiscoveryComponent.java
trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorComponent.java
trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorDiscoveryComponent.java
trunk/console/src/main/java/org/teiid/rhq/plugin/VDBComponent.java
trunk/console/src/main/java/org/teiid/rhq/plugin/VDBDiscoveryComponent.java
trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/AbstractPropertySimpleAdapter.java
trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/MeasurementAdapterFactory.java
trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/PropertyAdapterFactory.java
trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/impl/AbstractPropertyMapToCompositeValueAdapter.java
trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/impl/PropertyListToCollectionValueAdapter.java
trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/impl/PropertyMapToGenericValueAdapter.java
trunk/console/src/main/java/org/teiid/rhq/plugin/util/DeploymentUtils.java
trunk/console/src/main/java/org/teiid/rhq/plugin/util/PluginConstants.java
trunk/console/src/main/java/org/teiid/rhq/plugin/util/ProfileServiceUtil.java
Log:
TEIID-1073: Changed logger to use "org.rhq" category
Modified: trunk/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -36,7 +36,7 @@
public class DQPManagementView implements PluginConstants {
private static ManagedComponent mc = null;
- private static final Log LOG = LogFactory.getLog(DQPManagementView.class);
+ private static final Log LOG = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
private static final MetaValueFactory metaValueFactory = MetaValueFactory
.getInstance();
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/Facet.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/Facet.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/Facet.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -86,7 +86,7 @@
OperationFacet, ConfigurationFacet, ContentFacet, DeleteResourceFacet,
CreateChildResourceFacet {
- protected final Log LOG = LogFactory.getLog(Facet.class);
+ protected final Log LOG = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
/**
* Represents the resource configuration of the custom product being
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformComponent.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformComponent.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformComponent.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -53,7 +53,7 @@
*
*/
public class PlatformComponent extends Facet {
- private final Log LOG = LogFactory.getLog(PlatformComponent.class);
+ private final Log LOG = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
String[] PLATFORM_SERVICES_NAMES = { "org.teiid.jboss.deployers.RuntimeEngineDeployer",
"org.teiid.services.BufferServiceImpl", "org.teiid.services.SessionServiceImpl", "org.teiid.transport.SocketConfiguration" };
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformDiscoveryComponent.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformDiscoveryComponent.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformDiscoveryComponent.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -42,7 +42,7 @@
*/
public class PlatformDiscoveryComponent implements ResourceDiscoveryComponent {
- private final Log log = LogFactory.getLog(this.getClass());
+ private final Log log = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
/**
* Review the javadoc for both {@link ResourceDiscoveryComponent} and
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorComponent.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorComponent.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorComponent.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -51,7 +51,7 @@
*
*/
public class TranslatorComponent extends Facet {
- private final Log LOG = LogFactory.getLog(TranslatorComponent.class);
+ private final Log LOG = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
public static interface Config {
String COMPONENT_TYPE = "componentType";
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorDiscoveryComponent.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorDiscoveryComponent.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorDiscoveryComponent.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -50,7 +50,7 @@
*/
public class TranslatorDiscoveryComponent implements ResourceDiscoveryComponent {
- private final Log log = LogFactory.getLog(this.getClass());
+ private final Log log = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
public Set<DiscoveredResourceDetails> discoverResources(
ResourceDiscoveryContext discoveryContext)
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/VDBComponent.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/VDBComponent.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/VDBComponent.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -78,7 +78,7 @@
*
*/
public class VDBComponent extends Facet {
- private final Log LOG = LogFactory.getLog(VDBComponent.class);
+ private final Log LOG = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
/*
* (non-Javadoc)
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/VDBDiscoveryComponent.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/VDBDiscoveryComponent.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/VDBDiscoveryComponent.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -43,7 +43,7 @@
*/
public class VDBDiscoveryComponent implements ResourceDiscoveryComponent {
- private final Log log = LogFactory.getLog(this.getClass());
+ private final Log log = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
public Set<DiscoveredResourceDetails> discoverResources(
ResourceDiscoveryContext discoveryContext)
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/AbstractPropertySimpleAdapter.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/AbstractPropertySimpleAdapter.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/AbstractPropertySimpleAdapter.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -25,6 +25,7 @@
import org.apache.commons.logging.LogFactory;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple;
+import org.teiid.rhq.plugin.util.PluginConstants;
import org.jboss.metatype.api.values.MetaValue;
@@ -34,7 +35,7 @@
*/
public abstract class AbstractPropertySimpleAdapter implements PropertyAdapter<PropertySimple, PropertyDefinitionSimple>
{
- private final Log log = LogFactory.getLog(this.getClass());
+ private final Log log = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
public PropertySimple convertToProperty(MetaValue metaValue, PropertyDefinitionSimple propDefSimple)
{
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/MeasurementAdapterFactory.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/MeasurementAdapterFactory.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/MeasurementAdapterFactory.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -27,11 +27,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.metatype.api.types.MetaType;
+import org.teiid.rhq.plugin.util.PluginConstants;
public class MeasurementAdapterFactory
{
- private static final Log LOG = LogFactory.getLog(MeasurementAdapterFactory.class);
+ private static final Log LOG = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
private static Map<String, String> customAdapters = new HashMap<String, String>();
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/PropertyAdapterFactory.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/PropertyAdapterFactory.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/PropertyAdapterFactory.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -37,6 +37,7 @@
import org.teiid.rhq.plugin.adapter.impl.PropertyMapToTableValueAdapter;
import org.teiid.rhq.plugin.adapter.impl.PropertySimpleToEnumValueAdapter;
import org.teiid.rhq.plugin.adapter.impl.PropertySimpleToSimpleValueAdapter;
+import org.teiid.rhq.plugin.util.PluginConstants;
import com.sun.istack.Nullable;
@@ -45,7 +46,7 @@
*/
public class PropertyAdapterFactory
{
- private static final Log LOG = LogFactory.getLog(PropertyAdapterFactory.class);
+ private static final Log LOG = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
public static PropertyAdapter getPropertyAdapter(MetaValue metaValue)
{
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/impl/AbstractPropertyMapToCompositeValueAdapter.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/impl/AbstractPropertyMapToCompositeValueAdapter.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/impl/AbstractPropertyMapToCompositeValueAdapter.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -33,6 +33,7 @@
import org.teiid.rhq.plugin.adapter.api.AbstractPropertyMapAdapter;
import org.teiid.rhq.plugin.adapter.api.PropertyAdapter;
import org.teiid.rhq.plugin.adapter.api.PropertyAdapterFactory;
+import org.teiid.rhq.plugin.util.PluginConstants;
import org.jboss.metatype.api.types.MetaType;
import org.jboss.metatype.api.types.SimpleMetaType;
@@ -47,7 +48,7 @@
public abstract class AbstractPropertyMapToCompositeValueAdapter extends AbstractPropertyMapAdapter
implements PropertyAdapter<PropertyMap, PropertyDefinitionMap>
{
- private final Log log = LogFactory.getLog(this.getClass());
+ private final Log log = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
public void populateMetaValueFromProperty(PropertyMap propMap, MetaValue metaValue, PropertyDefinitionMap propDefMap)
{
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/impl/PropertyListToCollectionValueAdapter.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/impl/PropertyListToCollectionValueAdapter.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/impl/PropertyListToCollectionValueAdapter.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -37,13 +37,14 @@
import org.teiid.rhq.plugin.adapter.api.AbstractPropertyListAdapter;
import org.teiid.rhq.plugin.adapter.api.PropertyAdapter;
import org.teiid.rhq.plugin.adapter.api.PropertyAdapterFactory;
+import org.teiid.rhq.plugin.util.PluginConstants;
/**
*
*/
public class PropertyListToCollectionValueAdapter extends AbstractPropertyListAdapter implements PropertyAdapter<PropertyList, PropertyDefinitionList>
{
- private static final Log LOG = LogFactory.getLog(PropertyListToCollectionValueAdapter.class);
+ private static final Log LOG = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
public void populateMetaValueFromProperty(PropertyList property, MetaValue metaValue, PropertyDefinitionList propertyDefinition)
{
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/impl/PropertyMapToGenericValueAdapter.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/impl/PropertyMapToGenericValueAdapter.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/impl/PropertyMapToGenericValueAdapter.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -42,6 +42,7 @@
import org.teiid.rhq.plugin.adapter.api.AbstractPropertyMapAdapter;
import org.teiid.rhq.plugin.adapter.api.PropertyAdapter;
import org.teiid.rhq.plugin.adapter.api.PropertyAdapterFactory;
+import org.teiid.rhq.plugin.util.PluginConstants;
import org.teiid.rhq.plugin.util.ProfileServiceUtil;
/**
@@ -52,7 +53,7 @@
public class PropertyMapToGenericValueAdapter extends AbstractPropertyMapAdapter
implements PropertyAdapter<PropertyMap, PropertyDefinitionMap>
{
- private final Log log = LogFactory.getLog(this.getClass());
+ private final Log log = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
public void populateMetaValueFromProperty(PropertyMap propMap, MetaValue metaValue, PropertyDefinitionMap propDefMap)
{
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/util/DeploymentUtils.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/util/DeploymentUtils.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/util/DeploymentUtils.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -39,7 +39,7 @@
*
*/
public class DeploymentUtils {
- private static final Log LOG = LogFactory.getLog(DeploymentUtils.class);
+ private static final Log LOG = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
public static boolean hasCorrectExtension(String archiveFileName, ResourceType resourceType) {
String expectedExtension = "vdb";
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/util/PluginConstants.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/util/PluginConstants.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/util/PluginConstants.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -41,13 +41,13 @@
* These are global properties used by all components
*/
public final static String PROFILE_SERVICE = "ProfileService"; //$NON-NLS-1$
-
+
/**
- * These properties are exposed via the #getProperty method call.
+ * Log4j log category to use
*/
- public static String SYSTEM_NAME = "cluster.name"; //$NON-NLS-1$
- public static String SYSTEM_NAME_IDENTIFIER = "JGroups"; //$NON-NLS-1$
-
+ public final static String DEFAULT_LOGGER_CATEGORY = "org.rhq"; //$NON-NLS-1$
+
+
/**
* Use these component type names when calling Connection related methods
* that require the type.
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/util/ProfileServiceUtil.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/util/ProfileServiceUtil.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/util/ProfileServiceUtil.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -79,7 +79,7 @@
public class ProfileServiceUtil {
protected final static Log LOG = LogFactory
- .getLog(ProfileServiceUtil.class);
+ .getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
private static ComponentType DQPTYPE = new ComponentType("teiid", "dqp");
private static String DQPNAME = "org.teiid.jboss.deployers.RuntimeEngineDeployer";
private static final Map<String, ComponentType> COMPONENT_TYPE_CACHE = new HashMap<String, ComponentType>();
More information about the teiid-commits
mailing list