[teiid-commits] teiid SVN: r2353 - in trunk/console/src/main: java/org/teiid/rhq/plugin and 2 other directories.

teiid-commits at lists.jboss.org teiid-commits at lists.jboss.org
Thu Jul 15 16:06:03 EDT 2010


Author: tejones
Date: 2010-07-15 16:06:02 -0400 (Thu, 15 Jul 2010)
New Revision: 2353

Modified:
   trunk/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java
   trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformComponent.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
   trunk/console/src/main/resources/META-INF/rhq-plugin.xml
Log:
TEIID-958 -  Added metric to indicate the amount of buffer space is currently in use 

Modified: trunk/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java	2010-07-15 18:40:42 UTC (rev 2352)
+++ trunk/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java	2010-07-15 20:06:02 UTC (rev 2353)
@@ -76,7 +76,8 @@
 		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);
@@ -104,10 +105,20 @@
 					getRequestCollectionValue(getLongRunningQueries(connection),
 							longRunningQueries);
 					resultObject = new Double(longRunningQueries.size());
-				}
+				} else {
+					if (metric
+							.equals(PluginConstants.ComponentType.Platform.Metrics.BUFFER_USAGE)) {
+						try {
+							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);
+						}
+					}
+			    }
 			}
 		}
-
+		
 		return resultObject;
 	}
 
@@ -120,7 +131,8 @@
 		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));
