teiid SVN: r1371 - trunk/test-integration/db/src/main/resources.
by teiid-commits＠lists.jboss.org
Author: vhalbert(a)redhat.com
Date: 2009-09-18 13:36:09 -0400 (Fri, 18 Sep 2009)
New Revision: 1371
Modified:
trunk/test-integration/db/src/main/resources/default-config.properties
Log:
Teiid 773 - organize integration test
Modified: trunk/test-integration/db/src/main/resources/default-config.properties
===================================================================
--- trunk/test-integration/db/src/main/resources/default-config.properties 2009-09-18 17:09:52 UTC (rev 1370)
+++ trunk/test-integration/db/src/main/resources/default-config.properties 2009-09-18 17:36:09 UTC (rev 1371)
@@ -59,11 +59,11 @@
#
#
-#pm1=nonxa
-#pm2=nonxa
+pm1=nonxa
+pm2=nonxa
-pm1=mysqlA
-pm2=mysqlB
+#pm1=mysqlA
+#pm2=mysqlB
16 years, 7 months
teiid SVN: r1370 - trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api.
by teiid-commits＠lists.jboss.org
Author: vhalbert(a)redhat.com
Date: 2009-09-18 13:09:52 -0400 (Fri, 18 Sep 2009)
New Revision: 1370
Modified:
trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractQueryTest.java
Log:
Teiid 773 - organize integration test - the change to AbstractQueryTest is to allow for comparing results in a case insensitive manner. This is needed because different databases return values in all uppercase and in others in lowercase.
Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractQueryTest.java
===================================================================
--- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractQueryTest.java 2009-09-18 17:05:35 UTC (rev 1369)
+++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractQueryTest.java 2009-09-18 17:09:52 UTC (rev 1370)
@@ -109,7 +109,7 @@
assertNotNull(this.internalConnection);
assertTrue(!this.internalConnection.isClosed());
boolean result = false;
- if (params != null) {
+ if (params != null && params.length > 0) {
if (sql.startsWith("exec ")) { //$NON-NLS-1$
sql = sql.substring(5);
this.internalStatement = this.internalConnection.prepareCall("{?=call "+sql+"}"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -359,12 +359,12 @@
}
}
- static String read(BufferedReader r) throws IOException {
+ protected static String read(BufferedReader r, boolean casesensitive) throws IOException {
StringBuffer result = new StringBuffer();
String s = null;
try {
while ((s = r.readLine()) != null) {
- result.append(s.trim());
+ result.append( (casesensitive ? s.trim() : s.trim().toLowerCase()) );
result.append("\n"); //$NON-NLS-1$
}
} finally {
@@ -373,8 +373,8 @@
return result.toString();
}
- void compareResults(BufferedReader resultReader, BufferedReader expectedReader) throws IOException {
- assertEquals(read(expectedReader), read(resultReader));
+ protected void compareResults(BufferedReader resultReader, BufferedReader expectedReader) throws IOException {
+ assertEquals(read(expectedReader, true) , read(resultReader, true));
}
public void printResults() {
16 years, 7 months
teiid SVN: r1369 - trunk/test-integration/db.
by teiid-commits＠lists.jboss.org
Author: vhalbert(a)redhat.com
Date: 2009-09-18 13:05:35 -0400 (Fri, 18 Sep 2009)
New Revision: 1369
Modified:
trunk/test-integration/db/howto
trunk/test-integration/db/pom.xml
Log:
Teiid 773 - organize integration test
Modified: trunk/test-integration/db/howto
===================================================================
--- trunk/test-integration/db/howto 2009-09-18 13:31:57 UTC (rev 1368)
+++ trunk/test-integration/db/howto 2009-09-18 17:05:35 UTC (rev 1369)
@@ -33,19 +33,25 @@
Setting up a Datasource to be used during Testing
==========================================
-- see the readme.txt in src/main/resources/datasources regarding defining a datasource
-- run the maven profile to execute the process to create the required tables:
- a. to setup all sources at one time, run: mvn install -P setupdatasources
- b. to setup a specific source, run: mvn install -P singledatasource -Ddatasource=derby
+1. DEFINE DATASOURCE:
+ To define a datasource, see the readme.txt in src/main/resources/datasources regarding defining a datasource
+
+2. CREATE TABLES
+ To create the tables on the defined datasource, run the maven profile to execute the process to create the required tables:
+ a. to setup all sources at one time, run: mvn pre-integration-test -P setupdatasources -Dmaven.test.skip=true
+ b. to setup a specific source, run: mvn pre-integration-test -Ddatasource=<datasourcedir> -Psingleschema -Dmaven.test.skip=true
+ where <datasourcedir> is the name of the directory for the datasource
+
+
==========================================
Executing the db integration tests
==========================================
-The default profile in the pom.xml is set to compile and run the test. So running: mvn clean install
-will compile and run the test.
-It does not run and setup a datasource. See above "Setting up a Datasource to be used during Testing".
+The default profile in the pom.xml is set to compile and run the test. So running: mvn install
+will run the test.
+It will not setup a datasource. See above "Setting up a Datasource to be used during Testing".
Modified: trunk/test-integration/db/pom.xml
===================================================================
--- trunk/test-integration/db/pom.xml 2009-09-18 13:31:57 UTC (rev 1368)
+++ trunk/test-integration/db/pom.xml 2009-09-18 17:05:35 UTC (rev 1369)
@@ -98,7 +98,7 @@
<forkMode>always</forkMode>
<forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
<includes>
- <include>**/*TestCase.java</include>
+ <!-- <include>**/*TestCase.java</include> -->
<include>**/*Test.java</include>
<include>**/*Tests.java</include>
<include>**/Test*.java</include>
@@ -137,7 +137,7 @@
</configuration>
<executions>
<execution>
- <id>singleschema</id>
+ <id>setupalldatasources</id>
<phase>pre-integration-test</phase>
<configuration>
<tasks>
@@ -182,7 +182,7 @@
</configuration>
<executions>
<execution>
- <id>singleschema</id>
+ <id>setupsingledatasource</id>
<phase>pre-integration-test</phase>
<configuration>
<tasks>
16 years, 7 months
teiid SVN: r1368 - trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-09-18 09:31:57 -0400 (Fri, 18 Sep 2009)
New Revision: 1368
Modified:
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/Translator.java
Log:
TEIID-689: using valueof methods for value retrieval
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/Translator.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/Translator.java 2009-09-17 21:14:49 UTC (rev 1367)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/Translator.java 2009-09-18 13:31:57 UTC (rev 1368)
@@ -566,7 +566,7 @@
if(results.wasNull()) {
return null;
}
- return new Double(value);
+ return Double.valueOf(value);
}
case BIGDECIMAL_CODE: {
return results.getBigDecimal(columnIndex);
@@ -583,7 +583,7 @@
if(results.wasNull()) {
return null;
}
- return new Float(value);
+ return Float.valueOf(value);
}
case TIME_CODE: {
return results.getTime(columnIndex, getDatabaseCalendar());
16 years, 7 months
teiid SVN: r1367 - in trunk: client/src/main/java/org/teiid/adminapi and 3 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2009-09-17 17:14:49 -0400 (Thu, 17 Sep 2009)
New Revision: 1367
Modified:
trunk/adminshell/src/main/resources/scripts/adminapi.bsh
trunk/client/src/main/java/org/teiid/adminapi/MonitoringAdmin.java
trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPMonitoringAdminImpl.java
trunk/server/src/main/java/com/metamatrix/admin/server/ServerAdminImpl.java
trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringAdminImpl.java
trunk/test-integration/common/src/test/java/com/metamatrix/server/integration/TestAdminApi.java
Log:
TEIID-837: The VDB identifier is supplied supported with server admin api before. Removed the notion of VDB identifier and used the vdb name and version, which is similar to all the other vdb related admin api methods in current admin api.
Modified: trunk/adminshell/src/main/resources/scripts/adminapi.bsh
===================================================================
--- trunk/adminshell/src/main/resources/scripts/adminapi.bsh 2009-09-17 21:13:18 UTC (rev 1366)
+++ trunk/adminshell/src/main/resources/scripts/adminapi.bsh 2009-09-17 21:14:49 UTC (rev 1367)
@@ -677,19 +677,15 @@
/**
* Get all the Connector Bindings for the given VDB identifier pattern
- * @param identifier - the unique identifier for a {@link VDB}
- * <ul>
- * <li> <code>"*"</code> - for all Connector Bindings in the system
- * <li> <code>"name or name*"</code> - for all the bindings in the VDBs that begin with given name
- * <li><code>"name<{@link AdminObject#DELIMITER_CHAR}>version"</code> - for all the bindings in a given single VDB
- * </ul>
+ * @param vdbName - Name of the VDB
+ * @param vdbVersion - version of the VDB
* @return Collection of {@link ConnectorBinding}
* @throws AdminException if there's a system error.
* @since 4.3
*/
-Collection getConnectorBindingsInVDB(String identifier) {
+Collection getConnectorBindingsInVDB(String vdbName, String vdbVersion) {
checkAdmin();
- result = currentContext().internalAdmin.getConnectorBindingsInVDB(identifier);
+ result = currentContext().internalAdmin.getConnectorBindingsInVDB(vdbName, vdbVersion);
debug(result);
return result;
}
@@ -1014,7 +1010,7 @@
void deleteVDBAndConnectorBindings(String name, String version) {
checkAdmin();
- Collection connectorBindings = currentContext().internalAdmin.getConnectorBindingsInVDB(name + AdminObject.DELIMITER + version);
+ Collection connectorBindings = currentContext().internalAdmin.getConnectorBindingsInVDB(name , version);
currentContext().internalAdmin.changeVDBStatus(name, version, VDB.DELETED);
for ( Iterator itr = connectorBindings.iterator(); itr.hasNext();) {
Modified: trunk/client/src/main/java/org/teiid/adminapi/MonitoringAdmin.java
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/MonitoringAdmin.java 2009-09-17 21:13:18 UTC (rev 1366)
+++ trunk/client/src/main/java/org/teiid/adminapi/MonitoringAdmin.java 2009-09-17 21:14:49 UTC (rev 1367)
@@ -87,17 +87,13 @@
/**
* Get all the Connector Bindings for the given VDB identifier pattern
- * @param identifier - the unique identifier for a {@link VDB}
- * <ul>
- * <li> <code>"*"</code> - for all Connector Bindings in the system
- * <li> <code>"name or name*"</code> - for all the bindings in the VDBs that begin with given name
- * <li><code>"name<{@link AdminObject#DELIMITER_CHAR}>version"</code> - for all the bindings in a given single VDB
- * </ul>
+ * @param vdbName - Name of the VDB
+ * @param vdbVersion - version of the VDB
* @return Collection of {@link ConnectorBinding}
* @throws AdminException if there's a system error.
* @since 4.3
*/
- Collection<ConnectorBinding> getConnectorBindingsInVDB(String identifier) throws AdminException;
+ Collection<ConnectorBinding> getConnectorBindingsInVDB(String vdbName, String vdbVersion) throws AdminException;
/**
* Get the Extension Modules that correspond to the specified identifier pattern
Modified: trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPMonitoringAdminImpl.java
===================================================================
--- trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPMonitoringAdminImpl.java 2009-09-17 21:13:18 UTC (rev 1366)
+++ trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPMonitoringAdminImpl.java 2009-09-17 21:14:49 UTC (rev 1367)
@@ -126,37 +126,18 @@
}
- /**
- * @see org.teiid.adminapi.MonitoringAdmin#getConnectorBindingsInVDB(java.lang.String)
- * @since 4.3
- */
- public Collection<ConnectorBinding> getConnectorBindingsInVDB(String identifier) throws AdminException{
- Collection<VDBArchive> vdbs = null;
- HashMap bindings = new HashMap();
-
- if (identifier == null || !identifier.matches(VDB_REGEX)) {
- throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("Admin.Invalid_identifier")); //$NON-NLS-1$
- }
-
- // if . and * not specified, add a STAR at the end to compensate for the
- // version number matching.
- if (identifier.indexOf(DOT) == -1 && identifier.indexOf(STAR) == -1) {
- identifier = identifier + STAR;
- }
-
+ @Override
+ public Collection<ConnectorBinding> getConnectorBindingsInVDB(String vdbName, String vdbVersion) throws AdminException{
try {
- // first get all the VDBS in the system and loop though each of them
- vdbs = getVDBService().getAvailableVDBs();
- for (VDBArchive vdb:vdbs) {
- if (matches(identifier, vdb.getName()+"."+vdb.getVersion())) { //$NON-NLS-1$
- Map connectorBindings = vdb.getConfigurationDef().getConnectorBindings();
- bindings.putAll(connectorBindings);
- }
+ VDBArchive vdb = getConfigurationService().getVDB(vdbName, vdbVersion);
+ if (vdb != null) {
+ return (List)convertToAdminObjects(vdb.getConfigurationDef().getConnectorBindings().values());
}
+ throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("Admin.vdb_does_not_exists", vdbVersion, vdbVersion)); //$NON-NLS-1$
+
} catch (MetaMatrixComponentException e) {
throw new AdminComponentException(e);
}
- return (List)convertToAdminObjects(bindings.values());
}
/**
Modified: trunk/server/src/main/java/com/metamatrix/admin/server/ServerAdminImpl.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/admin/server/ServerAdminImpl.java 2009-09-17 21:13:18 UTC (rev 1366)
+++ trunk/server/src/main/java/com/metamatrix/admin/server/ServerAdminImpl.java 2009-09-17 21:14:49 UTC (rev 1367)
@@ -1041,4 +1041,10 @@
String propertyName, String propertyValue) throws AdminException {
}
+ @Override
+ public Collection<ConnectorBinding> getConnectorBindingsInVDB(
+ String vdbName, String vdbVersion) throws AdminException {
+ return null;
+ }
+
}
\ No newline at end of file
Modified: trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringAdminImpl.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringAdminImpl.java 2009-09-17 21:13:18 UTC (rev 1366)
+++ trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringAdminImpl.java 2009-09-17 21:14:49 UTC (rev 1367)
@@ -1412,5 +1412,11 @@
String connectorTypeIdentifier) throws AdminException {
return null;
}
+
+ @Override
+ public Collection<org.teiid.adminapi.ConnectorBinding> getConnectorBindingsInVDB(
+ String vdbName, String vdbVersion) throws AdminException {
+ return null;
+ }
}
\ No newline at end of file
Modified: trunk/test-integration/common/src/test/java/com/metamatrix/server/integration/TestAdminApi.java
===================================================================
--- trunk/test-integration/common/src/test/java/com/metamatrix/server/integration/TestAdminApi.java 2009-09-17 21:13:18 UTC (rev 1366)
+++ trunk/test-integration/common/src/test/java/com/metamatrix/server/integration/TestAdminApi.java 2009-09-17 21:14:49 UTC (rev 1367)
@@ -172,7 +172,7 @@
bindings = getAdmin().getConnectorBindings(STAR);
assertEquals("Two bindings should exist", 2+size, bindings.size()); //$NON-NLS-1$
- bindings = getAdmin().getConnectorBindingsInVDB("BQT*"); //$NON-NLS-1$
+ bindings = getAdmin().getConnectorBindingsInVDB("BQT", "1"); //$NON-NLS-1$
assertEquals("Two bindings should exist", 2+size, bindings.size()); //$NON-NLS-1$
assertTrue("Binding must be available", hasBinding("BQT_1.BQT1 Oracle 9i Simple Cap")); //$NON-NLS-1$ //$NON-NLS-2$
16 years, 7 months
teiid SVN: r1366 - in branches/6.2.x: client/src/main/java/org/teiid/adminapi and 3 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2009-09-17 17:13:18 -0400 (Thu, 17 Sep 2009)
New Revision: 1366
Modified:
branches/6.2.x/adminshell/src/main/resources/scripts/adminapi.bsh
branches/6.2.x/client/src/main/java/org/teiid/adminapi/MonitoringAdmin.java
branches/6.2.x/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPMonitoringAdminImpl.java
branches/6.2.x/server/src/main/java/com/metamatrix/admin/server/ServerAdminImpl.java
branches/6.2.x/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringAdminImpl.java
branches/6.2.x/test-integration/common/src/test/java/com/metamatrix/server/integration/TestAdminApi.java
Log:
TEIID-837: The VDB identifier is supplied supported with server admin api before. Removed the notion of VDB identifier and used the vdb name and version, which is similar to all the other vdb related admin api methods in current admin api.
Modified: branches/6.2.x/adminshell/src/main/resources/scripts/adminapi.bsh
===================================================================
--- branches/6.2.x/adminshell/src/main/resources/scripts/adminapi.bsh 2009-09-17 16:45:48 UTC (rev 1365)
+++ branches/6.2.x/adminshell/src/main/resources/scripts/adminapi.bsh 2009-09-17 21:13:18 UTC (rev 1366)
@@ -677,19 +677,15 @@
/**
* Get all the Connector Bindings for the given VDB identifier pattern
- * @param identifier - the unique identifier for a {@link VDB}
- * <ul>
- * <li> <code>"*"</code> - for all Connector Bindings in the system
- * <li> <code>"name or name*"</code> - for all the bindings in the VDBs that begin with given name
- * <li><code>"name<{@link AdminObject#DELIMITER_CHAR}>version"</code> - for all the bindings in a given single VDB
- * </ul>
+ * @param vdbName - Name of the VDB
+ * @param vdbVersion - version of the VDB
* @return Collection of {@link ConnectorBinding}
* @throws AdminException if there's a system error.
* @since 4.3
*/
-Collection getConnectorBindingsInVDB(String identifier) {
+Collection getConnectorBindingsInVDB(String vdbName, String vdbVersion) {
checkAdmin();
- result = currentContext().internalAdmin.getConnectorBindingsInVDB(identifier);
+ result = currentContext().internalAdmin.getConnectorBindingsInVDB(vdbName, vdbVersion);
debug(result);
return result;
}
@@ -1014,7 +1010,7 @@
void deleteVDBAndConnectorBindings(String name, String version) {
checkAdmin();
- Collection connectorBindings = currentContext().internalAdmin.getConnectorBindingsInVDB(name + AdminObject.DELIMITER + version);
+ Collection connectorBindings = currentContext().internalAdmin.getConnectorBindingsInVDB(name, version);
currentContext().internalAdmin.changeVDBStatus(name, version, VDB.DELETED);
for ( Iterator itr = connectorBindings.iterator(); itr.hasNext();) {
Modified: branches/6.2.x/client/src/main/java/org/teiid/adminapi/MonitoringAdmin.java
===================================================================
--- branches/6.2.x/client/src/main/java/org/teiid/adminapi/MonitoringAdmin.java 2009-09-17 16:45:48 UTC (rev 1365)
+++ branches/6.2.x/client/src/main/java/org/teiid/adminapi/MonitoringAdmin.java 2009-09-17 21:13:18 UTC (rev 1366)
@@ -87,17 +87,13 @@
/**
* Get all the Connector Bindings for the given VDB identifier pattern
- * @param identifier - the unique identifier for a {@link VDB}
- * <ul>
- * <li> <code>"*"</code> - for all Connector Bindings in the system
- * <li> <code>"name or name*"</code> - for all the bindings in the VDBs that begin with given name
- * <li><code>"name<{@link AdminObject#DELIMITER_CHAR}>version"</code> - for all the bindings in a given single VDB
- * </ul>
+ * @param vdbName - Name of the VDB
+ * @param vdbVersion - version of the VDB
* @return Collection of {@link ConnectorBinding}
* @throws AdminException if there's a system error.
* @since 4.3
*/
- Collection<ConnectorBinding> getConnectorBindingsInVDB(String identifier) throws AdminException;
+ Collection<ConnectorBinding> getConnectorBindingsInVDB(String vdbName, String vdbVersion) throws AdminException;
/**
* Get the Extension Modules that correspond to the specified identifier pattern
Modified: branches/6.2.x/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPMonitoringAdminImpl.java
===================================================================
--- branches/6.2.x/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPMonitoringAdminImpl.java 2009-09-17 16:45:48 UTC (rev 1365)
+++ branches/6.2.x/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPMonitoringAdminImpl.java 2009-09-17 21:13:18 UTC (rev 1366)
@@ -126,37 +126,18 @@
}
- /**
- * @see org.teiid.adminapi.MonitoringAdmin#getConnectorBindingsInVDB(java.lang.String)
- * @since 4.3
- */
- public Collection<ConnectorBinding> getConnectorBindingsInVDB(String identifier) throws AdminException{
- Collection<VDBArchive> vdbs = null;
- HashMap bindings = new HashMap();
-
- if (identifier == null || !identifier.matches(VDB_REGEX)) {
- throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("Admin.Invalid_identifier")); //$NON-NLS-1$
- }
-
- // if . and * not specified, add a STAR at the end to compensate for the
- // version number matching.
- if (identifier.indexOf(DOT) == -1 && identifier.indexOf(STAR) == -1) {
- identifier = identifier + STAR;
- }
-
+ @Override
+ public Collection<ConnectorBinding> getConnectorBindingsInVDB(String vdbName, String vdbVersion) throws AdminException{
try {
- // first get all the VDBS in the system and loop though each of them
- vdbs = getVDBService().getAvailableVDBs();
- for (VDBArchive vdb:vdbs) {
- if (matches(identifier, vdb.getName()+"."+vdb.getVersion())) { //$NON-NLS-1$
- Map connectorBindings = vdb.getConfigurationDef().getConnectorBindings();
- bindings.putAll(connectorBindings);
- }
+ VDBArchive vdb = getConfigurationService().getVDB(vdbName, vdbVersion);
+ if (vdb != null) {
+ return (List)convertToAdminObjects(vdb.getConfigurationDef().getConnectorBindings().values());
}
+ throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("Admin.vdb_does_not_exists", vdbVersion, vdbVersion)); //$NON-NLS-1$
+
} catch (MetaMatrixComponentException e) {
throw new AdminComponentException(e);
}
- return (List)convertToAdminObjects(bindings.values());
}
/**
Modified: branches/6.2.x/server/src/main/java/com/metamatrix/admin/server/ServerAdminImpl.java
===================================================================
--- branches/6.2.x/server/src/main/java/com/metamatrix/admin/server/ServerAdminImpl.java 2009-09-17 16:45:48 UTC (rev 1365)
+++ branches/6.2.x/server/src/main/java/com/metamatrix/admin/server/ServerAdminImpl.java 2009-09-17 21:13:18 UTC (rev 1366)
@@ -1041,4 +1041,10 @@
String propertyName, String propertyValue) throws AdminException {
}
+ @Override
+ public Collection<ConnectorBinding> getConnectorBindingsInVDB(
+ String vdbName, String vdbVersion) throws AdminException {
+ return null;
+ }
+
}
\ No newline at end of file
Modified: branches/6.2.x/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringAdminImpl.java
===================================================================
--- branches/6.2.x/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringAdminImpl.java 2009-09-17 16:45:48 UTC (rev 1365)
+++ branches/6.2.x/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringAdminImpl.java 2009-09-17 21:13:18 UTC (rev 1366)
@@ -1412,5 +1412,11 @@
String connectorTypeIdentifier) throws AdminException {
return null;
}
+
+ @Override
+ public Collection<org.teiid.adminapi.ConnectorBinding> getConnectorBindingsInVDB(
+ String vdbName, String vdbVersion) throws AdminException {
+ return null;
+ }
}
\ No newline at end of file
Modified: branches/6.2.x/test-integration/common/src/test/java/com/metamatrix/server/integration/TestAdminApi.java
===================================================================
--- branches/6.2.x/test-integration/common/src/test/java/com/metamatrix/server/integration/TestAdminApi.java 2009-09-17 16:45:48 UTC (rev 1365)
+++ branches/6.2.x/test-integration/common/src/test/java/com/metamatrix/server/integration/TestAdminApi.java 2009-09-17 21:13:18 UTC (rev 1366)
@@ -172,7 +172,7 @@
bindings = getAdmin().getConnectorBindings(STAR);
assertEquals("Two bindings should exist", 2+size, bindings.size()); //$NON-NLS-1$
- bindings = getAdmin().getConnectorBindingsInVDB("BQT*"); //$NON-NLS-1$
+ bindings = getAdmin().getConnectorBindingsInVDB("BQT", "1"); //$NON-NLS-1$
assertEquals("Two bindings should exist", 2+size, bindings.size()); //$NON-NLS-1$
assertTrue("Binding must be available", hasBinding("BQT_1.BQT1 Oracle 9i Simple Cap")); //$NON-NLS-1$ //$NON-NLS-2$
16 years, 7 months
teiid SVN: r1365 - in trunk: test-integration/common/src/test/java/com/metamatrix/server/integration and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2009-09-17 12:45:48 -0400 (Thu, 17 Sep 2009)
New Revision: 1365
Modified:
trunk/runtime/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java
trunk/test-integration/common/src/test/java/com/metamatrix/server/integration/TestAdminApi.java
Log:
TEIID-835: The VDB name was being compared in case sensitive way, where there is no guarantee that user logged in with same case for the VDB name
Modified: trunk/runtime/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java
===================================================================
--- trunk/runtime/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java 2009-09-17 16:00:18 UTC (rev 1364)
+++ trunk/runtime/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java 2009-09-17 16:45:48 UTC (rev 1365)
@@ -253,7 +253,7 @@
}
ArrayList<MetaMatrixSessionInfo> results = new ArrayList<MetaMatrixSessionInfo>();
for (MetaMatrixSessionInfo info : this.sessionCache.values()) {
- if (VDBName.equals(info.getProductInfo(ProductInfoConstants.VIRTUAL_DB)) && VDBVersion.equals(info.getProductInfo(ProductInfoConstants.VDB_VERSION))) {
+ if (VDBName.equalsIgnoreCase(info.getProductInfo(ProductInfoConstants.VIRTUAL_DB)) && VDBVersion.equalsIgnoreCase(info.getProductInfo(ProductInfoConstants.VDB_VERSION))) {
results.add(info);
}
}
Modified: trunk/test-integration/common/src/test/java/com/metamatrix/server/integration/TestAdminApi.java
===================================================================
--- trunk/test-integration/common/src/test/java/com/metamatrix/server/integration/TestAdminApi.java 2009-09-17 16:00:18 UTC (rev 1364)
+++ trunk/test-integration/common/src/test/java/com/metamatrix/server/integration/TestAdminApi.java 2009-09-17 16:45:48 UTC (rev 1365)
@@ -798,7 +798,7 @@
// make another context and create a 2nd connection
pushConnection();
- MMConnection vdbConn = (MMConnection)getConnection(BQT, PROPS_FILE);
+ MMConnection vdbConn = (MMConnection)getConnection("bqt", PROPS_FILE);
execute("SELECT * FROM BQT1.SmallA"); //$NON-NLS-1$
assertRowCount(50);
// we have not closed the connection here, kept active connection
16 years, 7 months
teiid SVN: r1364 - branches/6.2.x/runtime/src/main/java/com/metamatrix/platform/security/session/service.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2009-09-17 12:00:18 -0400 (Thu, 17 Sep 2009)
New Revision: 1364
Modified:
branches/6.2.x/runtime/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java
Log:
TEIID-835: the vdb name was not being checked in case in-sensitive way
Modified: branches/6.2.x/runtime/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java
===================================================================
--- branches/6.2.x/runtime/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java 2009-09-16 17:35:24 UTC (rev 1363)
+++ branches/6.2.x/runtime/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java 2009-09-17 16:00:18 UTC (rev 1364)
@@ -253,7 +253,7 @@
}
ArrayList<MetaMatrixSessionInfo> results = new ArrayList<MetaMatrixSessionInfo>();
for (MetaMatrixSessionInfo info : this.sessionCache.values()) {
- if (VDBName.equals(info.getProductInfo(ProductInfoConstants.VIRTUAL_DB)) && VDBVersion.equals(info.getProductInfo(ProductInfoConstants.VDB_VERSION))) {
+ if (VDBName.equalsIgnoreCase(info.getProductInfo(ProductInfoConstants.VIRTUAL_DB)) && VDBVersion.equalsIgnoreCase(info.getProductInfo(ProductInfoConstants.VDB_VERSION))) {
results.add(info);
}
}
16 years, 7 months
