teiid SVN: r678 - trunk/embedded/src/test/java/com/metamatrix/jdbc.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2009-03-31 18:46:16 -0400 (Tue, 31 Mar 2009)
New Revision: 678
Modified:
trunk/embedded/src/test/java/com/metamatrix/jdbc/TestEmbeddedDriver.java
Log:
TEIID-449: Added "JDBC" as the default client application name to driver.
Modified: trunk/embedded/src/test/java/com/metamatrix/jdbc/TestEmbeddedDriver.java
===================================================================
--- trunk/embedded/src/test/java/com/metamatrix/jdbc/TestEmbeddedDriver.java 2009-03-31 22:06:22 UTC (rev 677)
+++ trunk/embedded/src/test/java/com/metamatrix/jdbc/TestEmbeddedDriver.java 2009-03-31 22:46:16 UTC (rev 678)
@@ -86,7 +86,7 @@
driver.parseURL("jdbc:metamatrix:BQT@c:\\metamatrix\\dqp\\dqp.properties", p); //$NON-NLS-1$
assertTrue(p.getProperty(BaseDataSource.VDB_NAME).equals("BQT")); //$NON-NLS-1$
assertTrue(p.get(EmbeddedDataSource.DQP_BOOTSTRAP_FILE).toString().equals("mmfile:/c:/metamatrix/dqp/dqp.properties")); //$NON-NLS-1$
- assertEquals(2, p.size());
+ assertEquals(3, p.size());
}
public void testParseURL2() throws SQLException {
@@ -96,7 +96,7 @@
assertTrue(p.get(EmbeddedDataSource.DQP_BOOTSTRAP_FILE).toString().equals("mmfile:/metamatrix/dqp/dqp.properties")); //$NON-NLS-1$
assertTrue(p.getProperty(BaseDataSource.VDB_VERSION).equals("3")); //$NON-NLS-1$
assertTrue(p.getProperty(BaseDataSource.VERSION).equals("3")); //$NON-NLS-1$
- assertEquals(4, p.size());
+ assertEquals(5, p.size());
}
public void testParseURL3() throws SQLException{
@@ -107,7 +107,7 @@
assertTrue(p.getProperty(BaseDataSource.VERSION).equals("4")); //$NON-NLS-1$
assertTrue(p.getProperty(ExecutionProperties.PROP_TXN_AUTO_WRAP).equals("ON")); //$NON-NLS-1$
assertTrue(p.getProperty(ExecutionProperties.PROP_PARTIAL_RESULTS_MODE).equals("YES")); //$NON-NLS-1$
- assertEquals(6, p.size());
+ assertEquals(7, p.size());
}
public void testParseURL4() throws SQLException{
@@ -116,7 +116,7 @@
assertTrue(p.getProperty(BaseDataSource.VDB_NAME).equals("BQT")); //$NON-NLS-1$
assertTrue(p.get(EmbeddedDataSource.DQP_BOOTSTRAP_FILE).toString().equals("mmfile:testdata/dqp/dqp.properties")); //$NON-NLS-1$
assertTrue(p.getProperty(ExecutionProperties.PROP_PARTIAL_RESULTS_MODE).equals("true")); //$NON-NLS-1$
- assertEquals(3, p.size());
+ assertEquals(4, p.size());
}
public void testParseURL5() throws SQLException{
@@ -141,7 +141,7 @@
assertTrue(p.getProperty(ExecutionProperties.PROP_PARTIAL_RESULTS_MODE).equals("true")); //$NON-NLS-1$
assertTrue(p.getProperty(BaseDataSource.VDB_VERSION).equals("1")); //$NON-NLS-1$
assertTrue(p.getProperty("vdb.definition").equals("BQT.vdb")); //$NON-NLS-1$ //$NON-NLS-2$
- assertEquals(6, p.size());
+ assertEquals(7, p.size());
}
15 years, 1 month
teiid SVN: r677 - trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2009-03-31 18:06:22 -0400 (Tue, 31 Mar 2009)
New Revision: 677
Modified:
trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorWrapper.java
Log:
TEIID-164: anticipating for getting null connections due to unavailability of the underlying data source
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorWrapper.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorWrapper.java 2009-03-31 21:36:16 UTC (rev 676)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorWrapper.java 2009-03-31 22:06:22 UTC (rev 677)
@@ -98,7 +98,9 @@
} catch (ConnectorException e) {
return Boolean.FALSE;
} finally {
- conn.close();
+ if (conn != null) {
+ conn.close();
+ }
}
}
return null;
15 years, 1 month
teiid SVN: r676 - in trunk/server/src/main/java/com/metamatrix: platform/vm/controller and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2009-03-31 17:36:16 -0400 (Tue, 31 Mar 2009)
New Revision: 676
Modified:
trunk/server/src/main/java/com/metamatrix/platform/registry/ClusteredRegistryState.java
trunk/server/src/main/java/com/metamatrix/platform/vm/controller/ProcessController.java
trunk/server/src/main/java/com/metamatrix/server/Main.java
Log:
TEIID-302, TEIID-443: ServiceExceptions were not being logged. The registry was sending the updates to the registry during shutdown, which in turn kicks off the updates of its own, which was causing errors in the JGroups communication. By removing the listeners during the shutdown, it will no longer invoke a unnecessary update.
Modified: trunk/server/src/main/java/com/metamatrix/platform/registry/ClusteredRegistryState.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/platform/registry/ClusteredRegistryState.java 2009-03-31 21:27:02 UTC (rev 675)
+++ trunk/server/src/main/java/com/metamatrix/platform/registry/ClusteredRegistryState.java 2009-03-31 21:36:16 UTC (rev 676)
@@ -317,4 +317,9 @@
l.registryChanged();
}
}
+
+ public void shutdown() {
+ this.cache.removeListener();
+ this.listeners.clear();
+ }
}
Modified: trunk/server/src/main/java/com/metamatrix/platform/vm/controller/ProcessController.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/platform/vm/controller/ProcessController.java 2009-03-31 21:27:02 UTC (rev 675)
+++ trunk/server/src/main/java/com/metamatrix/platform/vm/controller/ProcessController.java 2009-03-31 21:36:16 UTC (rev 676)
@@ -353,10 +353,9 @@
DeployedComponent depComp = (DeployedComponent) servicesIterator.next();
try {
startDeployedService(depComp, null, configuration, true);
- } catch (Exception e) {
+ } catch (ServiceException e) {
errored = true;
- // error already logged from startDeployedService method.
- // continue starting services.
+ logException(e, e.getMessage());
}
}
@@ -369,9 +368,8 @@
DeployedComponent depComp = (DeployedComponent) servicesIterator.next();
try {
startDeployedService(depComp, null, configuration, false);
- } catch (Exception e) {
- // error already logged from startDeployedService method.
- // continue starting services.
+ } catch (ServiceException e) {
+ logException(e, e.getMessage());
}
}
logMessage(PlatformPlugin.Util.getString(LogMessageKeys.VM_0016, new Integer(deployedServices.size()), vmComponentDefnID.getName()));
@@ -404,8 +402,7 @@
try {
ConfigurationModelContainer configuration = getConfigurationModel();
startDeployedService(binding.getDeployedComponent(), serviceID, configuration, true);
-
- } catch (Exception e) {
+ } catch (ConfigurationException e) {
throw new ServiceException(e, PlatformPlugin.Util.getString(LogMessageKeys.VM_0022, serviceID));
}
}
@@ -421,9 +418,8 @@
VMComponentDefnID vmComponentDefnID = (VMComponentDefnID)this.vmComponentDefn.getID();
DeployedComponent deployedService = configuration.getConfiguration().getDeployedServiceForVM(defnID, vmComponentDefnID, (HostID) getConfigHost().getID());
startDeployedService(deployedService, serviceID, configuration, true);
- } catch (Exception e) {
- String msg = PlatformPlugin.Util.getString(LogMessageKeys.VM_0024, defnID);
- throw new ServiceException(e, msg);
+ } catch (ConfigurationException e) {
+ throw new ServiceException(e, PlatformPlugin.Util.getString(LogMessageKeys.VM_0024, defnID));
}
}
@@ -434,7 +430,7 @@
* If synch is false then start service asynchronously.
* @throws ConfigurationException
*/
- private void startDeployedService(DeployedComponent deployedService, ServiceID serviceID, ConfigurationModelContainer configModel, boolean synch) throws ConfigurationException {
+ private void startDeployedService(DeployedComponent deployedService, ServiceID serviceID, ConfigurationModelContainer configModel, boolean synch) {
Properties defaultProps = null;
synchronized (this) {
defaultProps = defaultPropertiesCache.get(deployedService.getComponentTypeID());
@@ -496,9 +492,7 @@
} catch (ServiceException e) {
logException(e, e.getMessage());
}
-
- JDBCConnectionPoolHelper.getInstance().shutDown();
-
+
// unregister VMController
events.processRemoved(host.getFullName(), this.processName);
@@ -697,16 +691,16 @@
//add work to the pool
startServicePool.execute( new Runnable() {
public void run() {
- startService(clientServiceRegistry, serviceID, deployedComponent,serviceClassName, pscID, serviceProps);
+ try {
+ startService(clientServiceRegistry, serviceID, deployedComponent,serviceClassName, pscID, serviceProps);
+ } catch (ServiceException e) {
+ logException(e, e.getMessage());
+ }
}
});
} else {
//start synchronously
- try {
- startService(clientServiceRegistry, serviceID, deployedComponent,serviceClassName, pscID, serviceProps);
- } catch (Exception e) {
- throw new ServiceException(e);
- }
+ startService(clientServiceRegistry, serviceID, deployedComponent,serviceClassName, pscID, serviceProps);
}
}
@@ -804,8 +798,12 @@
logMessage(PlatformPlugin.Util.getString(LogMessageKeys.SERVICE_0009, serviceType, serviceInstanceName));
- } catch (Exception e) {
- throw new ServiceException(e, PlatformPlugin.Util.getString(ErrorMessageKeys.SERVICE_0028, serviceInstanceName));
+ } catch (ClassNotFoundException e) {
+ throw new ServiceException(e, PlatformPlugin.Util.getString(ErrorMessageKeys.SERVICE_0028, serviceInstanceName));
+ } catch (IllegalAccessException e) {
+ throw new ServiceException(e, PlatformPlugin.Util.getString(ErrorMessageKeys.SERVICE_0028, serviceInstanceName));
+ } catch (InstantiationException e){
+ throw new ServiceException(e, PlatformPlugin.Util.getString(ErrorMessageKeys.SERVICE_0028, serviceInstanceName));
} finally {
Thread.currentThread().setContextClassLoader(currentClassLoader);
}
Modified: trunk/server/src/main/java/com/metamatrix/server/Main.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/server/Main.java 2009-03-31 21:27:02 UTC (rev 675)
+++ trunk/server/src/main/java/com/metamatrix/server/Main.java 2009-03-31 21:36:16 UTC (rev 676)
@@ -28,6 +28,7 @@
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.metamatrix.common.config.CurrentConfiguration;
+import com.metamatrix.common.config.JDBCConnectionPoolHelper;
import com.metamatrix.common.config.api.Host;
import com.metamatrix.common.config.api.VMComponentDefn;
import com.metamatrix.common.config.api.exceptions.ConfigurationException;
@@ -39,6 +40,7 @@
import com.metamatrix.core.util.StringUtil;
import com.metamatrix.dqp.ResourceFinder;
import com.metamatrix.platform.PlatformPlugin;
+import com.metamatrix.platform.registry.ClusteredRegistryState;
import com.metamatrix.platform.vm.api.controller.ProcessManagement;
/**
@@ -55,6 +57,9 @@
@Inject
LogListener logListener;
+ @Inject
+ ClusteredRegistryState registry;
+
public static void main(String[] args) {
try {
@@ -164,6 +169,8 @@
@Override
public void run() {
+ registry.shutdown();
+
try {
messageBus.shutdown();
} catch (MessagingException e) {
@@ -175,6 +182,9 @@
// shutdown logging
logListener.shutdown();
+
+ // close the connection pool to the DB
+ JDBCConnectionPoolHelper.getInstance().shutDown();
}
}
}
15 years, 1 month
teiid SVN: r675 - in trunk/client-jdbc/src: main/resources/com/metamatrix/jdbc and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2009-03-31 17:27:02 -0400 (Tue, 31 Mar 2009)
New Revision: 675
Modified:
trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/BaseDataSource.java
trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDriver.java
trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDriver.java
trunk/client-jdbc/src/main/resources/com/metamatrix/jdbc/i18n.properties
trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMDataSource.java
trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMDriver.java
Log:
TEIID-449: Added "JDBC" as the default client application name to driver.
Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/BaseDataSource.java
===================================================================
--- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/BaseDataSource.java 2009-03-31 21:10:32 UTC (rev 674)
+++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/BaseDataSource.java 2009-03-31 21:27:02 UTC (rev 675)
@@ -100,7 +100,8 @@
* </p>
*/
public abstract class BaseDataSource extends WrapperImpl implements javax.sql.DataSource, XADataSource, ConnectionPoolDataSource, java.io.Serializable {
-
+ public static final String DEFAULT_APP_NAME = "JDBC"; //$NON-NLS-1$
+
// constant indicating Virtual database name
public static final String VDB_NAME = MMURL.JDBC.VDB_NAME;
// constant indicating Virtual database version
@@ -545,7 +546,7 @@
* @return String the application name; may be null or zero-length
*/
public String getApplicationName() {
- return applicationName;
+ return applicationName!=null?applicationName:DEFAULT_APP_NAME;
}
/**
Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDriver.java
===================================================================
--- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDriver.java 2009-03-31 21:10:32 UTC (rev 674)
+++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDriver.java 2009-03-31 21:27:02 UTC (rev 675)
@@ -214,6 +214,9 @@
if(! info.containsKey(BaseDataSource.VDB_VERSION) && jdbcURL.getVDBVersion() != null) {
info.setProperty(BaseDataSource.VDB_VERSION, jdbcURL.getVDBVersion());
}
+ if(!info.containsKey(BaseDataSource.APP_NAME)) {
+ info.setProperty(BaseDataSource.APP_NAME, BaseDataSource.DEFAULT_APP_NAME);
+ }
// Add the DQP URL as the configuration URL
info.put(EmbeddedDataSource.DQP_BOOTSTRAP_FILE, dqpURL);
Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDriver.java
===================================================================
--- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDriver.java 2009-03-31 21:10:32 UTC (rev 674)
+++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDriver.java 2009-03-31 21:27:02 UTC (rev 675)
@@ -177,9 +177,12 @@
}
// add the property only if it is new because they could have
// already been specified either through url or otherwise.
- if(! info.containsKey(BaseDataSource.VDB_VERSION) && jdbcURL.getVDBVersion() != null) {
+ if(!info.containsKey(BaseDataSource.VDB_VERSION) && jdbcURL.getVDBVersion() != null) {
info.setProperty(BaseDataSource.VDB_VERSION, jdbcURL.getVDBVersion());
}
+ if(!info.containsKey(BaseDataSource.APP_NAME)) {
+ info.setProperty(BaseDataSource.APP_NAME, BaseDataSource.DEFAULT_APP_NAME);
+ }
} catch(IllegalArgumentException iae) {
throw new MMSQLException(JDBCPlugin.Util.getString("MMDriver.urlFormat")); //$NON-NLS-1$
Modified: trunk/client-jdbc/src/main/resources/com/metamatrix/jdbc/i18n.properties
===================================================================
--- trunk/client-jdbc/src/main/resources/com/metamatrix/jdbc/i18n.properties 2009-03-31 21:10:32 UTC (rev 674)
+++ trunk/client-jdbc/src/main/resources/com/metamatrix/jdbc/i18n.properties 2009-03-31 21:27:02 UTC (rev 675)
@@ -224,3 +224,5 @@
StoredProcedureCall.procname=Expected a procedure name
WrapperImpl.wrong_class=Wrapped object is not an instance of {0}
MMSQLXML.unsupported_source=Unsupported source class {0}
+MMXAConnection.rolling_back=rolling back transaction.
+MMXAConnection.rolling_back_error=Error while rolling back transaction.
\ No newline at end of file
Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMDataSource.java
===================================================================
--- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMDataSource.java 2009-03-31 21:10:32 UTC (rev 674)
+++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMDataSource.java 2009-03-31 21:27:02 UTC (rev 675)
@@ -235,6 +235,17 @@
assertEquals(result,STD_DATABASE_NAME);
}
+ public void testGetDefaultApplicationName() {
+ final String result = dataSource.getApplicationName();
+ assertEquals(result,BaseDataSource.DEFAULT_APP_NAME);
+ }
+
+ public void testGetApplicationName() {
+ dataSource.setApplicationName("ClientApp"); //$NON-NLS-1$
+ final String result = dataSource.getApplicationName();
+ assertEquals(result,"ClientApp"); //$NON-NLS-1$
+ }
+
public void testGetPortNumber() {
final int result = dataSource.getPortNumber();
assertEquals(result,STD_PORT_NUMBER);
@@ -504,7 +515,7 @@
final String partialMode = "true"; //$NON-NLS-1$
final boolean secure = false;
helpTestBuildingURL(vdbName,vdbVersion,serverName,portNumber,null,transactionAutoWrap, partialMode, 500, false, secure,
- "jdbc:metamatrix:vdbName@mm://hostname:7001;fetchSize=500;serverURL=mm://hostname:7001;VirtualDatabaseVersion=1.2.3;partialResultsMode=true;VirtualDatabaseName=vdbName"); //$NON-NLS-1$
+ "jdbc:metamatrix:vdbName@mm://hostname:7001;fetchSize=500;ApplicationName=JDBC;serverURL=mm://hostname:7001;VirtualDatabaseVersion=1.2.3;partialResultsMode=true;VirtualDatabaseName=vdbName"); //$NON-NLS-1$
}
public void testBuildingURL2() {
@@ -516,7 +527,7 @@
final String partialMode = "false"; //$NON-NLS-1$
final boolean secure = false;
helpTestBuildingURL(vdbName,vdbVersion,serverName,portNumber,null,transactionAutoWrap, partialMode, -1, false, secure,
- "jdbc:metamatrix:vdbName@mm://hostname:7001;serverURL=mm://hostname:7001;txnAutoWrap=PESSIMISTIC;partialResultsMode=false;VirtualDatabaseName=vdbName"); //$NON-NLS-1$
+ "jdbc:metamatrix:vdbName@mm://hostname:7001;ApplicationName=JDBC;serverURL=mm://hostname:7001;txnAutoWrap=PESSIMISTIC;partialResultsMode=false;VirtualDatabaseName=vdbName"); //$NON-NLS-1$
}
public void testBuildURL3() {
@@ -528,7 +539,7 @@
final String partialMode = "false"; //$NON-NLS-1$
final boolean secure = false;
helpTestBuildingURL(vdbName,vdbVersion,serverName,portNumber,null,transactionAutoWrap, partialMode, -1, true, secure,
- "jdbc:metamatrix:vdbName@mm://hostname:7001;serverURL=mm://hostname:7001;txnAutoWrap=PESSIMISTIC;partialResultsMode=false;VirtualDatabaseName=vdbName;sqlOptions=SHOWPLAN"); //$NON-NLS-1$
+ "jdbc:metamatrix:vdbName@mm://hostname:7001;ApplicationName=JDBC;serverURL=mm://hostname:7001;txnAutoWrap=PESSIMISTIC;partialResultsMode=false;VirtualDatabaseName=vdbName;sqlOptions=SHOWPLAN"); //$NON-NLS-1$
}
// Test secure protocol
@@ -541,7 +552,7 @@
final String partialMode = "false"; //$NON-NLS-1$
final boolean secure = true;
helpTestBuildingURL(vdbName,vdbVersion,serverName,portNumber,null,transactionAutoWrap, partialMode, -1, true, secure,
- "jdbc:metamatrix:vdbName@mms://hostname:7001;serverURL=mms://hostname:7001;txnAutoWrap=PESSIMISTIC;partialResultsMode=false;VirtualDatabaseName=vdbName;sqlOptions=SHOWPLAN"); //$NON-NLS-1$
+ "jdbc:metamatrix:vdbName@mms://hostname:7001;ApplicationName=JDBC;serverURL=mms://hostname:7001;txnAutoWrap=PESSIMISTIC;partialResultsMode=false;VirtualDatabaseName=vdbName;sqlOptions=SHOWPLAN"); //$NON-NLS-1$
}
/*
@@ -559,7 +570,7 @@
final String partialMode = "false"; //$NON-NLS-1$
final boolean secure = false;
helpTestBuildingURL(vdbName,vdbVersion,serverName,portNumber,alternateServers,transactionAutoWrap, partialMode, -1, true, secure,
- "jdbc:metamatrix:vdbName@mm://hostName:7001,hostName:7002,hostName2:7001,hostName2:7002;serverURL=mm://hostName:7001,hostName:7002,hostName2:7001,hostName2:7002;txnAutoWrap=PESSIMISTIC;partialResultsMode=false;VirtualDatabaseName=vdbName;sqlOptions=SHOWPLAN"); //$NON-NLS-1$
+ "jdbc:metamatrix:vdbName@mm://hostName:7001,hostName:7002,hostName2:7001,hostName2:7002;ApplicationName=JDBC;serverURL=mm://hostName:7001,hostName:7002,hostName2:7001,hostName2:7002;txnAutoWrap=PESSIMISTIC;partialResultsMode=false;VirtualDatabaseName=vdbName;sqlOptions=SHOWPLAN"); //$NON-NLS-1$
}
/*
@@ -577,7 +588,7 @@
final String partialMode = "false"; //$NON-NLS-1$
final boolean secure = true;
helpTestBuildingURL(vdbName,vdbVersion,serverName,portNumber,alternateServers,transactionAutoWrap, partialMode, -1, true, secure,
- "jdbc:metamatrix:vdbName@mms://hostName:7001,hostName:7002,hostName2:7001,hostName2:7002;serverURL=mms://hostName:7001,hostName:7002,hostName2:7001,hostName2:7002;txnAutoWrap=PESSIMISTIC;partialResultsMode=false;VirtualDatabaseName=vdbName;sqlOptions=SHOWPLAN"); //$NON-NLS-1$
+ "jdbc:metamatrix:vdbName@mms://hostName:7001,hostName:7002,hostName2:7001,hostName2:7002;ApplicationName=JDBC;serverURL=mms://hostName:7001,hostName:7002,hostName2:7001,hostName2:7002;txnAutoWrap=PESSIMISTIC;partialResultsMode=false;VirtualDatabaseName=vdbName;sqlOptions=SHOWPLAN"); //$NON-NLS-1$
}
/*
@@ -596,7 +607,7 @@
final String partialMode = "false"; //$NON-NLS-1$
final boolean secure = false;
helpTestBuildingURL(vdbName,vdbVersion,serverName,portNumber,alternateServers,transactionAutoWrap, partialMode, -1, true, secure,
- "jdbc:metamatrix:vdbName@mm://hostName:7001,hostName:7002,hostName2:7001,hostName2:7002;serverURL=mm://hostName:7001,hostName:7002,hostName2:7001,hostName2:7002;txnAutoWrap=PESSIMISTIC;partialResultsMode=false;VirtualDatabaseName=vdbName;sqlOptions=SHOWPLAN"); //$NON-NLS-1$
+ "jdbc:metamatrix:vdbName@mm://hostName:7001,hostName:7002,hostName2:7001,hostName2:7002;ApplicationName=JDBC;serverURL=mm://hostName:7001,hostName:7002,hostName2:7001,hostName2:7002;txnAutoWrap=PESSIMISTIC;partialResultsMode=false;VirtualDatabaseName=vdbName;sqlOptions=SHOWPLAN"); //$NON-NLS-1$
}
public void testBuildURL_AdditionalProperties() {
@@ -605,7 +616,7 @@
ds.setServerName("hostName"); //$NON-NLS-1$
ds.setDatabaseName("vdbName"); //$NON-NLS-1$
ds.setPortNumber(1);
- assertEquals("jdbc:metamatrix:vdbName@mm://hostname:1;fetchSize=2000;serverURL=mm://hostname:1;a=b;VirtualDatabaseName=vdbName;foo=bar", ds.buildURL()); //$NON-NLS-1$
+ assertEquals("jdbc:metamatrix:vdbName@mm://hostname:1;fetchSize=2000;ApplicationName=JDBC;serverURL=mm://hostname:1;a=b;VirtualDatabaseName=vdbName;foo=bar", ds.buildURL()); //$NON-NLS-1$
}
public void testInvalidDataSource() {
Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMDriver.java
===================================================================
--- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMDriver.java 2009-03-31 21:10:32 UTC (rev 674)
+++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMDriver.java 2009-03-31 21:27:02 UTC (rev 675)
@@ -98,7 +98,7 @@
MMDriver.getInstance().parseURL("jdbc:metamatrix:BQT@mm://slwxp157:1234", p); //$NON-NLS-1$
assertTrue(p.getProperty(BaseDataSource.VDB_NAME).equals("BQT")); //$NON-NLS-1$
assertTrue(p.getProperty(MMURL.CONNECTION.SERVER_URL).equals("mm://slwxp157:1234")); //$NON-NLS-1$
- assertEquals(2, p.size());
+ assertEquals(3, p.size());
}
public void testParseURL2() throws SQLException {
@@ -108,19 +108,21 @@
assertTrue(p.getProperty(BaseDataSource.VDB_VERSION).equals("3")); //$NON-NLS-1$
assertTrue(p.getProperty(MMURL.CONNECTION.SERVER_URL).equals("mms://slwxp157:1234")); //$NON-NLS-1$
assertTrue(p.getProperty(BaseDataSource.VERSION).equals("3")); //$NON-NLS-1$
- assertEquals(4, p.size());
+ assertTrue(p.getProperty(BaseDataSource.APP_NAME).equals(BaseDataSource.DEFAULT_APP_NAME));
+ assertEquals(5, p.size());
}
public void testParseURL3() throws SQLException{
Properties p = new Properties();
- MMDriver.getInstance().parseURL("jdbc:metamatrix:BQT@mm://slwxp157:1234,slntmm01:43401,sluxmm09:43302;version=4;txnAutoWrap=ON;partialResultsMode=YES", p); //$NON-NLS-1$
+ MMDriver.getInstance().parseURL("jdbc:metamatrix:BQT@mm://slwxp157:1234,slntmm01:43401,sluxmm09:43302;version=4;txnAutoWrap=ON;partialResultsMode=YES;ApplicationName=Client", p); //$NON-NLS-1$
assertTrue(p.getProperty(BaseDataSource.VDB_NAME).equals("BQT")); //$NON-NLS-1$
assertTrue(p.getProperty(BaseDataSource.VDB_VERSION).equals("4")); //$NON-NLS-1$
assertTrue(p.getProperty(ExecutionProperties.PROP_TXN_AUTO_WRAP).equals("ON")); //$NON-NLS-1$
assertTrue(p.getProperty(ExecutionProperties.PROP_PARTIAL_RESULTS_MODE).equals("YES")); //$NON-NLS-1$
assertTrue(p.getProperty(MMURL.CONNECTION.SERVER_URL).equals("mm://slwxp157:1234,slntmm01:43401,sluxmm09:43302")); //$NON-NLS-1$
assertTrue(p.getProperty(BaseDataSource.VERSION).equals("4")); //$NON-NLS-1$
- assertEquals(6, p.size());
+ assertTrue(p.getProperty(BaseDataSource.APP_NAME).equals("Client")); //$NON-NLS-1$
+ assertEquals(7, p.size());
}
public void testGetPropertyInfo1() throws Exception {
15 years, 1 month
teiid SVN: r674 - trunk/server/src/main/java/com/metamatrix/common/jdbc/db.
by teiid-commits＠lists.jboss.org
Author: vhalbert(a)redhat.com
Date: 2009-03-31 17:10:32 -0400 (Tue, 31 Mar 2009)
New Revision: 674
Modified:
trunk/server/src/main/java/com/metamatrix/common/jdbc/db/PostgresPlatform.java
Log:
TEIID-448 - Error Finding Latest active VDB suing Postgres as a Repository - The PostgresPlatform needed to override the default to add its specific UPPER operator to its platform.
Modified: trunk/server/src/main/java/com/metamatrix/common/jdbc/db/PostgresPlatform.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/common/jdbc/db/PostgresPlatform.java 2009-03-31 21:08:57 UTC (rev 673)
+++ trunk/server/src/main/java/com/metamatrix/common/jdbc/db/PostgresPlatform.java 2009-03-31 21:10:32 UTC (rev 674)
@@ -25,8 +25,10 @@
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
+import java.util.Map;
import com.metamatrix.common.jdbc.JDBCPlatform;
+import com.metamatrix.common.jdbc.syntax.ExpressionOperator;
public class PostgresPlatform extends JDBCPlatform {
@@ -42,8 +44,18 @@
public boolean isDefault() {
return false;
- }
+ }
+
+ protected Map buildPlatformOperators() {
+ Map operators = super.buildPlatformOperators();
+ // override for Oracle specfic
+ addOperator(ExpressionOperator.simpleFunction("toUpperCase","UPPER")); //$NON-NLS-1$ //$NON-NLS-2$
+
+ return operators;
+
+ }
+
public boolean isClosed(Connection connection) {
if(!super.isClosed(connection)) {
15 years, 1 month
teiid SVN: r673 - trunk/server/src/main/java/com/metamatrix/common/jdbc.
by teiid-commits＠lists.jboss.org
Author: vhalbert(a)redhat.com
Date: 2009-03-31 17:08:57 -0400 (Tue, 31 Mar 2009)
New Revision: 673
Modified:
trunk/server/src/main/java/com/metamatrix/common/jdbc/JDBCPlatform.java
Log:
TEIID-448 - Error Finding Latest active VDB suing Postgres as a Repository - The PostgresPlatform needed to override the default to add its specific UPPER operator to its platform.
Modified: trunk/server/src/main/java/com/metamatrix/common/jdbc/JDBCPlatform.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/common/jdbc/JDBCPlatform.java 2009-03-31 20:53:45 UTC (rev 672)
+++ trunk/server/src/main/java/com/metamatrix/common/jdbc/JDBCPlatform.java 2009-03-31 21:08:57 UTC (rev 673)
@@ -198,7 +198,7 @@
}
public boolean isPostgres() {
- return true;
+ return false;
}
public boolean isSecure() {
15 years, 1 month
teiid SVN: r672 - trunk/server/src/main/java/com/metamatrix/platform/security/session/service.
by teiid-commits＠lists.jboss.org
Author: tejones
Date: 2009-03-31 16:53:45 -0400 (Tue, 31 Mar 2009)
New Revision: 672
Modified:
trunk/server/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java
Log:
TEIID-450 Changed Program Name to check for either "Integration Server" or "null" in SessionServiceImpl. This will essentially treat "Integration Server" as the default value if it is not set.
Modified: trunk/server/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java 2009-03-31 17:50:22 UTC (rev 671)
+++ trunk/server/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java 2009-03-31 20:53:45 UTC (rev 672)
@@ -234,7 +234,7 @@
//
// Validate VDB and version if logging on to server product...
//
- if (productName != null && productName.equals(MetaMatrixProductNames.MetaMatrixServer.PRODUCT_NAME)) {
+ if (productName == null || productName.equals(MetaMatrixProductNames.MetaMatrixServer.PRODUCT_NAME)) {
String vdbName = (String)properties.get(ProductInfoConstants.VIRTUAL_DB);
String vdbVersion = (String)properties.get(ProductInfoConstants.VDB_VERSION);
VirtualDatabaseID vdbID = null;
15 years, 1 month
teiid SVN: r671 - trunk/soap/src/main/java/com/metamatrix/soap/service.
by teiid-commits＠lists.jboss.org
Author: li.liang
Date: 2009-03-31 13:50:22 -0400 (Tue, 31 Mar 2009)
New Revision: 671
Modified:
trunk/soap/src/main/java/com/metamatrix/soap/service/DataServiceWebServiceImpl.java
Log:
case TEIID 447 - Use UTF-8 to encode XML document.
Modified: trunk/soap/src/main/java/com/metamatrix/soap/service/DataServiceWebServiceImpl.java
===================================================================
--- trunk/soap/src/main/java/com/metamatrix/soap/service/DataServiceWebServiceImpl.java 2009-03-31 15:48:32 UTC (rev 670)
+++ trunk/soap/src/main/java/com/metamatrix/soap/service/DataServiceWebServiceImpl.java 2009-03-31 17:50:22 UTC (rev 671)
@@ -390,7 +390,7 @@
StAXOMBuilder builder = null;
try {
builder = new StAXOMBuilder(ByteArrayHelper.toInputStream(result
- .getBytes()));
+ .getBytes("UTF-8")));//$NON-NLS-1$
} catch (XMLStreamException e) {
Object[] params1 = new Object[] { result };
Object[] params2 = new Object[] { e.getMessage() };
15 years, 1 month
teiid SVN: r670 - trunk/build/kit-embedded/deploy.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2009-03-31 11:48:32 -0400 (Tue, 31 Mar 2009)
New Revision: 670
Modified:
trunk/build/kit-embedded/deploy/configuration.xml
Log:
TEIID-413: fixing the name of jar in the classpath
Modified: trunk/build/kit-embedded/deploy/configuration.xml
===================================================================
--- trunk/build/kit-embedded/deploy/configuration.xml 2009-03-30 23:11:41 UTC (rev 669)
+++ trunk/build/kit-embedded/deploy/configuration.xml 2009-03-31 15:48:32 UTC (rev 670)
@@ -112,7 +112,7 @@
</ComponentType>
<ComponentType Name="LDAP Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.946-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.946-06:00">
<PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" Multiplicity="0..1" IsPreferred="true" />
- <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-ldap.6.1.0-SNAPSHOT..jar;" Multiplicity="0..1" IsExpert="true" />
+ <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-ldap-6.1.0-SNAPSHOT..jar;" Multiplicity="0..1" IsExpert="true" />
<PropertyDefinition Name="SearchDefaultBaseDN" DisplayName="Default Search Base DN" ShortDescription="Default Base DN for LDAP Searches" IsExpert="true" />
<PropertyDefinition Name="com.metamatrix.data.pool.cleaning_interval" DisplayName="Pool cleaning Interval (seconds)" ShortDescription="Set the interval to cleaning the pool" DefaultValue="300" PropertyType="Integer" IsExpert="true" />
<PropertyDefinition Name="LdapAdminUserDN" DisplayName="Ldap Admin User DN" ShortDescription="User DN for the LDAP admin account." DefaultValue="cn=<>,ou=<>,dc=<>" Multiplicity="1" IsPreferred="true" />
@@ -134,7 +134,7 @@
</ComponentType>
<ComponentType Name="Loopback Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.945-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.945-06:00">
<PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" Multiplicity="0..1" IsPreferred="true" />
- <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-loopback.6.1.0-SNAPSHOT.jar;" Multiplicity="0..1" IsExpert="true" />
+ <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-loopback-6.1.0-SNAPSHOT.jar;" Multiplicity="0..1" IsExpert="true" />
<PropertyDefinition Name="CapabilitiesClass" DisplayName="Capabilities Class" ShortDescription="" DefaultValue="com.metamatrix.connector.loopback.LoopbackCapabilities" Multiplicity="1" IsExpert="true" />
<PropertyDefinition Name="WaitTime" DisplayName="Max Random Wait Time" ShortDescription="" DefaultValue="0" Multiplicity="1" IsExpert="true" />
<PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.loopback.LoopbackConnector" Multiplicity="1" IsExpert="true" />
@@ -143,7 +143,7 @@
<ComponentType Name="Salesforce Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.916-06:00" CreationDate="2008-10-31T10:26:19.916-06:00">
<PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" Multiplicity="0..1" IsPreferred="true" />
<PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)"
- DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-salesforce.6.1.0-SNAPSHOT.jar;extension:commons-codec-1.2.jar;extension:commons-discovery-0.2.jar;extension:commons-httpclient-3.0.1.jar;extension:xmlsec-1.3.0.jar;extension:axis-1.3.jar;extension:axis-jaxrpc-1.3.jar;extension:axis-saaj-1.2.jar;extension:axis-schema-1.3.jar;extension:commons-discovery-0.2.jar;extension:commons-logging-1.1.jar;extension:jms-1.1.jar;extension:servlet-api-2.5.jar;extension:jaxen-1.1.1.jar;extension:jdom-1.0.jar;extension:log4j-1.2.8.jar;extension:opensaml-1.1b.jar;extension:salesforce-api-6.1.0-SNAPSHOT.jar;extension:wsdl4j-1.5.1.jar;extension:wss4j-1.5.0.jar;extension:xalan-2.7.0.jar;extension:xml-apis-1.0.b2.jar"
+ DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-salesforce-6.1.0-SNAPSHOT.jar;extension:commons-codec-1.2.jar;extension:commons-discovery-0.2.jar;extension:commons-httpclient-3.0.1.jar;extension:xmlsec-1.3.0.jar;extension:axis-1.3.jar;extension:axis-jaxrpc-1.3.jar;extension:axis-saaj-1.2.jar;extension:axis-schema-1.3.jar;extension:commons-discovery-0.2.jar;extension:commons-logging-1.1.jar;extension:jms-1.1.jar;extension:servlet-api-2.5.jar;extension:jaxen-1.1.1.jar;extension:jdom-1.0.jar;extension:log4j-1.2.8.jar;extension:opensaml-1.1b.jar;extension:salesforce-api-6.1.0-SNAPSHOT.jar;extension:wsdl4j-1.5.1.jar;extension:wss4j-1.5.0.jar;extension:xalan-2.7.0.jar;extension:xml-apis-1.0.b2.jar"
Multiplicity="0..1" IsExpert="true" />
<PropertyDefinition Name="username" DisplayName="User Name" ShortDescription="Name value for Salesforce authentication" DefaultValue="" Multiplicity="1" IsPreferred="true" />
<PropertyDefinition Name="ConnectorStateClass" DisplayName="Connector State Class" ShortDescription="" DefaultValue="com.metamatrix.connector.salesforce.ConnectorState" Multiplicity="1" IsExpert="true" />
@@ -155,7 +155,7 @@
</ComponentType>
<ComponentType Name="Text File Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.945-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.945-06:00">
<PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" Multiplicity="0..1" IsPreferred="true" />
- <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-text.6.1.0-SNAPSHOT.jar;" Multiplicity="0..1" IsExpert="true" />
+ <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-text-6.1.0-SNAPSHOT.jar;" Multiplicity="0..1" IsExpert="true" />
<PropertyDefinition Name="PartialStartupAllowed" DisplayName="Partial Startup Allowed" ShortDescription="" DefaultValue="true" Multiplicity="1" PropertyType="Boolean" IsExpert="true" IsPreferred="true" />
<PropertyDefinition Name="DescriptorFile" DisplayName="Text File Descriptor" ShortDescription="" Multiplicity="1" IsPreferred="true" />
<PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.text.TextConnector" Multiplicity="1" IsExpert="true" />
@@ -166,7 +166,7 @@
<ComponentType Name="XML Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.917-06:00" CreationDate="2008-10-31T10:26:19.917-06:00">
<PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" Multiplicity="0..1" IsPreferred="true" />
<PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)"
- DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-xml.6.1.0-SNAPSHOT.jar;extension:commons-codec-1.2.jar;extension:commons-discovery-0.2.jar;extension:commons-httpclient-3.0.1.jar;extension:xmlsec-1.3.0.jar;extension:axis-1.3.jar;extension:axis-jaxrpc-1.3.jar;extension:axis-saaj-1.2.jar;extension:axis-schema-1.3.jar;extension:commons-discovery-0.2.jar;extension:commons-logging-1.1.jar;extension:jms-1.1.jar;extension:servlet-api-2.5.jar;extension:jaxen-1.1.1.jar;extension:jdom-1.0.jar;extension:log4j-1.2.8.jar;extension:opensaml-1.1b.jar;extension:wsdl4j-1.5.1.jar;extension:wss4j-1.5.0.jar;extension:xalan-2.7.0.jar;extension:xml-apis-1.0.b2.jar"
+ DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-xml-6.1.0-SNAPSHOT.jar;extension:commons-codec-1.2.jar;extension:commons-discovery-0.2.jar;extension:commons-httpclient-3.0.1.jar;extension:xmlsec-1.3.0.jar;extension:axis-1.3.jar;extension:axis-jaxrpc-1.3.jar;extension:axis-saaj-1.2.jar;extension:axis-schema-1.3.jar;extension:commons-discovery-0.2.jar;extension:commons-logging-1.1.jar;extension:jms-1.1.jar;extension:servlet-api-2.5.jar;extension:jaxen-1.1.1.jar;extension:jdom-1.0.jar;extension:log4j-1.2.8.jar;extension:opensaml-1.1b.jar;extension:wsdl4j-1.5.1.jar;extension:wss4j-1.5.0.jar;extension:xalan-2.7.0.jar;extension:xml-apis-1.0.b2.jar"
Multiplicity="0..1" IsExpert="true" />
</ComponentType>
<ComponentType Name="XML File Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="XML Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.917-06:00" CreationDate="2008-10-31T10:26:19.917-06:00">
@@ -294,7 +294,7 @@
<ComponentType Name="JDBC Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.952-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.952-06:00">
<PropertyDefinition Name="MaxSQLLength" DisplayName="Max SQL String Length" ShortDescription="" DefaultValue="16384" Multiplicity="0..1" PropertyType="Integer" ValueDelimiter="," IsConstrainedToAllowedValues="true" IsExpert="true" IsHidden="false" IsMasked="false" IsModifiable="true" IsPreferred="false" />
<PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" Multiplicity="0..1" IsPreferred="true" />
- <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-jdbc.6.1.0-SNAPSHOT.jar;" Multiplicity="0..1" IsExpert="true" />
+ <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-jdbc-6.1.0-SNAPSHOT.jar;" Multiplicity="0..1" IsExpert="true" />
<PropertyDefinition Name="UseBindVariables" DisplayName="Use prepared statements and bind variables" ShortDescription="" DefaultValue="false" PropertyType="Boolean" IsExpert="true" />
<PropertyDefinition Name="ExtensionCapabilityClass" DisplayName="Extension Capability Class" ShortDescription="" IsExpert="true" />
<PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.JDBCConnector" Multiplicity="1" IsExpert="true" />
15 years, 1 month
teiid SVN: r669 - trunk/common-internal/src/main/java/com/metamatrix/common/queue.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-03-30 19:11:41 -0400 (Mon, 30 Mar 2009)
New Revision: 669
Modified:
trunk/common-internal/src/main/java/com/metamatrix/common/queue/WorkerPoolFactory.java
Log:
TEIID-445 refinement of cancellation
Modified: trunk/common-internal/src/main/java/com/metamatrix/common/queue/WorkerPoolFactory.java
===================================================================
--- trunk/common-internal/src/main/java/com/metamatrix/common/queue/WorkerPoolFactory.java 2009-03-30 22:31:07 UTC (rev 668)
+++ trunk/common-internal/src/main/java/com/metamatrix/common/queue/WorkerPoolFactory.java 2009-03-30 23:11:41 UTC (rev 669)
@@ -86,9 +86,6 @@
private static ScheduledThreadPoolExecutor stpe = new ScheduledThreadPoolExecutor(1, new NamedThreadFactory("Scheduler")); //$NON-NLS-1$
- /**
- * TODO: purge user canceled scheduled tasks.
- */
static class StatsCapturingSharedThreadPoolExecutor implements WorkerPool {
class ScheduledFutureTask extends FutureTask<Void> implements ScheduledFuture<Void> {
@@ -119,6 +116,7 @@
@Override
public boolean cancel(boolean mayInterruptIfRunning) {
this.scheduledFuture.cancel(false);
+ scheduledTasks.remove(this);
return super.cancel(mayInterruptIfRunning);
}
15 years, 1 month