+			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
@@ -172,7 +184,8 @@
 
 		if (operationName.equals(Platform.Operations.GET_LONGRUNNINGQUERIES)) {
 			List<String> fieldNameList = operationResult.getFieldNameList();
-			getRequestCollectionValue(getLongRunningQueries(connection), resultObject);
+			getRequestCollectionValue(getLongRunningQueries(connection),
+					resultObject);
 			operationResult.setContent(createReportResultList(fieldNameList,
 					resultObject.iterator()));
 		} else if (operationName.equals(Platform.Operations.GET_SESSIONS)) {
@@ -201,7 +214,7 @@
 			MetaValue[] args = new MetaValue[] { metaValueFactory
 					.create(sessionID) };
 			try {
-				executeManagedOperation(connection, mc,
+				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$
@@ -212,8 +225,8 @@
 			MetaValue[] args = new MetaValue[] { metaValueFactory
 					.create(sessionID) };
 			try {
-				executeManagedOperation(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);
@@ -225,8 +238,8 @@
 					metaValueFactory.create(requestID),
 					metaValueFactory.create(sessionID) };
 			try {
-				executeManagedOperation(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);
@@ -234,8 +247,9 @@
 		}
 	}
 
-	private void executeVdbOperation(ProfileServiceConnection connection, ExecutedResult operationResult,
-			final String operationName, final Map<String, Object> valueMap) {
+	private void executeVdbOperation(ProfileServiceConnection connection,
+			ExecutedResult operationResult, final String operationName,
+			final Map<String, Object> valueMap) {
 		Collection<Request> resultObject = new ArrayList<Request>();
 		Collection<Session> activeSessionsCollection = new ArrayList<Session>();
 		String vdbName = (String) valueMap
@@ -257,8 +271,8 @@
 					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()));
@@ -270,13 +284,14 @@
 	 * Helper methods
 	 */
 
-	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, 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$
@@ -293,9 +308,9 @@
 		MetaValue args = null;
 
 		try {
-			requestsCollection = executeManagedOperation(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);
@@ -305,7 +320,8 @@
 
 	}
 
-	protected MetaValue getRequestsForVDB(ProfileServiceConnection connection, String vdbName, int vdbVersion) {
+	protected MetaValue getRequestsForVDB(ProfileServiceConnection connection,
+			String vdbName, int vdbVersion) {
 
 		MetaValue requestsCollection = null;
 		MetaValue[] args = new MetaValue[] {
@@ -313,7 +329,7 @@
 				MetaValueFactory.getInstance().create(vdbVersion) };
 
 		try {
-			requestsCollection = executeManagedOperation(connection, mc,
+			requestsCollection = executeManagedOperation(connection, getRuntimeEngineDeployer(connection, mc),
 					PluginConstants.ComponentType.VDB.Operations.GET_REQUESTS,
 					args);
 		} catch (Exception e) {
@@ -331,7 +347,7 @@
 		MetaValue args = null;
 
 		try {
-			transactionsCollection = executeManagedOperation(connection, mc,
+			transactionsCollection = executeManagedOperation(connection, getRuntimeEngineDeployer(connection, mc),
 					Platform.Operations.GET_TRANSACTIONS, args);
 		} catch (Exception e) {
 			final String msg = "Exception executing operation: " + Platform.Operations.GET_TRANSACTIONS; //$NON-NLS-1$
@@ -348,7 +364,7 @@
 		MetaValue args = null;
 
 		try {
-			sessionCollection = executeManagedOperation(connection, mc,
+			sessionCollection = executeManagedOperation(connection, getRuntimeEngineDeployer(connection, mc),
 					PluginConstants.Operation.GET_SESSIONS, args);
 		} catch (Exception e) {
 			final String msg = "Exception executing operation: " + Platform.Operations.GET_SESSIONS; //$NON-NLS-1$
@@ -384,8 +400,6 @@
 			ProfileServiceConnection connection, ManagedComponent mc,
 			String operation, MetaValue... args) throws Exception {
 
-		mc = getDQPManagementView(connection, mc);
-
 		for (ManagedOperation mo : mc.getOperations()) {
 			String opName = mo.getName();
 			if (opName.equals(operation)) {
@@ -405,14 +419,15 @@
 
 	}
 
+	
 	/**
 	 * @param mc
 	 * @return
 	 */
-	private static ManagedComponent getDQPManagementView(
+	private static ManagedComponent getRuntimeEngineDeployer(
 			ProfileServiceConnection connection, ManagedComponent mc) {
 		try {
-			mc = ProfileServiceUtil.getDQPManagementView(connection);
+			mc = ProfileServiceUtil.getRuntimeEngineDeployer(connection);
 		} catch (NamingException e) {
 			final String msg = "NamingException getting the DQPManagementView"; //$NON-NLS-1$
 			LOG.error(msg, e);
@@ -423,19 +438,40 @@
 		return mc;
 	}
 
+	/**
+	 * @param mc
+	 * @return
+	 */
+	private static ManagedComponent getBufferService(
+			ProfileServiceConnection connection, ManagedComponent mc) {
+		try {
+			mc = ProfileServiceUtil.getBufferService(connection);
+		} catch (NamingException e) {
+			final String msg = "NamingException getting the SessionService"; //$NON-NLS-1$
+			LOG.error(msg, e);
+		} catch (Exception e1) {
+			final String msg = "Exception getting the SessionService"; //$NON-NLS-1$
+			LOG.error(msg, e1);
+		}
+		return mc;
+	}
+	
 	public static MetaValue getManagedProperty(
 			ProfileServiceConnection connection, ManagedComponent mc,
-			String property, MetaValue... args) throws Exception {
+			String property) throws Exception {
 
-		mc = getDQPManagementView(connection, mc);
-
+		ManagedProperty managedProperty = null;
 		try {
-			mc.getProperty(property);
+			managedProperty = mc.getProperty(property);
 		} catch (Exception e) {
 			final String msg = "Exception getting the AdminApi in " + property; //$NON-NLS-1$
 			LOG.error(msg, e);
 		}
 
+		if (managedProperty!=null){
+			return managedProperty.getValue(); 
+		}
+		
 		throw new Exception("No property found with given name =" + property); //$NON-NLS-1$
 	}
 
@@ -470,7 +506,8 @@
 	 * @return count
 	 * @throws Exception
 	 */
-	private int getErrorCount(ProfileServiceConnection connection, String vdbName) {
+	private int getErrorCount(ProfileServiceConnection connection,
+			String vdbName) {
 
 		ManagedComponent mcVdb = null;
 		try {
@@ -511,13 +548,14 @@
 		return count;
 	}
 
-	protected MetaValue getLongRunningQueries(ProfileServiceConnection connection) {
+	protected MetaValue getLongRunningQueries(
+			ProfileServiceConnection connection) {
 
 		MetaValue requestsCollection = null;
 		MetaValue args = null;
 
 		try {
-			requestsCollection = executeManagedOperation(connection, mc,
+			requestsCollection = executeManagedOperation(connection, getRuntimeEngineDeployer(connection, mc),
 					Platform.Operations.GET_LONGRUNNINGQUERIES, args);
 		} catch (Exception e) {
 			final String msg = "Exception executing operation: " + Platform.Operations.GET_LONGRUNNINGQUERIES; //$NON-NLS-1$
@@ -527,6 +565,22 @@
 		return requestsCollection;
 	}
 
+	protected MetaValue getUsedBufferSpace(
+			ProfileServiceConnection connection) {
+
+		MetaValue usedBufferSpace = null;
+
+		try {
+			usedBufferSpace = getManagedProperty(connection, getBufferService(connection, mc),
+					Platform.Operations.GET_BUFFER_USAGE);
+		} catch (Exception e) {
+			final String msg = "Exception executing operation: " + Platform.Operations.GET_BUFFER_USAGE; //$NON-NLS-1$
+			LOG.error(msg, e);
+		}
+
+		return usedBufferSpace;
+	}
+	
 	private void getRequestCollectionValue(MetaValue pValue,
 			Collection<Request> list) {
 		MetaType metaType = pValue.getMetaType();
@@ -546,14 +600,6 @@
 		}
 	}
 
-	private Collection<Session> getSessionsForVDB(ProfileServiceConnection connection, String vdbName) {
-		Collection<Session> activeSessionsCollection = Collections.emptyList();
-		MetaValue sessionMetaValue = getSessions(connection);
-		getSessionCollectionValueForVDB(sessionMetaValue,
-				activeSessionsCollection, vdbName);
-		return activeSessionsCollection;
-	}
-
 	public static <T> void getTransactionCollectionValue(MetaValue pValue,
 			Collection<Transaction> list) {
 		MetaType metaType = pValue.getMetaType();
@@ -567,7 +613,7 @@
 				} else {
 					throw new IllegalStateException(pValue
 							+ " is not a Composite type"); //$NON-NLS-1$
-				} 
+				}
 			}
 		}
 	}

Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformComponent.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformComponent.java	2010-07-15 18:40:42 UTC (rev 2352)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformComponent.java	2010-07-15 20:06:02 UTC (rev 2353)
@@ -59,10 +59,11 @@
  * 
  */
 public class PlatformComponent extends Facet {
-	private final Log LOG = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
+	private final Log LOG = LogFactory
+			.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
 
 	String[] PLATFORM_SERVICES_NAMES = { "RuntimeEngineDeployer",
-			"BufferService", "SessionService", "AdminSocketConfiguration" };
+			"BufferService", "SessionService", "JdbcSocketConfiguration" };
 
 	/*
 	 * (non-Javadoc)
@@ -92,7 +93,8 @@
 
 		RunState runState;
 		try {
-			runState = ProfileServiceUtil.getDQPManagementView(getConnection()).getRunState();
+			runState = ProfileServiceUtil.getRuntimeEngineDeployer(getConnection())
+					.getRunState();
 		} catch (NamingException e) {
 			LOG
 					.error("Naming exception getting: "
@@ -143,10 +145,11 @@
 
 				// Initialize any parameters to be used in the retrieval of
 				// metric values
-				
-				Object metricReturnObject = view.getMetric(getConnection(), getComponentType(),
-						this.getComponentIdentifier(), name, valueMap);
 
+				Object metricReturnObject = view.getMetric(getConnection(),
+						getComponentType(), this.getComponentIdentifier(),
+						name, valueMap);
+
 				try {
 					if (request
 							.getName()
@@ -168,8 +171,16 @@
 											PluginConstants.ComponentType.Platform.Metrics.LONG_RUNNING_QUERIES)) {
 								report.addData(new MeasurementDataNumeric(
 										request, (Double) metricReturnObject));
-							} 
-
+							} else {
+								if (request
+										.getName()
+										.equals(
+												PluginConstants.ComponentType.Platform.Metrics.BUFFER_USAGE)) {
+									report.addData(new MeasurementDataNumeric(
+											request,
+											(Double) metricReturnObject));
+								}
+							}
 						}
 					}
 
@@ -275,9 +286,11 @@
 		Set<ManagedComponent> mcSet = null;
 		try {
 			mcSet = ProfileServiceUtil
-					.getManagedComponents(getConnection(),new org.jboss.managed.api.ComponentType(
-							PluginConstants.ComponentType.Platform.TEIID_TYPE,
-							PluginConstants.ComponentType.Platform.TEIID_SUB_TYPE));
+					.getManagedComponents(
+							getConnection(),
+							new org.jboss.managed.api.ComponentType(
+									PluginConstants.ComponentType.Platform.TEIID_TYPE,
+									PluginConstants.ComponentType.Platform.TEIID_SUB_TYPE));
 		} catch (NamingException e) {
 			LOG
 					.error("NamingException getting components in Platform loadConfiguration(): "
@@ -298,7 +311,8 @@
 	 * @param mcMap
 	 * @param configuration
 	 */
-	private void setProperties(Map<String, ManagedProperty> mcMap, Configuration configuration) {
+	private void setProperties(Map<String, ManagedProperty> mcMap,
+			Configuration configuration) {
 		for (ManagedProperty mProp : mcMap.values()) {
 			try {
 				String value = ProfileServiceUtil.stringValue(mProp.getValue());
@@ -314,7 +328,8 @@
 
 	@Override
 	public ProfileServiceConnection getConnection() {
-		return ((ApplicationServerComponent)this.resourceContext.getParentResourceComponent()).getConnection();
+		return ((ApplicationServerComponent) this.resourceContext
+				.getParentResourceComponent()).getConnection();
 	}
 
 	@Override

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-07-15 18:40:42 UTC (rev 2352)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/util/PluginConstants.java	2010-07-15 20:06:02 UTC (rev 2353)
@@ -74,6 +74,7 @@
 				public final static String GET_REQUESTS = "getRequests"; //$NON-NLS-1$
 				public final static String GET_TRANSACTIONS = "getTransactions"; //$NON-NLS-1$
 				public final static String GET_SESSIONS = "getSessions"; //$NON-NLS-1$
+				public final static String GET_BUFFER_USAGE = "userBufferSpace"; //$NON-NLS-1$
 
 			}
 
@@ -82,6 +83,7 @@
 				public final static String QUERY_COUNT = "queryCount"; //$NON-NLS-1$            
 				public final static String SESSION_COUNT = "sessionCount"; //$NON-NLS-1$
 				public final static String LONG_RUNNING_QUERIES = "longRunningQueries"; //$NON-NLS-1$     
+				public final static String BUFFER_USAGE = "userBufferSpace"; //$NON-NLS-1$     
 
 			}
 		}

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-07-15 18:40:42 UTC (rev 2352)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/util/ProfileServiceUtil.java	2010-07-15 20:06:02 UTC (rev 2353)
@@ -82,6 +82,7 @@
 			.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY); 
 	private static ComponentType DQPTYPE = new ComponentType("teiid", "dqp"); //$NON-NLS-1$ //$NON-NLS-2$
 	private static String DQPNAME = "RuntimeEngineDeployer"; //$NON-NLS-1$
+	private static String BUFFERSERVICE = "BufferService"; //$NON-NLS-1$
 	private static final Map<String, ComponentType> COMPONENT_TYPE_CACHE = new HashMap<String, ComponentType>();
 	
 	protected static final String PLUGIN = "ProfileService"; //$NON-NLS-1$
@@ -240,13 +241,20 @@
 		return deployDir;
 	}
 
-	public static ManagedComponent getDQPManagementView(
+	public static ManagedComponent getRuntimeEngineDeployer(
 			ProfileServiceConnection connection) throws NamingException,
 			Exception {
 
 		return getManagedComponent(connection, DQPTYPE, DQPNAME);
 	}
+	
+	public static ManagedComponent getBufferService(
+			ProfileServiceConnection connection) throws NamingException,
+			Exception {
 
+		return getManagedComponent(connection, DQPTYPE, BUFFERSERVICE);
+	}
+
 	public static String stringValue(MetaValue v1) throws Exception {
 		if (v1 != null) {
 			MetaType type = v1.getMetaType();
@@ -271,6 +279,18 @@
 		return null;
 	}
 
+	public static Double doubleValue(MetaValue v1) throws Exception {
+		if (v1 != null) {
+			MetaType type = v1.getMetaType();
+			if (type instanceof SimpleMetaType) {
+				SimpleValue simple = (SimpleValue) v1;
+				return Double.valueOf(simple.getValue().toString());
+			}
+			throw new Exception("Failed to convert value to boolean value"); //$NON-NLS-1$
+		}
+		return null;
+	}
+	
 	public static <T> T getSimpleValue(ManagedComponent mc, String prop,
 			Class<T> expectedType) {
 		ManagedProperty mp = mc.getProperty(prop);

Modified: trunk/console/src/main/resources/META-INF/rhq-plugin.xml
===================================================================
--- trunk/console/src/main/resources/META-INF/rhq-plugin.xml	2010-07-15 18:40:42 UTC (rev 2352)
+++ trunk/console/src/main/resources/META-INF/rhq-plugin.xml	2010-07-15 20:06:02 UTC (rev 2353)
@@ -242,7 +242,7 @@
 
 		<metric displayName="Query Count" defaultOn="true" displayType="detail"
 			category="throughput" property="queryCount"
-			description="The number of queries for a given point in time" />
+			description="The number of queries currently active." />
 
 		<metric displayName="Long Running Queries" defaultOn="true"
 			displayType="detail" category="performance" property="longRunningQueries"
@@ -250,8 +250,12 @@
 
 		<metric displayName="Session Count" defaultOn="true"
 			displayType="detail" category="throughput" property="sessionCount"
-			description="The number of user connections for a given point in time" />
+			description="The number of user connections currently active." />
 
+		<metric displayName="Used Buffer Space" defaultOn="true"
+			displayType="detail" category="throughput" property="userBufferSpace"
+			description="The currently used file buffer space in MB." />
+
 		<resource-configuration>
 			<c:group name="teiidProperties" displayName="Runtime Engine Properties"
 				hiddenByDefault="false">
@@ -304,8 +308,9 @@
 					displayName="Active Session Count" description="Count of active sessions"
 					required="false" readOnly="false" />
 				<c:simple-property name="queryThresholdInSecs"
-					displayName="Long Running Query Threshold" description="Length of time in seconds before a query is considered long running"
-					required="false" readOnly="false" />	
+					displayName="Long Running Query Threshold"
+					description="Length of time in seconds before a query is considered long running"
+					required="false" readOnly="false" />
 			</c:group>
 			<c:group name="bufferServiceProperties" displayName="Buffer Service Properties"
 				hiddenByDefault="false">
@@ -470,26 +475,29 @@
 					<c:simple-property name="url" type="string"
 						description="The Virtual Database URL" required="false" readOnly="true" />
 				</c:group>
-				<c:group name="Translators" displayName="Translators" hiddenByDefault="false">
-					<c:list-property name="translators" displayName="Overrides" readOnly="true"
-						description="The translator overrides for this VDB">
-						<c:map-property name="map" description="Translator Overrides for this VDB">
+				<c:group name="Translators" displayName="Translators"
+					hiddenByDefault="false">
+					<c:list-property name="translators" displayName="Overrides"
+						readOnly="true" description="The translator overrides for this VDB">
+						<c:map-property name="map"
+							description="Translator Overrides for this VDB">
 							<c:simple-property name="name" displayName="Name"
-								description="Name of this translator instance" required="true" readOnly="true" />
-							<c:simple-property name="type"
-								displayName="Translator type" description="Translator type"
-								required="false" readOnly="true" />
+								description="Name of this translator instance" required="true"
+								readOnly="true" />
+							<c:simple-property name="type" displayName="Translator type"
+								description="Translator type" required="false" readOnly="true" />
 							<c:simple-property name="propertyName"
 								displayName="Property Name" description="Property Name"
-								required="false" readOnly="true"/>
-							<c:simple-property name="propertyValue" displayName="Property Value"
-								description="Property Value" required="false" />
+								required="false" readOnly="true" />
+							<c:simple-property name="propertyValue"
+								displayName="Property Value" description="Property Value"
+								required="false" />
 						</c:map-property>
 					</c:list-property>
 				</c:group>
 				<c:group name="Models" displayName="Models" hiddenByDefault="false">
-					<c:list-property name="singleSourceModels" readOnly="true"
-						description="The source models for this VDB">
+					<c:list-property name="singleSourceModels"
+						readOnly="true" description="The source models for this VDB">
 						<c:map-property name="map" description="Properties for this model">
 							<c:simple-property name="name" displayName="Name"
 								description="Name of the model" required="true" readOnly="true" />
@@ -498,17 +506,17 @@
 								required="false" readOnly="true" />
 							<c:simple-property name="translatorName"
 								displayName="Translator Name" description="Name of the translator"
-								required="false" readOnly="true"/>
+								required="false" readOnly="true" />
 							<c:simple-property name="jndiName" displayName="Connection JNDI Name"
 								description="JNDI name for this connection" required="false" />
 							<c:simple-property name="visibility"
 								displayName="Visible" description="Visibility of the model"
-								required="true" type="boolean" readOnly="true"> 
+								required="true" type="boolean" readOnly="true">
 							</c:simple-property>
 							<c:simple-property name="supportsMultiSource"
 								displayName="Supports Multi-source?"
 								description="Determines if this model supports multi-source bindings"
-								required="true" default="true" type="boolean" readOnly="true"/>
+								required="true" default="true" type="boolean" readOnly="true" />
 						</c:map-property>
 					</c:list-property>
 
@@ -518,7 +526,8 @@
 							<c:simple-property name="name" displayName="Name"
 								description="Name of the model" required="true" readOnly="true" />
 							<c:simple-property name="sourceName"
-								displayName="Source Name" description="Source name for this model" readOnly="true"/>
+								displayName="Source Name" description="Source name for this model"
+								readOnly="true" />
 							<c:simple-property name="translatorName"
 								displayName="Translator Name" description="Name of the translator"
 								required="true" />
@@ -536,7 +545,7 @@
 								description="type of logical model" required="true" readOnly="true" />
 							<c:simple-property name="visibility"
 								displayName="Visible" description="Visbility of the model"
-								required="true" default="true" readOnly="true"/>
+								required="true" default="true" readOnly="true" />
 						</c:map-property>
 					</c:list-property>
 				</c:group>
@@ -560,12 +569,15 @@
 			createDeletePolicy="both" creationDataType="configuration">
 
 			<resource-configuration>
-				<c:simple-property name="name" displayName="Name" description="Name of the translator" readOnly="true" required="false"/>
-				<c:list-property name="translatorList" readOnly="true" required="false"
-                			displayName="Properties" description="Translator properties">
+				<c:simple-property name="name" displayName="Name"
+					description="Name of the translator" readOnly="true" required="false" />
+				<c:list-property name="translatorList" readOnly="true"
+					required="false" displayName="Properties" description="Translator properties">
 					<c:map-property name="properties" readOnly="true">
-						<c:simple-property name="name" displayName="Name" description="Name of this property" readOnly="true" />
-						<c:simple-property name="value" displayName="Value"	description="Value of this property" readOnly="true"/>
+						<c:simple-property name="name" displayName="Name"
+							description="Name of this property" readOnly="true" />
+						<c:simple-property name="value" displayName="Value"
+							description="Value of this property" readOnly="true" />
 					</c:map-property>
 				</c:list-property>
 



More information about the teiid-commits mailing list