[teiid-commits] teiid SVN: r2705 - in branches/7.1.x: cache-jbosscache and 9 other directories.

Author: rareddy Date: 2010-11-04 18:07:24 -0400 (Thu, 04 Nov 2010) New Revision: 2705 Modified: branches/7.1.x/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml branches/7.1.x/cache-jbosscache/pom.xml branches/7.1.x/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/Facet.java branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/PlatformComponent.java branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/util/ProfileServiceUtil.java branches/7.1.x/console/src/main/resources/META-INF/rhq-plugin.xml branches/7.1.x/engine/src/main/java/org/teiid/cache/CacheConfiguration.java branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPConfiguration.java branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java branches/7.1.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java branches/7.1.x/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties branches/7.1.x/runtime/src/main/java/org/teiid/transport/SocketConfiguration.java Log: TEIID-1342, TEIID-1347: The NPE was due to the mismatched responsibilities of the MO. Cache settings are different MO, but was being set on DQPConfiguration. Concerns are separated. There were variety of issues with JOPR tool. The DQP configuration treating all the properties from different MO with no name space, thus some were colliding. Also, there were few unused properties. Added few new properties too. Modified: branches/7.1.x/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml =================================================================== --- branches/7.1.x/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml 2010-11-04 16:42:13 UTC (rev 2704) +++ branches/7.1.x/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml 2010-11-04 22:07:24 UTC (rev 2705) @@ -57,6 +57,7 @@ be replicated. --> <bean name="ResultsetCacheConfig" class="org.teiid.cache.CacheConfiguration"> + <property name="name">ResultSetCacheConfig</property> <property name="enabled">true</property> <!-- Max Entries allowed for ResultSet Cache (default 1024) --> <property name="maxEntries">1024</property> @@ -99,7 +100,7 @@ Note: this is a memory based cache. (default 512) --> <property name="preparedPlanCacheMaxCount">512</property> <!-- Turn on role checking of resources based on the roles defined in VDB (default true) --> - <property name="useDataRoles" class="java.lang.Boolean">true</property> + <property name="useDataRoles">true</property> <!-- Long running query threshold, after which a alert can be generated by tooling if configured--> <property name="queryThresholdInSecs">600</property> <!-- Maximum rows allowed from a source query. -1 indicates no limit. (default -1)--> @@ -110,6 +111,7 @@ <!-- JDBC Socket connection properties (SSL see below) --> <bean name="JdbcSocketConfiguration" class="org.teiid.transport.SocketConfiguration"> + <property name="name">JdbcSocketConfiguration</property> <property name="enabled">true</property> <property name="bindAddress">${jboss.bind.address}</property> <property name="portNumber">31000</property> @@ -144,6 +146,7 @@ <!-- Admin Socket connection settings (SSL see below) --> <bean name="AdminSocketConfiguration" class="org.teiid.transport.SocketConfiguration"> + <property name="name">AdminSocketConfiguration</property> <property name="enabled">true</property> <property name="bindAddress">${jboss.bind.address}</property> <property name="portNumber">31443</property> @@ -178,6 +181,7 @@ <!-- JDBC Socket connection properties (SSL see below) --> <bean name="OdbcSocketConfiguration" class="org.teiid.transport.SocketConfiguration"> + <property name="name">OdbcSocketConfiguration</property> <property name="enabled">true</property> <property name="bindAddress">${jboss.bind.address}</property> <property name="portNumber">35432</property> Modified: branches/7.1.x/cache-jbosscache/pom.xml =================================================================== --- branches/7.1.x/cache-jbosscache/pom.xml 2010-11-04 16:42:13 UTC (rev 2704) +++ branches/7.1.x/cache-jbosscache/pom.xml 2010-11-04 22:07:24 UTC (rev 2705) @@ -25,5 +25,10 @@ <artifactId>jbosscache-core</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.jboss.man</groupId> + <artifactId>jboss-managed</artifactId> + <scope>provided</scope> + </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/7.1.x/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java =================================================================== --- branches/7.1.x/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java 2010-11-04 16:42:13 UTC (rev 2704) +++ branches/7.1.x/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java 2010-11-04 22:07:24 UTC (rev 2705) @@ -64,10 +64,8 @@ public class DQPManagementView implements PluginConstants { private static ManagedComponent mc = null; - private static final Log LOG = LogFactory - .getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY); - private static final MetaValueFactory metaValueFactory = MetaValueFactory - .getInstance(); + private static final Log LOG = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY); + private static final MetaValueFactory metaValueFactory = MetaValueFactory.getInstance(); private static final String VDB_EXT = ".vdb"; //$NON-NLS-1$ @@ -83,13 +81,10 @@ Object resultObject = new Object(); if (componentType.equals(PluginConstants.ComponentType.Platform.NAME)) { - resultObject = getPlatformMetric(connection, componentType, metric, - valueMap); + resultObject = getPlatformMetric(connection, componentType, metric, valueMap); } else if (componentType.equals(PluginConstants.ComponentType.VDB.NAME)) { - resultObject = getVdbMetric(connection, componentType, identifier, - metric, valueMap); + resultObject = getVdbMetric(connection, componentType, identifier,metric, valueMap); } - return resultObject; } @@ -98,44 +93,33 @@ Object resultObject = new Object(); - if (metric - .equals(PluginConstants.ComponentType.Platform.Metrics.QUERY_COUNT)) { + if (metric.equals(PluginConstants.ComponentType.Platform.Metrics.QUERY_COUNT)) { resultObject = new Double(getQueryCount(connection).doubleValue()); - } else if (metric - .equals(PluginConstants.ComponentType.Platform.Metrics.SESSION_COUNT)) { + } else if (metric.equals(PluginConstants.ComponentType.Platform.Metrics.SESSION_COUNT)) { resultObject = new Double(getSessionCount(connection).doubleValue()); - } else if (metric - .equals(PluginConstants.ComponentType.Platform.Metrics.LONG_RUNNING_QUERIES)) { + } else if (metric.equals(PluginConstants.ComponentType.Platform.Metrics.LONG_RUNNING_QUERIES)) { Collection<Request> longRunningQueries = new ArrayList<Request>(); - getRequestCollectionValue(getLongRunningQueries(connection), - longRunningQueries); + getRequestCollectionValue(getLongRunningQueries(connection), longRunningQueries); resultObject = new Double(longRunningQueries.size()); - } else if (metric - .equals(PluginConstants.ComponentType.Platform.Metrics.BUFFER_USAGE)) { + } else if (metric.equals(PluginConstants.ComponentType.Platform.Metrics.BUFFER_USAGE)) { try { - resultObject = ProfileServiceUtil - .doubleValue(getUsedBufferSpace(connection)); + resultObject = ProfileServiceUtil.doubleValue(getUsedBufferSpace(connection)); } catch (Exception e) { final String msg = "Exception executing operation: " + Platform.Operations.GET_BUFFER_USAGE; //$NON-NLS-1$ LOG.error(msg, e); } - } else if (metric.startsWith(Admin.Cache.PREPARED_PLAN_CACHE.toString() - + ".") //$NON-NLS-1$ - || metric.startsWith(Admin.Cache.QUERY_SERVICE_RESULT_SET_CACHE - .toString() - + ".")) { //$NON-NLS-1$ + } else if (metric.startsWith(Admin.Cache.PREPARED_PLAN_CACHE.toString() + ".") //$NON-NLS-1$ + || metric.startsWith(Admin.Cache.QUERY_SERVICE_RESULT_SET_CACHE .toString()+ ".")) { //$NON-NLS-1$ return getCacheProperty(connection, metric); } return resultObject; } - private Object getCacheProperty(ProfileServiceConnection connection, - String metric) { + private Object getCacheProperty(ProfileServiceConnection connection,String metric) { int dotIndex = metric.indexOf('.'); String cacheType = metric.substring(0, dotIndex); String property = metric.substring(dotIndex + 1); - CompositeValueSupport mv = (CompositeValueSupport) getCacheStats( - connection, cacheType); + CompositeValueSupport mv = (CompositeValueSupport) getCacheStats(connection, cacheType); MetaValue v = mv.get(property); return ((SimpleValue) v).getValue(); } @@ -146,27 +130,19 @@ Object resultObject = new Object(); - if (metric - .equals(PluginConstants.ComponentType.VDB.Metrics.ERROR_COUNT)) { + if (metric.equals(PluginConstants.ComponentType.VDB.Metrics.ERROR_COUNT)) { // TODO remove version parameter after AdminAPI is changed - resultObject = getErrorCount(connection, (String) valueMap - .get(VDB.NAME)); - } else if (metric - .equals(PluginConstants.ComponentType.VDB.Metrics.STATUS)) { + resultObject = getErrorCount(connection, (String) valueMap.get(VDB.NAME)); + } else if (metric.equals(PluginConstants.ComponentType.VDB.Metrics.STATUS)) { // TODO remove version parameter after AdminAPI is changed - resultObject = getVDBStatus(connection, (String) valueMap - .get(VDB.NAME)); - } else if (metric - .equals(PluginConstants.ComponentType.VDB.Metrics.QUERY_COUNT)) { + resultObject = getVDBStatus(connection, (String) valueMap.get(VDB.NAME)); + } else if (metric.equals(PluginConstants.ComponentType.VDB.Metrics.QUERY_COUNT)) { resultObject = new Double(getQueryCount(connection).doubleValue()); - } else if (metric - .equals(PluginConstants.ComponentType.VDB.Metrics.SESSION_COUNT)) { + } else if (metric.equals(PluginConstants.ComponentType.VDB.Metrics.SESSION_COUNT)) { resultObject = new Double(getSessionCount(connection).doubleValue()); - } else if (metric - .equals(PluginConstants.ComponentType.VDB.Metrics.LONG_RUNNING_QUERIES)) { + } else if (metric.equals(PluginConstants.ComponentType.VDB.Metrics.LONG_RUNNING_QUERIES)) { Collection<Request> longRunningQueries = new ArrayList<Request>(); - getRequestCollectionValue(getLongRunningQueries(connection), - longRunningQueries); + getRequestCollectionValue(getLongRunningQueries(connection), longRunningQueries); resultObject = new Double(longRunningQueries.size()); } return resultObject; @@ -179,14 +155,10 @@ public void executeOperation(ProfileServiceConnection connection, ExecutedResult operationResult, final Map<String, Object> valueMap) { - if (operationResult.getComponentType().equals( - PluginConstants.ComponentType.Platform.NAME)) { - executePlatformOperation(connection, operationResult, - operationResult.getOperationName(), valueMap); - } else if (operationResult.getComponentType().equals( - PluginConstants.ComponentType.VDB.NAME)) { - executeVdbOperation(connection, operationResult, operationResult - .getOperationName(), valueMap); + if (operationResult.getComponentType().equals(PluginConstants.ComponentType.Platform.NAME)) { + executePlatformOperation(connection, operationResult, operationResult.getOperationName(), valueMap); + } else if (operationResult.getComponentType().equals( PluginConstants.ComponentType.VDB.NAME)) { + executeVdbOperation(connection, operationResult, operationResult .getOperationName(), valueMap); } } @@ -199,50 +171,37 @@ if (operationName.equals(Platform.Operations.GET_LONGRUNNINGQUERIES)) { List<String> fieldNameList = operationResult.getFieldNameList(); - getRequestCollectionValue(getLongRunningQueries(connection), - resultObject); - operationResult.setContent(createReportResultList(fieldNameList, - resultObject.iterator())); + getRequestCollectionValue(getLongRunningQueries(connection), resultObject); + operationResult.setContent(createReportResultList(fieldNameList, resultObject.iterator())); } else if (operationName.equals(Platform.Operations.GET_SESSIONS)) { List<String> fieldNameList = operationResult.getFieldNameList(); MetaValue sessionMetaValue = getSessions(connection); - getSessionCollectionValue(sessionMetaValue, - activeSessionsCollection); - operationResult.setContent(createReportResultList(fieldNameList, - activeSessionsCollection.iterator())); + getSessionCollectionValue(sessionMetaValue,activeSessionsCollection); + operationResult.setContent(createReportResultList(fieldNameList, activeSessionsCollection.iterator())); } else if (operationName.equals(Platform.Operations.GET_REQUESTS)) { List<String> fieldNameList = operationResult.getFieldNameList(); MetaValue requestMetaValue = getRequests(connection); getRequestCollectionValue(requestMetaValue, resultObject); - operationResult.setContent(createReportResultList(fieldNameList, - resultObject.iterator())); + operationResult.setContent(createReportResultList(fieldNameList, resultObject.iterator())); } else if (operationName.equals(Platform.Operations.GET_TRANSACTIONS)) { List<String> fieldNameList = operationResult.getFieldNameList(); MetaValue transactionMetaValue = getTransactions(connection); - getTransactionCollectionValue(transactionMetaValue, - transactionsCollection); - operationResult.setContent(createReportResultList(fieldNameList, - resultObject.iterator())); + getTransactionCollectionValue(transactionMetaValue,transactionsCollection); + operationResult.setContent(createReportResultList(fieldNameList, resultObject.iterator())); } else if (operationName.equals(Platform.Operations.KILL_TRANSACTION)) { - Long sessionID = (Long) valueMap - .get(Operation.Value.TRANSACTION_ID); - MetaValue[] args = new MetaValue[] { metaValueFactory - .create(sessionID) }; + Long sessionID = (Long) valueMap.get(Operation.Value.TRANSACTION_ID); + MetaValue[] args = new MetaValue[] { metaValueFactory .create(sessionID) }; try { - executeManagedOperation(connection, getRuntimeEngineDeployer( - connection, mc), Platform.Operations.KILL_TRANSACTION, - args); + executeManagedOperation(connection, getRuntimeEngineDeployer(connection, mc), Platform.Operations.KILL_TRANSACTION, args); } catch (Exception e) { final String msg = "Exception executing operation: " + Platform.Operations.KILL_TRANSACTION; //$NON-NLS-1$ LOG.error(msg, e); } } else if (operationName.equals(Platform.Operations.KILL_SESSION)) { Long sessionID = (Long) valueMap.get(Operation.Value.SESSION_ID); - MetaValue[] args = new MetaValue[] { metaValueFactory - .create(sessionID) }; + MetaValue[] args = new MetaValue[] { metaValueFactory .create(sessionID) }; try { - executeManagedOperation(connection, getRuntimeEngineDeployer( - connection, mc), Platform.Operations.KILL_SESSION, args); + executeManagedOperation(connection, getRuntimeEngineDeployer(connection, mc), Platform.Operations.KILL_SESSION, args); } catch (Exception e) { final String msg = "Exception executing operation: " + Platform.Operations.KILL_SESSION; //$NON-NLS-1$ LOG.error(msg, e); @@ -254,25 +213,21 @@ metaValueFactory.create(requestID), metaValueFactory.create(sessionID) }; try { - executeManagedOperation(connection, getRuntimeEngineDeployer( - connection, mc), Platform.Operations.KILL_REQUEST, args); + executeManagedOperation(connection, getRuntimeEngineDeployer(connection, mc), Platform.Operations.KILL_REQUEST, args); } catch (Exception e) { final String msg = "Exception executing operation: " + Platform.Operations.KILL_REQUEST; //$NON-NLS-1$ LOG.error(msg, e); } } else if (operationName.equals(Platform.Operations.DEPLOY_VDB_BY_URL)) { String vdbUrl = (String) valueMap.get(Operation.Value.VDB_URL); - String deployName = (String) valueMap - .get(Operation.Value.VDB_DEPLOY_NAME); + String deployName = (String) valueMap.get(Operation.Value.VDB_DEPLOY_NAME); Object vdbVersion = valueMap.get(Operation.Value.VDB_VERSION); // strip off vdb extension if user added it if (deployName.endsWith(VDB_EXT)) { - deployName = deployName.substring(0, deployName - .lastIndexOf(VDB_EXT)); + deployName = deployName.substring(0, deployName.lastIndexOf(VDB_EXT)); } if (vdbVersion != null) { - deployName = deployName - + "." + ((Integer) vdbVersion).toString() + VDB_EXT; //$NON-NLS-1$ + deployName = deployName + "." + ((Integer) vdbVersion).toString() + VDB_EXT; //$NON-NLS-1$ } // add vdb extension if there was no version if (!deployName.endsWith(VDB_EXT)) { @@ -281,8 +236,7 @@ try { URL url = new URL(vdbUrl); - DeploymentUtils.deployArchive(deployName, connection - .getDeploymentManager(), url, false); + DeploymentUtils.deployArchive(deployName, connection.getDeploymentManager(), url, false); } catch (Exception e) { final String msg = "Exception executing operation: " + Platform.Operations.DEPLOY_VDB_BY_URL; //$NON-NLS-1$ LOG.error(msg, e); @@ -297,41 +251,30 @@ Collection<ArrayList<String>> sqlResultsObject = new ArrayList<ArrayList<String>>(); Collection<Request> resultObject = new ArrayList<Request>(); Collection<Session> activeSessionsCollection = new ArrayList<Session>(); - String vdbName = (String) valueMap - .get(PluginConstants.ComponentType.VDB.NAME); - String vdbVersion = (String) valueMap - .get(PluginConstants.ComponentType.VDB.VERSION); + String vdbName = (String) valueMap.get(PluginConstants.ComponentType.VDB.NAME); + String vdbVersion = (String) valueMap.get(PluginConstants.ComponentType.VDB.VERSION); if (operationName.equals(VDB.Operations.GET_PROPERTIES)) { List<String> fieldNameList = operationResult.getFieldNameList(); getProperties(connection, PluginConstants.ComponentType.VDB.NAME); - operationResult.setContent(createReportResultList(fieldNameList, - resultObject.iterator())); + operationResult.setContent(createReportResultList(fieldNameList, resultObject.iterator())); } else if (operationName.equals(VDB.Operations.GET_SESSIONS)) { List<String> fieldNameList = operationResult.getFieldNameList(); MetaValue sessionMetaValue = getSessions(connection); - getSessionCollectionValueForVDB(sessionMetaValue, - activeSessionsCollection, vdbName); - operationResult.setContent(createReportResultList(fieldNameList, - activeSessionsCollection.iterator())); + getSessionCollectionValueForVDB(sessionMetaValue, activeSessionsCollection, vdbName); + operationResult.setContent(createReportResultList(fieldNameList, activeSessionsCollection.iterator())); } else if (operationName.equals(VDB.Operations.GET_REQUESTS)) { List<String> fieldNameList = operationResult.getFieldNameList(); - MetaValue requestMetaValue = getRequestsForVDB(connection, vdbName, - Integer.parseInt(vdbVersion)); + MetaValue requestMetaValue = getRequestsForVDB(connection, vdbName, Integer.parseInt(vdbVersion)); getRequestCollectionValue(requestMetaValue, resultObject); - operationResult.setContent(createReportResultList(fieldNameList, - resultObject.iterator())); + operationResult.setContent(createReportResultList(fieldNameList, resultObject.iterator())); } else if (operationName.equals(VDB.Operations.GET_MATVIEWS)) { List<String> fieldNameList = operationResult.getFieldNameList(); - MetaValue resultsMetaValue = executeMaterializedViewQuery( - connection, formatVdbName(vdbName), Integer - .parseInt(vdbVersion)); + MetaValue resultsMetaValue = executeMaterializedViewQuery( connection, formatVdbName(vdbName), Integer.parseInt(vdbVersion)); getResultsCollectionValue(resultsMetaValue, sqlResultsObject); - operationResult.setContent(createReportResultListForMatViewQuery( - fieldNameList, sqlResultsObject.iterator())); + operationResult.setContent(createReportResultListForMatViewQuery(fieldNameList, sqlResultsObject.iterator())); } else if (operationName.equals(VDB.Operations.RELOAD_MATVIEW)) { - MetaValue resultsMetaValue = reloadMaterializedView(connection, - formatVdbName(vdbName), Integer.parseInt(vdbVersion), + MetaValue resultsMetaValue = reloadMaterializedView(connection, formatVdbName(vdbName), Integer.parseInt(vdbVersion), (String) valueMap.get(Operation.Value.MATVIEW_SCHEMA), (String) valueMap.get(Operation.Value.MATVIEW_TABLE), (Boolean) valueMap.get(Operation.Value.INVALIDATE_MATVIEW)); @@ -353,15 +296,13 @@ return vdbName.substring(0, vdbName.indexOf(".")); //$NON-NLS-1$ } - public MetaValue getProperties(ProfileServiceConnection connection, - final String component) { + public MetaValue getProperties(ProfileServiceConnection connection, final String component) { MetaValue propertyValue = null; MetaValue args = null; try { - propertyValue = executeManagedOperation(connection, - getRuntimeEngineDeployer(connection, mc), + propertyValue = executeManagedOperation(connection, getRuntimeEngineDeployer(connection, mc), PluginConstants.Operation.GET_PROPERTIES, args); } catch (Exception e) { final String msg = "Exception executing operation: " + Platform.Operations.GET_PROPERTIES; //$NON-NLS-1$ @@ -378,10 +319,7 @@ MetaValue args = null; try { - requestsCollection = executeManagedOperation(connection, - getRuntimeEngineDeployer(connection, mc), - - PluginConstants.Operation.GET_REQUESTS, args); + requestsCollection = executeManagedOperation(connection, getRuntimeEngineDeployer(connection, mc), PluginConstants.Operation.GET_REQUESTS, args); } catch (Exception e) { final String msg = "Exception executing operation: " + Platform.Operations.GET_REQUESTS; //$NON-NLS-1$ LOG.error(msg, e); @@ -398,15 +336,11 @@ MetaValue[] args = new MetaValue[] { MetaValueFactory.getInstance().create(vdbName), MetaValueFactory.getInstance().create(vdbVersion), - MetaValueFactory.getInstance().create( - Operation.Value.MAT_VIEW_QUERY), - MetaValueFactory.getInstance() - .create(Long.parseLong("9999999")) }; //$NON-NLS-1$ + MetaValueFactory.getInstance().create(Operation.Value.MAT_VIEW_QUERY), + MetaValueFactory.getInstance().create(Long.parseLong("9999999")) }; //$NON-NLS-1$ try { - resultsCollection = executeManagedOperation(connection, - getRuntimeEngineDeployer(connection, mc), - VDB.Operations.EXECUTE_QUERIES, args); + resultsCollection = executeManagedOperation(connection, getRuntimeEngineDeployer(connection, mc), VDB.Operations.EXECUTE_QUERIES, args); } catch (Exception e) { final String msg = "Exception executing operation: " + VDB.Operations.EXECUTE_QUERIES; //$NON-NLS-1$ LOG.error(msg, e); @@ -429,12 +363,10 @@ MetaValueFactory.getInstance().create(vdbName), MetaValueFactory.getInstance().create(vdbVersion), MetaValueFactory.getInstance().create(query), - MetaValueFactory.getInstance() - .create(Long.parseLong("9999999")) }; //$NON-NLS-1$ + MetaValueFactory.getInstance().create(Long.parseLong("9999999")) }; //$NON-NLS-1$ try { - result = executeManagedOperation(connection, - getRuntimeEngineDeployer(connection, mc), + result = executeManagedOperation(connection, getRuntimeEngineDeployer(connection, mc), VDB.Operations.EXECUTE_QUERIES, args); } catch (Exception e) { final String msg = "Exception executing operation: " + VDB.Operations.RELOAD_MATVIEW; //$NON-NLS-1$ @@ -508,12 +440,10 @@ ManagedComponent mcVdb = null; try { - mcVdb = ProfileServiceUtil - .getManagedComponent(connection, + mcVdb = ProfileServiceUtil.getManagedComponent(connection, new org.jboss.managed.api.ComponentType( PluginConstants.ComponentType.VDB.TYPE, - PluginConstants.ComponentType.VDB.SUBTYPE), - vdbName); + PluginConstants.ComponentType.VDB.SUBTYPE), vdbName); } catch (NamingException e) { final String msg = "NamingException in getVDBStatus(): " + e.getExplanation(); //$NON-NLS-1$ LOG.error(msg, e); @@ -539,9 +469,8 @@ try { if (args.length == 1 && args[0] == null) { return mo.invoke(); - } else { - return mo.invoke(args); } + return mo.invoke(args); } catch (Exception e) { final String msg = "Exception getting the AdminApi in " + operation; //$NON-NLS-1$ LOG.error(msg, e); @@ -575,8 +504,7 @@ * @param mc * @return */ - private static ManagedComponent getBufferService( - ProfileServiceConnection connection, ManagedComponent mc) { + private static ManagedComponent getBufferService(ProfileServiceConnection connection, ManagedComponent mc) { try { mc = ProfileServiceUtil.getBufferService(connection); } catch (NamingException e) { @@ -589,9 +517,7 @@ return mc; } - public static MetaValue getManagedProperty( - ProfileServiceConnection connection, ManagedComponent mc, - String property) throws Exception { + public static MetaValue getManagedProperty(ProfileServiceConnection connection, ManagedComponent mc, String property) throws Exception { ManagedProperty managedProperty = null; try { @@ -619,7 +545,7 @@ getRequestCollectionValue(requests, requestsCollection); - if (requestsCollection != null && !requestsCollection.isEmpty()) { + if (!requestsCollection.isEmpty()) { count = requestsCollection.size(); } @@ -639,17 +565,14 @@ * @return count * @throws Exception */ - private int getErrorCount(ProfileServiceConnection connection, - String vdbName) { + private int getErrorCount(ProfileServiceConnection connection,String vdbName) { ManagedComponent mcVdb = null; try { - mcVdb = ProfileServiceUtil - .getManagedComponent(connection, + mcVdb = ProfileServiceUtil.getManagedComponent(connection, new org.jboss.managed.api.ComponentType( PluginConstants.ComponentType.VDB.TYPE, - PluginConstants.ComponentType.VDB.SUBTYPE), - vdbName); + PluginConstants.ComponentType.VDB.SUBTYPE),vdbName); } catch (NamingException e) { final String msg = "NamingException in getVDBStatus(): " + e.getExplanation(); //$NON-NLS-1$ LOG.error(msg, e); @@ -661,14 +584,12 @@ // Get models from VDB int count = 0; ManagedProperty property = mcVdb.getProperty("models"); //$NON-NLS-1$ - CollectionValueSupport valueSupport = (CollectionValueSupport) property - .getValue(); + CollectionValueSupport valueSupport = (CollectionValueSupport) property.getValue(); MetaValue[] metaValues = valueSupport.getElements(); for (MetaValue value : metaValues) { GenericValueSupport genValueSupport = (GenericValueSupport) value; - ManagedObjectImpl managedObject = (ManagedObjectImpl) genValueSupport - .getValue(); + ManagedObjectImpl managedObject = (ManagedObjectImpl) genValueSupport.getValue(); // Get any model errors/warnings MetaValue errors = managedObject.getProperty("errors").getValue(); //$NON-NLS-1$ @@ -684,14 +605,10 @@ protected MetaValue getCacheStats(ProfileServiceConnection connection, String type) { try { - return executeManagedOperation(connection, - getRuntimeEngineDeployer(connection, mc), - Platform.Operations.GET_CACHE_STATS, SimpleValueSupport - .wrap(type)); + return executeManagedOperation(connection,getRuntimeEngineDeployer(connection, mc), + Platform.Operations.GET_CACHE_STATS, SimpleValueSupport.wrap(type)); } catch (Exception e) { - LOG - .error( - "Exception executing operation: " + Platform.Operations.GET_CACHE_STATS, e); //$NON-NLS-1$ + LOG.error("Exception executing operation: " + Platform.Operations.GET_CACHE_STATS, e); //$NON-NLS-1$ } return null; } @@ -729,61 +646,49 @@ return usedBufferSpace; } - private void getRequestCollectionValue(MetaValue pValue, - Collection<Request> list) { + private void getRequestCollectionValue(MetaValue pValue, Collection<Request> list) { MetaType metaType = pValue.getMetaType(); if (metaType.isCollection()) { - for (MetaValue value : ((CollectionValueSupport) pValue) - .getElements()) { + for (MetaValue value : ((CollectionValueSupport) pValue).getElements()) { if (value.getMetaType().isComposite()) { RequestMetadataMapper rmm = new RequestMetadataMapper(); RequestMetadata request = rmm.unwrapMetaValue(value); list.add(request); } else { - throw new IllegalStateException(pValue - + " is not a Composite type"); //$NON-NLS-1$ + throw new IllegalStateException(pValue + " is not a Composite type"); //$NON-NLS-1$ } } } } - private void getResultsCollectionValue(MetaValue pValue, - Collection<ArrayList<String>> list) { + private void getResultsCollectionValue(MetaValue pValue, Collection<ArrayList<String>> list) { MetaType metaType = pValue.getMetaType(); if (metaType.isCollection()) { - for (MetaValue value : ((CollectionValueSupport) pValue) - .getElements()) { + for (MetaValue value : ((CollectionValueSupport) pValue).getElements()) { if (value.getMetaType().isCollection()) { - ArrayList<String> row = (ArrayList<String>) MetaValueFactory - .getInstance().unwrap(value); + ArrayList<String> row = (ArrayList<String>) MetaValueFactory.getInstance().unwrap(value); list.add(row); } } } } - private void getResultsCollectionValueForMatViewRefresh(MetaValue pValue, - Collection<ArrayList<String>> list) { + private void getResultsCollectionValueForMatViewRefresh(MetaValue pValue, Collection<ArrayList<String>> list) { MetaType metaType = pValue.getMetaType(); for (MetaValue value : ((CollectionValueSupport) pValue).getElements()) { if (value.getMetaType().isCollection()) { - ArrayList<String> row = (ArrayList<String>) MetaValueFactory - .getInstance().unwrap(value); + ArrayList<String> row = (ArrayList<String>) MetaValueFactory.getInstance().unwrap(value); list.add(row); } } - } - public static <T> void getTransactionCollectionValue(MetaValue pValue, - Collection<Transaction> list) { + public static <T> void getTransactionCollectionValue(MetaValue pValue, Collection<Transaction> list) { MetaType metaType = pValue.getMetaType(); if (metaType.isCollection()) { - for (MetaValue value : ((CollectionValueSupport) pValue) - .getElements()) { + for (MetaValue value : ((CollectionValueSupport) pValue).getElements()) { if (value.getMetaType().isComposite()) { - Transaction transaction = (Transaction) MetaValueFactory - .getInstance().unwrap(value); + Transaction transaction = (Transaction) MetaValueFactory.getInstance().unwrap(value); list.add(transaction); } else { throw new IllegalStateException(pValue @@ -793,15 +698,12 @@ } } - public static <T> void getSessionCollectionValue(MetaValue pValue, - Collection<Session> list) { + public static <T> void getSessionCollectionValue(MetaValue pValue,Collection<Session> list) { MetaType metaType = pValue.getMetaType(); if (metaType.isCollection()) { - for (MetaValue value : ((CollectionValueSupport) pValue) - .getElements()) { + for (MetaValue value : ((CollectionValueSupport) pValue).getElements()) { if (value.getMetaType().isComposite()) { - Session Session = (Session) MetaValueFactory.getInstance() - .unwrap(value); + Session Session = (Session) MetaValueFactory.getInstance().unwrap(value); list.add(Session); } else { throw new IllegalStateException(pValue @@ -811,28 +713,23 @@ } } - public static <T> void getSessionCollectionValueForVDB(MetaValue pValue, - Collection<Session> list, String vdbName) { + public static <T> void getSessionCollectionValueForVDB(MetaValue pValue,Collection<Session> list, String vdbName) { MetaType metaType = pValue.getMetaType(); if (metaType.isCollection()) { - for (MetaValue value : ((CollectionValueSupport) pValue) - .getElements()) { + for (MetaValue value : ((CollectionValueSupport) pValue).getElements()) { if (value.getMetaType().isComposite()) { - Session session = (Session) MetaValueFactory.getInstance() - .unwrap(value); + Session session = (Session) MetaValueFactory.getInstance().unwrap(value); if (session.getVDBName().equals(vdbName)) { list.add(session); } } else { - throw new IllegalStateException(pValue - + " is not a Composite type"); //$NON-NLS-1$ + throw new IllegalStateException(pValue+ " is not a Composite type"); //$NON-NLS-1$ } } } } - private Collection createReportResultList(List fieldNameList, - Iterator objectIter) { + private Collection createReportResultList(List fieldNameList, Iterator objectIter) { Collection reportResultList = new ArrayList(); while (objectIter.hasNext()) { @@ -858,16 +755,13 @@ return reportResultList; } - private Collection createReportResultListForMatViewQuery( - List fieldNameList, Iterator objectIter) { + private Collection createReportResultListForMatViewQuery(List fieldNameList, Iterator objectIter) { Collection reportResultList = new ArrayList(); // Iterate through rows while (objectIter.hasNext()) { - ArrayList<Object> columnValues = (ArrayList<Object>) objectIter - .next(); + ArrayList<Object> columnValues = (ArrayList<Object>) objectIter.next(); - Class cls = null; try { Iterator fieldIter = fieldNameList.iterator(); Map reportValueMap = new HashMap<String, Object>(); Modified: branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/Facet.java =================================================================== --- branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/Facet.java 2010-11-04 16:42:13 UTC (rev 2704) +++ branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/Facet.java 2010-11-04 22:07:24 UTC (rev 2705) @@ -351,9 +351,7 @@ Map<String, ManagedProperty> managedProperties = managedComponent .getProperties(); - ProfileServiceUtil.convertConfigurationToManagedProperties( - managedProperties, resourceConfig, resourceContext - .getResourceType()); + ProfileServiceUtil.convertConfigurationToManagedProperties(managedProperties, resourceConfig, resourceContext.getResourceType(), null); try { managementView.updateComponent(managedComponent); @@ -758,11 +756,9 @@ DeploymentTemplateInfo template; try { template = managementView.getTemplate(templateName); - Map<String, ManagedProperty> managedProperties = template - .getProperties(); + Map<String, ManagedProperty> managedProperties = template.getProperties(); - ProfileServiceUtil.convertConfigurationToManagedProperties( - managedProperties, resourceConfig, resourceType); + ProfileServiceUtil.convertConfigurationToManagedProperties(managedProperties, resourceConfig, resourceType, null); LOG.debug("Applying template [" + templateName //$NON-NLS-1$ + "] to create ManagedComponent of type [" + componentType //$NON-NLS-1$ Modified: branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/PlatformComponent.java =================================================================== --- branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/PlatformComponent.java 2010-11-04 16:42:13 UTC (rev 2704) +++ branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/PlatformComponent.java 2010-11-04 22:07:24 UTC (rev 2705) @@ -58,9 +58,6 @@ public class PlatformComponent extends Facet { private final Log LOG = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY); - String[] PLATFORM_SERVICES_NAMES = { "RuntimeEngineDeployer", //$NON-NLS-1$ - "BufferService", "SessionService", "JdbcSocketConfiguration" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - @Override public void start(ResourceContext context) { this.setComponentName(context.getPluginConfiguration().getSimpleValue( "name", null)); //$NON-NLS-1$ @@ -167,18 +164,18 @@ PluginConstants.ComponentType.Platform.TEIID_TYPE, PluginConstants.ComponentType.Platform.TEIID_SUB_TYPE); - ManagedComponent managedComponent = null; report.setStatus(ConfigurationUpdateStatus.SUCCESS); try { managementView = getConnection().getManagementView(); - - for (String serviceName : PLATFORM_SERVICES_NAMES) { - - managedComponent = managementView.getComponent(serviceName, componentType); + Set<ManagedComponent> allComponents = managementView.getComponentsForType(componentType); + + for (ManagedComponent managedComponent : allComponents) { + Map<String, ManagedProperty> managedProperties = managedComponent.getProperties(); - ProfileServiceUtil.convertConfigurationToManagedProperties(managedProperties, resourceConfig, resourceContext.getResourceType()); + + ProfileServiceUtil.convertConfigurationToManagedProperties(managedProperties, resourceConfig, resourceContext.getResourceType(), managedComponent.getName()); try { managementView.updateComponent(managedComponent); @@ -234,10 +231,11 @@ } catch (Exception e) { LOG.error("Exception getting components in Platform loadConfiguration(): " + e.getMessage()); //$NON-NLS-1$ } - + for (ManagedComponent mc : mcSet) { Map<String, ManagedProperty> mcMap = mc.getProperties(); - setProperties(mcMap, configuration); + String name = mc.getName(); + setProperties(name, mcMap, configuration); } } @@ -245,12 +243,11 @@ * @param mcMap * @param configuration */ - private void setProperties(Map<String, ManagedProperty> mcMap, - Configuration configuration) { + private void setProperties(String compName, Map<String, ManagedProperty> mcMap, Configuration configuration) { for (ManagedProperty mProp : mcMap.values()) { try { String value = ProfileServiceUtil.stringValue(mProp.getValue()); - PropertySimple prop = new PropertySimple(mProp.getName(), value); + PropertySimple prop = new PropertySimple(compName+"."+mProp.getName(), value); //$NON-NLS-1$ configuration.put(prop); } catch (Exception e) { LOG.error("Exception setting properties in Platform loadConfiguration(): " + e.getMessage()); //$NON-NLS-1$ Modified: branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/util/ProfileServiceUtil.java =================================================================== --- branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/util/ProfileServiceUtil.java 2010-11-04 16:42:13 UTC (rev 2704) +++ branches/7.1.x/console/src/main/java/org/teiid/rhq/plugin/util/ProfileServiceUtil.java 2010-11-04 22:07:24 UTC (rev 2705) @@ -407,37 +407,33 @@ return config; } - public static void convertConfigurationToManagedProperties( - Map<String, ManagedProperty> managedProperties, - Configuration configuration, ResourceType resourceType) { - ConfigurationDefinition configDefinition = resourceType - .getResourceConfigurationDefinition(); + public static void convertConfigurationToManagedProperties(Map<String, ManagedProperty> managedProperties, Configuration configuration, ResourceType resourceType, String prefix) { + ConfigurationDefinition configDefinition = resourceType.getResourceConfigurationDefinition(); for (ManagedProperty managedProperty : managedProperties.values()) { String propertyName = managedProperty.getName(); - PropertyDefinition propertyDefinition = configDefinition - .get(propertyName); + if (prefix != null) { + propertyName = prefix + "." + propertyName; //$NON-NLS-1$ + } + PropertyDefinition propertyDefinition = configDefinition.get(propertyName); if (propertyDefinition == null) { // The managed property is not defined in the configuration continue; } - populateManagedPropertyFromProperty(managedProperty, - propertyDefinition, configuration); + populateManagedPropertyFromProperty(managedProperty,propertyDefinition, configuration); } return; } - public static void populateManagedPropertyFromProperty( - ManagedProperty managedProperty, - PropertyDefinition propertyDefinition, Configuration configuration) { + public static void populateManagedPropertyFromProperty(ManagedProperty managedProperty, PropertyDefinition propertyDefinition, Configuration configuration) { // If the ManagedProperty defines a default value, assume it's more // definitive than any default value that may // have been defined in the plugin descriptor, and update the // PropertyDefinition to use that as its default // value. MetaValue defaultValue = managedProperty.getDefaultValue(); - if (defaultValue != null) - updateDefaultValueOnPropertyDefinition(propertyDefinition, - defaultValue); + if (defaultValue != null) { + updateDefaultValueOnPropertyDefinition(propertyDefinition,defaultValue); + } MetaValue metaValue = managedProperty.getValue(); PropertyAdapter propertyAdapter = null; if (metaValue != null) { @@ -445,24 +441,15 @@ + metaValue.getMetaType() + " from Teiid property " //$NON-NLS-1$ + propertyDefinition.getName() + " with definition " //$NON-NLS-1$ + propertyDefinition + "..."); //$NON-NLS-1$ - propertyAdapter = PropertyAdapterFactory - .getPropertyAdapter(metaValue); + propertyAdapter = PropertyAdapterFactory.getPropertyAdapter(metaValue); - propertyAdapter.populateMetaValueFromProperty(configuration - .getSimple(propertyDefinition.getName()), metaValue, - propertyDefinition); + propertyAdapter.populateMetaValueFromProperty(configuration.getSimple(propertyDefinition.getName()), metaValue, propertyDefinition); managedProperty.setValue(metaValue); } else { MetaType metaType = managedProperty.getMetaType(); - if (propertyAdapter == null) - propertyAdapter = PropertyAdapterFactory - .getPropertyAdapter(metaType); - LOG.trace("Converting property " + propertyDefinition.getName() //$NON-NLS-1$ - + " with definition " + propertyDefinition //$NON-NLS-1$ - + " to MetaValue of type " + metaType + "..."); //$NON-NLS-1$ //$NON-NLS-2$ - metaValue = propertyAdapter.convertToMetaValue(configuration - .getSimple(propertyDefinition.getName()), - propertyDefinition, metaType); + propertyAdapter = PropertyAdapterFactory.getPropertyAdapter(metaType); + LOG.trace("Converting property " + propertyDefinition.getName() + " with definition " + propertyDefinition + " to MetaValue of type " + metaType + "..."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + metaValue = propertyAdapter.convertToMetaValue(configuration.getSimple(propertyDefinition.getName()),propertyDefinition, metaType); managedProperty.setValue(metaValue); } @@ -472,10 +459,8 @@ PropertyDefinition propertyDefinition, @NotNull MetaValue defaultValue) { if (!(propertyDefinition instanceof PropertyDefinitionSimple)) { - LOG - .debug("Cannot update default value on non-simple property definition " //$NON-NLS-1$ - + propertyDefinition - + "(default value is " //$NON-NLS-1$ + LOG.debug("Cannot update default value on non-simple property definition " //$NON-NLS-1$ + + propertyDefinition + "(default value is " //$NON-NLS-1$ + defaultValue + ")."); //$NON-NLS-1$ return; } @@ -490,13 +475,11 @@ if (metaType.isSimple()) { SimpleValue defaultSimpleValue = (SimpleValue) defaultValue; Serializable value = defaultSimpleValue.getValue(); - propertyDefinitionSimple.setDefaultValue((value != null) ? value - .toString() : null); + propertyDefinitionSimple.setDefaultValue((value != null) ? value.toString() : null); } else { // defaultValueMetaType.isEnum() EnumValue defaultEnumValue = (EnumValue) defaultValue; Serializable value = defaultEnumValue.getValue(); - propertyDefinitionSimple.setDefaultValue((value != null) ? value - .toString() : null); + propertyDefinitionSimple.setDefaultValue((value != null) ? value.toString() : null); } } Modified: branches/7.1.x/console/src/main/resources/META-INF/rhq-plugin.xml =================================================================== --- branches/7.1.x/console/src/main/resources/META-INF/rhq-plugin.xml 2010-11-04 16:42:13 UTC (rev 2704) +++ branches/7.1.x/console/src/main/resources/META-INF/rhq-plugin.xml 2010-11-04 22:07:24 UTC (rev 2705) @@ -296,104 +296,112 @@ property="QUERY_SERVICE_RESULT_SET_CACHE.requestCount" description="Total number of requests made against cache" /> <resource-configuration> - <c:group name="teiidProperties" displayName="Runtime Engine Properties" + <c:group name="RuntimeEngineDeployer" displayName="Runtime Engine Properties (restart required before modifications take effect)" hiddenByDefault="false"> - <c:simple-property name="maxRowsFetchSize" + <c:simple-property name="RuntimeEngineDeployer.maxRowsFetchSize" displayName="Max Rows Fetch Size" description="The maximum number of result set cache entries. 0 indicates no limit. (default 1024)" required="false" readOnly="false" /> - <c:simple-property name="processName" displayName="Process Name" - description="Name that uniquely identifies this process" required="false" - readOnly="false" /> - <c:simple-property name="maxThreads" displayName="Max Threads" + <c:simple-property name="RuntimeEngineDeployer.maxThreads" displayName="Max Threads" description="Process pool maximum thread count. (default 64)" - required="false" readOnly="false" /> - <c:simple-property name="timeSliceInMilli" + required="false" readOnly="false" /> + <c:simple-property name="RuntimeEngineDeployer.maxActivePlans" + displayName="Maximum Concurrent Active plans" + description="Increase this value on highly concurrent systems - but ensure that the underlying pools can handle the increased load without timeouts.(default 20)" + required="false" readOnly="false" /> + <c:simple-property name="RuntimeEngineDeployer.timeSliceInMilli" displayName="Time Slice In Milliseconds" description="Query processor time slice, in milliseconds. (default 2000)" required="false" readOnly="false" /> - <c:simple-property name="lobChunkSizeInKB" + <c:simple-property name="RuntimeEngineDeployer.lobChunkSizeInKB" displayName="Lob Chunk Size In KB" description="The max lob chunk size in KB transferred to the client for xml, blobs, clobs (default 100KB)" - required="false" readOnly="false" /> - <c:simple-property name="resultSetCacheEnabled" - displayName="Result Set Cache Enabled" - description="Denotes whether or not result set caching is enabled. (default true)" - required="false" readOnly="false" type="boolean" /> - <c:simple-property name="resultSetCacheMaxEntries" - displayName="Result Set Cache Max Entries" - description="The maximum number of result set cache entries. -1 indicates no limit. (default 1024)" - required="false" readOnly="false" /> - <c:simple-property name="resultSetCacheMaxEntryAge" - displayName="Result Set Cache Max Entry Age" - description="The maximum age of a result set cache entry in seconds. -1 indicates no max. (default 7200)" - required="false" readOnly="false" /> - <c:simple-property name="preparedPlanCacheMaxCount" + required="false" readOnly="false" /> + <c:simple-property name="RuntimeEngineDeployer.preparedPlanCacheMaxCount" displayName="Prepared Plan Cache Max Count" description="The maximum number of query plans that are cached. Note: this is a memory based cache. (default 250)" required="false" readOnly="false" /> - <c:simple-property name="activeSessionsCount" - displayName="Active Session Count" description="Count of active sessions" - required="false" readOnly="false" /> - <c:simple-property name="queryThresholdInSecs" + <c:simple-property name="RuntimeEngineDeployer.queryThresholdInSecs" displayName="Long Running Query Threshold" description="Length of time in seconds before a query is considered long running" required="false" readOnly="false" /> + <c:simple-property name="RuntimeEngineDeployer.useDataRoles" + displayName="Data Roles Enabled" + description="Turn on role checking of resources based on the roles defined in VDB (default true)" + required="false" readOnly="false" /> </c:group> - <c:group name="bufferServiceProperties" displayName="Buffer Service Properties" + + <c:group name="ResultSetCacheConfig" displayName="ResultSet Cache Properties" hiddenByDefault="false"> + <!-- the below property on RuntimeEngineDeployer --> + <c:simple-property name="RuntimeEngineDeployer.resultSetCacheEnabled" + displayName="Enabled" + description="Denotes whether or not result set caching is enabled. (default true)" + required="false" readOnly="false" type="boolean" /> + <c:simple-property name="ResultSetCacheConfig.maxEntries" + displayName="Max Entries" + description="The maximum number of result set cache entries. -1 indicates no limit. (default 1024)" + required="false" readOnly="false" /> + <c:simple-property name="ResultSetCacheConfig.maxAgeInSeconds" + displayName="Max Entry Age" + description="The maximum age of a result set cache entry in seconds. -1 indicates no max. (default 7200)" + required="false" readOnly="false" /> + </c:group> + + <c:group name="BufferService" displayName="Buffer Service Properties" hiddenByDefault="false"> - <c:simple-property name="maxBufferSpace" + <c:simple-property name="BufferService.maxBufferSpace" displayName="Max Buffer Space" description="Max file storage space, in MB, to be used for buffer files (default 50G)" required="false" readOnly="false" /> - <c:simple-property name="processorBatchSize" + <c:simple-property name="BufferService.processorBatchSize" displayName="Processor Batch Size" description="The max row count of a batch sent internally within the query processor. Should be &lt;= the connectorBatchSize. (default 512)" required="false" readOnly="false" /> - <c:simple-property name="connectorBatchSize" + <c:simple-property name="BufferService.connectorBatchSize" displayName="Connector Batch Size" description="The max row count of a batch from a connector. Should be even multiple of processorBatchSize. (default 1024)" required="false" readOnly="false" /> - <c:simple-property name="maxProcessingBatchesColumns" + <c:simple-property name="BufferService.maxProcessingBatchesColumns" displayName="Max Processing Batches Columns" description="The number of batch columns guarenteed to a processing operation. Set this value lower if the workload typically processes larger numbers of concurrent queries with large intermediate results from operations such as sorting, grouping, etc. (default 128)" required="false" readOnly="false" /> - <c:simple-property name="maxFileSize" displayName="Max File Size" + <c:simple-property name="BufferService.maxFileSize" displayName="Max File Size" description="Max file size for buffer files (default 2GB)" required="false" readOnly="false" /> - <c:simple-property name="maxReserveBatchColumns" + <c:simple-property name="BufferService.maxReserveBatchColumns" displayName="Max Reserve Batch Columns" description="The number of batch columns to allow in memory (default 16384). This value should be set lower or higher depending on the available memory to Teiid in the VM. 16384 is considered a good default for a dedicated 32-bit VM running Teiid with a 1 gig heap." required="false" readOnly="false" /> </c:group> - <c:group name="jdbcSocketConfigurationProperties" - displayName="Jdbc Socket Configuration Properties" hiddenByDefault="false"> - <c:simple-property name="portNumber" displayName="Port Number" + <c:group name="JdbcSocketConfiguration" displayName="Jdbc Socket Configuration Properties" hiddenByDefault="false"> + <c:simple-property name="JdbcSocketConfiguration.enabled" displayName="Enable" + description="Enable Socket based JDBC access" required="false" readOnly="false" /> + <c:simple-property name="JdbcSocketConfiguration.hostName" displayName="Host Name" + description="Host Name" required="false" readOnly="false" /> + <c:simple-property name="JdbcSocketConfiguration.portNumber" displayName="Port Number" description="Port Number" required="false" readOnly="false" /> - <c:simple-property name="sslEnabled" displayName="SSL Enabled" - description="SSL enabled" required="false" readOnly="false" type="boolean" + <c:simple-property name="JdbcSocketConfiguration.sslEnabled" displayName="SSL Enabled" + description="SSL enabled" required="false" readOnly="true" type="boolean" default="true" /> - <c:simple-property name="hostName" displayName="Host Name" - description="Host Name" required="false" readOnly="false" /> - <c:simple-property name="maxSocketThreads" + <c:simple-property name="JdbcSocketConfiguration.maxSocketThreads" displayName="Max Socket Threads" description="Max NIO threads" required="false" readOnly="false" /> - <c:simple-property name="inputBufferSize" + <c:simple-property name="JdbcSocketConfiguration.inputBufferSize" displayName="Input Buffer Size" description="SO_RCVBUF size, 0 indicates that system default should be used (default 0)" required="false" readOnly="false" /> - <c:simple-property name="outputBufferSize" + <c:simple-property name="JdbcSocketConfiguration.outputBufferSize" displayName="Output Buffer Size" description="SO_SNDBUF size, 0 indicates that system default should be used (default 0)" required="false" readOnly="false" /> </c:group> - <c:group name="sessionServiceProperties" displayName="Session Service Properties" + <c:group name="SessionService" displayName="Session Service Properties" hiddenByDefault="false"> - <c:simple-property name="sessionExpirationTimeLimit" + <c:simple-property name="SessionService.sessionExpirationTimeLimit" displayName="Session Expiration Time Limit" description="Max allowed time before the session is terminated by the system, 0 indicates unlimited (default 0)" required="false" readOnly="false" /> - <c:simple-property name="sessionMaxLimit" + <c:simple-property name="SessionService.sessionMaxLimit" displayName="Session Max Limit" description="Maximum number of sessions allowed by the system (default 5000)" required="false" readOnly="false" /> Modified: branches/7.1.x/engine/src/main/java/org/teiid/cache/CacheConfiguration.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/cache/CacheConfiguration.java 2010-11-04 16:42:13 UTC (rev 2704) +++ branches/7.1.x/engine/src/main/java/org/teiid/cache/CacheConfiguration.java 2010-11-04 22:07:24 UTC (rev 2705) @@ -22,6 +22,13 @@ package org.teiid.cache; +import org.jboss.managed.api.annotation.ManagementComponent; +import org.jboss.managed.api.annotation.ManagementObject; +import org.jboss.managed.api.annotation.ManagementObjectID; +import org.jboss.managed.api.annotation.ManagementProperties; +import org.jboss.managed.api.annotation.ManagementProperty; + +@ManagementObject(componentType=@ManagementComponent(type="teiid",subtype="dqp"), properties=ManagementProperties.EXPLICIT) public class CacheConfiguration { public static CacheConfiguration DEFAULT = new CacheConfiguration(Policy.LRU, 60*60, 100); // 1 hours with 100 nodes. @@ -35,6 +42,7 @@ private int maxage; private int maxEntries; private boolean enabled = true; + private String name; public CacheConfiguration() { } @@ -48,7 +56,8 @@ public Policy getPolicy() { return this.policy; } - + + @ManagementProperty(description="The maximum age of a result set cache entry in seconds. -1 indicates no max. (default 7200)") public int getMaxAgeInSeconds(){ return maxage; } @@ -57,6 +66,7 @@ this.maxage = maxage; } + @ManagementProperty(description="The maximum number of result set cache entries. -1 indicates no limit. (default 1024)") public int getMaxEntries() { return this.maxEntries; } @@ -69,6 +79,16 @@ this.policy = Policy.valueOf(type); } + @ManagementProperty(description="Name of the configuration", readOnly=true) + @ManagementObjectID(type="cache") + public String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + @Override public int hashCode() { final int prime = 31; Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPConfiguration.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPConfiguration.java 2010-11-04 16:42:13 UTC (rev 2704) +++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPConfiguration.java 2010-11-04 22:07:24 UTC (rev 2705) @@ -104,11 +104,6 @@ public void setPreparedPlanCacheMaxCount(int preparedPlanCacheMaxCount) { this.preparedPlanCacheMaxCount = preparedPlanCacheMaxCount; } - - @ManagementProperty(description="The maximum number of result set cache entries. -1 indicates no limit. (default 1024)") - public int getResultSetCacheMaxEntries() { - return this.resultsetCacheConfig.getMaxEntries(); - } public CacheConfiguration getResultsetCacheConfig() { return this.resultsetCacheConfig; @@ -120,29 +115,20 @@ @ManagementProperty(description="Denotes whether or not result set caching is enabled. (default true)") public boolean isResultSetCacheEnabled() { - return this.resultsetCacheConfig.isEnabled(); + return this.resultsetCacheConfig != null && this.resultsetCacheConfig.isEnabled(); } - @ManagementProperty(description="The maximum age of a result set cache entry in seconds. -1 indicates no max. (default 7200)") - public int getResultSetCacheMaxEntryAge() { - return this.resultsetCacheConfig.getMaxAgeInSeconds(); - } - - public void setResultSetCacheMaxEntryAge(int maxAge) { - this.resultsetCacheConfig.setMaxAgeInSeconds(maxAge); - } - /** * Determine whether role checking is enabled on the server. * @return <code>true</code> if server-side role checking is enabled. */ @ManagementProperty(description="Turn on role checking on resources based on the roles defined in VDB") - public boolean useDataRoles() { + public boolean getUseDataRoles() { return useDataRoles; } - public void setUseDataRoles(Boolean useEntitlements) { - this.useDataRoles = useEntitlements.booleanValue(); + public void setUseDataRoles(boolean useEntitlements) { + this.useDataRoles = useEntitlements; } @ManagementProperty(description="Long running query threshold, after which a alert can be generated by tooling if configured") Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2010-11-04 16:42:13 UTC (rev 2704) +++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2010-11-04 22:07:24 UTC (rev 2705) @@ -681,7 +681,7 @@ public void start(DQPConfiguration config) { this.processorTimeslice = config.getTimeSliceInMilli(); this.maxFetchSize = config.getMaxRowsFetchSize(); - this.useEntitlements = config.useDataRoles(); + this.useEntitlements = config.getUseDataRoles(); this.queryThreshold = config.getQueryThresholdInSecs(); this.maxSourceRows = config.getMaxSourceRows(); this.exceptionOnMaxSourceRows = config.isExceptionOnMaxSourceRows(); Modified: branches/7.1.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java =================================================================== --- branches/7.1.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java 2010-11-04 16:42:13 UTC (rev 2704) +++ branches/7.1.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java 2010-11-04 22:07:24 UTC (rev 2705) @@ -170,21 +170,21 @@ this.csr.registerClientService(DQP.class, proxyService(DQP.class, this.dqpCore, LogConstants.CTX_DQP), LogConstants.CTX_DQP); this.csr.registerClientService(Admin.class, proxyService(Admin.class, admin, LogConstants.CTX_ADMIN_API), LogConstants.CTX_ADMIN_API); - if (this.jdbcSocketConfiguration.isEnabled()) { + if (this.jdbcSocketConfiguration.getEnabled()) { this.jdbcSocket = new SocketListener(this.jdbcSocketConfiguration, csr, this.dqpCore.getBufferManager(), offset); LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("socket_enabled","Teiid JDBC = ",(this.jdbcSocketConfiguration.getSSLConfiguration().isSslEnabled()?"mms://":"mm://")+this.jdbcSocketConfiguration.getHostAddress().getHostName()+":"+(this.jdbcSocketConfiguration.getPortNumber()+offset))); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ } else { LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("socket_not_enabled", "jdbc connections")); //$NON-NLS-1$ //$NON-NLS-2$ } - if (this.adminSocketConfiguration.isEnabled()) { + if (this.adminSocketConfiguration.getEnabled()) { this.adminSocket = new SocketListener(this.adminSocketConfiguration, csr, this.dqpCore.getBufferManager(), offset); LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("socket_enabled","Teiid Admin", (this.adminSocketConfiguration.getSSLConfiguration().isSslEnabled()?"mms://":"mm://")+this.adminSocketConfiguration.getHostAddress().getHostName()+":"+(this.adminSocketConfiguration.getPortNumber()+offset))); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ } else { LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("socket_not_enabled", "admin connections")); //$NON-NLS-1$ //$NON-NLS-2$ } - if (this.odbcSocketConfiguration.isEnabled()) { + if (this.odbcSocketConfiguration.getEnabled()) { this.vdbRepository.odbcEnabled(); this.odbcSocket = new ODBCSocketListener(this.odbcSocketConfiguration, csr, this.dqpCore.getBufferManager(), offset); LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("odbc_enabled","Teiid ODBC - SSL=", (this.odbcSocketConfiguration.getSSLConfiguration().isSslEnabled()?"ON":"OFF")+" Host = "+this.odbcSocketConfiguration.getHostAddress().getHostName()+" Port = "+(this.odbcSocketConfiguration.getPortNumber()+offset))); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ @@ -192,7 +192,7 @@ LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("odbc_not_enabled")); //$NON-NLS-1$ } - LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("engine_started", new Date(System.currentTimeMillis()).toString())); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("engine_started", getRuntimeVersion(), new Date(System.currentTimeMillis()).toString())); //$NON-NLS-1$ if (jndiName != null) { final InitialContext ic ; try { Modified: branches/7.1.x/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties =================================================================== --- branches/7.1.x/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2010-11-04 16:42:13 UTC (rev 2704) +++ branches/7.1.x/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2010-11-04 22:07:24 UTC (rev 2705) @@ -20,7 +20,7 @@ # 02110-1301 USA. # -engine_started=Teiid Engine Started = {0} +engine_started=Teiid Engine {0} Started = {1} socket_enabled={0} {1} odbc_not_enabled=ODBC transport is not enabled in Teiid. odbc_enabled={0} {1} Modified: branches/7.1.x/runtime/src/main/java/org/teiid/transport/SocketConfiguration.java =================================================================== --- branches/7.1.x/runtime/src/main/java/org/teiid/transport/SocketConfiguration.java 2010-11-04 16:42:13 UTC (rev 2704) +++ branches/7.1.x/runtime/src/main/java/org/teiid/transport/SocketConfiguration.java 2010-11-04 22:07:24 UTC (rev 2705) @@ -26,6 +26,7 @@ import org.jboss.managed.api.annotation.ManagementComponent; import org.jboss.managed.api.annotation.ManagementObject; +import org.jboss.managed.api.annotation.ManagementObjectID; import org.jboss.managed.api.annotation.ManagementProperties; import org.jboss.managed.api.annotation.ManagementProperty; import org.teiid.core.TeiidRuntimeException; @@ -42,8 +43,18 @@ private SSLConfiguration sslConfiguration; private boolean enabled; private String hostName; + private String name; + @ManagementProperty(description="Name of the configuration", readOnly=true) + @ManagementObjectID(type="socket") + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public void setBindAddress(String addr) { this.hostName = addr; } @@ -79,8 +90,8 @@ } } - @ManagementProperty(description="SSL enabled", readOnly=true) - public boolean isEnabled() { + @ManagementProperty(description="enabled") + public boolean getEnabled() { return enabled; } @@ -88,22 +99,22 @@ this.enabled = enabled; } - @ManagementProperty(description="SO_SNDBUF size, 0 indicates that system default should be used (default 0)",readOnly=true) + @ManagementProperty(description="SO_SNDBUF size, 0 indicates that system default should be used (default 0)") public int getOutputBufferSize() { return outputBufferSize; } - @ManagementProperty(description="SO_RCVBUF size, 0 indicates that system default should be used (default 0)",readOnly=true) + @ManagementProperty(description="SO_RCVBUF size, 0 indicates that system default should be used (default 0)") public int getInputBufferSize() { return inputBufferSize; } - @ManagementProperty(description="Max NIO threads",readOnly=true) + @ManagementProperty(description="Max NIO threads") public int getMaxSocketThreads() { return maxSocketThreads; } - @ManagementProperty(description="Port Number",readOnly=true) + @ManagementProperty(description="Port Number") public int getPortNumber() { return portNumber; } @@ -126,7 +137,7 @@ } } - @ManagementProperty(description="Host Name",readOnly=true) + @ManagementProperty(description="Host Name") public String getHostName() { resolveHostName(); return this.hostName; @@ -134,5 +145,10 @@ public SSLConfiguration getSSLConfiguration() { return sslConfiguration; - } + } + + @ManagementProperty(description="SSL enabled") + public boolean getSslEnabled() { + return this.sslConfiguration != null && this.sslConfiguration.isSslEnabled(); + } }