Warning: could not send message for past 4 hours
by Mail Delivery Subsystem
**********************************************
** THIS IS A WARNING MESSAGE ONLY **
** YOU DO NOT NEED TO RESEND YOUR MESSAGE **
**********************************************
The original message was received at Tue, 21 Jul 2009 19:33:56 -0400
from svn01.web.mwc.hst.phx2.redhat.com [10.5.105.7]
----- Transcript of session follows -----
<teiid-commits(a)lists.jboss.org>... Deferred: Connection refused by mx1.lists.jboss.org.
Warning: message still undelivered after 4 hours
Will keep trying until message is 5 days old
14 years, 11 months
teiid SVN: r1168 - in trunk: build/assembly/embedded and 3 other directories.
by teiid-commits@lists.jboss.org
Author: rareddy
Date: 2009-07-21 23:48:48 -0400 (Tue, 21 Jul 2009)
New Revision: 1168
Added:
trunk/runtime/
Removed:
trunk/embedded/
Modified:
trunk/build/assembly/embedded/embedded-dependencies.xml
trunk/build/assembly/embedded/embedded-dist.xml
trunk/pom.xml
trunk/runtime/pom.xml
trunk/server/pom.xml
trunk/test-integration/pom.xml
Log:
TEIID-732: renaming the embedded --> runtime, and kit to teiid
Modified: trunk/build/assembly/embedded/embedded-dependencies.xml
===================================================================
--- trunk/build/assembly/embedded/embedded-dependencies.xml 2009-07-22 02:53:09 UTC (rev 1167)
+++ trunk/build/assembly/embedded/embedded-dependencies.xml 2009-07-22 03:48:48 UTC (rev 1168)
@@ -1,14 +1,14 @@
<!--This script builds a JAR for the Embedded Server Installation -->
<assembly>
- <id>embedded-dependencies</id>
+ <id>runtime-dependencies</id>
<formats>
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <baseDirectory>teiid-embedded</baseDirectory>
+ <baseDirectory>teiid</baseDirectory>
<moduleSets>
<moduleSet>
@@ -20,7 +20,7 @@
<include>org.jboss.teiid:teiid-connector-api</include>
<include>org.jboss.teiid:teiid-connector-metadata</include>
- <include>org.jboss.teiid:teiid-embedded</include>
+ <include>org.jboss.teiid:teiid-runtime</include>
<include>org.jboss.teiid:teiid-engine</include>
<include>org.jboss.teiid:teiid-metadata</include>
<include>org.jboss.teiid:teiid-txn-jbossts</include>
Modified: trunk/build/assembly/embedded/embedded-dist.xml
===================================================================
--- trunk/build/assembly/embedded/embedded-dist.xml 2009-07-22 02:53:09 UTC (rev 1167)
+++ trunk/build/assembly/embedded/embedded-dist.xml 2009-07-22 03:48:48 UTC (rev 1168)
@@ -1,14 +1,14 @@
<!--This script builds a JAR for the Embedded Server Installation -->
<assembly>
- <id>embedded-dist</id>
+ <id>dist</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>teiid-embedded-${version}</baseDirectory>
+ <baseDirectory>teiid-${version}</baseDirectory>
<fileSets>
@@ -21,7 +21,7 @@
</fileSet>
<fileSet>
- <directory>target/distribution/teiid-${version}-embedded-dependencies.dir</directory>
+ <directory>target/distribution/teiid-${version}-runtime-dependencies.dir</directory>
<includes>
<include>*.jar</include>
</includes>
@@ -33,7 +33,7 @@
</fileSet>
<fileSet>
- <directory>target/distribution/teiid-${version}-embedded-dependencies.dir</directory>
+ <directory>target/distribution/teiid-${version}-runtime-dependencies.dir</directory>
<includes>
<include>teiid-hibernate-dialect-${version}.jar</include>
</includes>
@@ -41,7 +41,7 @@
</fileSet>
<fileSet>
- <directory>target/distribution/teiid-${version}-embedded-dependencies.dir</directory>
+ <directory>target/distribution/teiid-${version}-runtime-dependencies.dir</directory>
<includes>
<include>teiid-txn-jbossts-${version}.jar</include>
</includes>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-07-22 02:53:09 UTC (rev 1167)
+++ trunk/pom.xml 2009-07-22 03:48:48 UTC (rev 1168)
@@ -460,7 +460,7 @@
<module>txn-jbossts</module>
<module>connector-sdk</module>
<module>server</module>
- <module>embedded</module>
+ <module>runtime</module>
<module>adminshell</module>
<module>test-integration</module>
<module>connector-metadata</module>
@@ -473,4 +473,4 @@
<url>${jboss.repository.root}</url>
</repository>
</distributionManagement>
-</project>
\ No newline at end of file
+</project>
Copied: trunk/runtime (from rev 1167, trunk/embedded)
Modified: trunk/runtime/pom.xml
===================================================================
--- trunk/embedded/pom.xml 2009-07-22 02:53:09 UTC (rev 1167)
+++ trunk/runtime/pom.xml 2009-07-22 03:48:48 UTC (rev 1168)
@@ -7,9 +7,9 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-embedded</artifactId>
- <name>Embedded Engine</name>
- <description>Embedded implementation of the engine</description>
+ <artifactId>teiid-runtime</artifactId>
+ <name>Runtime Engine</name>
+ <description>Teiid Runtime Engine</description>
<dependencies>
<dependency>
<groupId>org.jboss.teiid</groupId>
Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml 2009-07-22 02:53:09 UTC (rev 1167)
+++ trunk/server/pom.xml 2009-07-22 03:48:48 UTC (rev 1168)
@@ -57,7 +57,7 @@
</dependency>
<dependency>
<groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-embedded</artifactId>
+ <artifactId>teiid-runtime</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
Modified: trunk/test-integration/pom.xml
===================================================================
--- trunk/test-integration/pom.xml 2009-07-22 02:53:09 UTC (rev 1167)
+++ trunk/test-integration/pom.xml 2009-07-22 03:48:48 UTC (rev 1168)
@@ -64,12 +64,12 @@
<!-- internal dependencies that are only used by integration testing -->
<dependency>
<groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-embedded</artifactId>
+ <artifactId>teiid-runtime</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-embedded</artifactId>
+ <artifactId>teiid-runtime</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
14 years, 11 months
Warning: could not send message for past 4 hours
by Mail Delivery Subsystem
**********************************************
** THIS IS A WARNING MESSAGE ONLY **
** YOU DO NOT NEED TO RESEND YOUR MESSAGE **
**********************************************
The original message was received at Tue, 21 Jul 2009 19:02:07 -0400
from svn01.web.mwc.hst.phx2.redhat.com [10.5.105.7]
----- Transcript of session follows -----
<teiid-commits(a)lists.jboss.org>... Deferred: Connection refused by mx1.lists.jboss.org.
Warning: message still undelivered after 4 hours
Will keep trying until message is 5 days old
14 years, 11 months
Warning: could not send message for past 4 hours
by Mail Delivery Subsystem
**********************************************
** THIS IS A WARNING MESSAGE ONLY **
** YOU DO NOT NEED TO RESEND YOUR MESSAGE **
**********************************************
The original message was received at Tue, 21 Jul 2009 18:51:14 -0400
from svn01.web.mwc.hst.phx2.redhat.com [10.5.105.7]
----- Transcript of session follows -----
<teiid-commits(a)lists.jboss.org>... Deferred: Connection refused by mx1.lists.jboss.org.
Warning: message still undelivered after 4 hours
Will keep trying until message is 5 days old
14 years, 11 months
Warning: could not send message for past 4 hours
by Mail Delivery Subsystem
**********************************************
** THIS IS A WARNING MESSAGE ONLY **
** YOU DO NOT NEED TO RESEND YOUR MESSAGE **
**********************************************
The original message was received at Tue, 21 Jul 2009 18:53:50 -0400
from svn01.web.mwc.hst.phx2.redhat.com [10.5.105.7]
----- Transcript of session follows -----
<teiid-commits(a)lists.jboss.org>... Deferred: Connection refused by mx1.lists.jboss.org.
Warning: message still undelivered after 4 hours
Will keep trying until message is 5 days old
14 years, 11 months
teiid SVN: r1167 - trunk/documentation/reference/src/main/docbook/en-US/content.
by teiid-commits@lists.jboss.org
Author: shawkins
Date: 2009-07-21 22:53:09 -0400 (Tue, 21 Jul 2009)
New Revision: 1167
Modified:
trunk/documentation/reference/src/main/docbook/en-US/content/procedures.xml
Log:
fixing minor typo
Modified: trunk/documentation/reference/src/main/docbook/en-US/content/procedures.xml
===================================================================
--- trunk/documentation/reference/src/main/docbook/en-US/content/procedures.xml 2009-07-22 02:48:37 UTC (rev 1166)
+++ trunk/documentation/reference/src/main/docbook/en-US/content/procedures.xml 2009-07-22 02:53:09 UTC (rev 1167)
@@ -68,7 +68,7 @@
DECLARE string sql_string = 'SELECT ID, First || ‘‘ ‘‘ || Last AS Name, Birthdate FROM Customer.Accounts WHERE ' || criteria;
/* The execution of the SQL string will create the #temp table with the columns (ID, Name, Birthdate).
Note that we also have the USING clause to bind a value to LastName, which is referenced in the criteria. */
-EXECUTE STRING sql_string; AS ID integer, Name string, Birthdate date INTO #temp USING LastName='some name';
+EXECUTE STRING sql_string AS ID integer, Name string, Birthdate date INTO #temp USING LastName='some name';
/* The temp table can now be used with the values from the Dynamic SQL */
loop on (SELCT ID from #temp) as myCursor
...</programlisting>
14 years, 11 months
teiid SVN: r1166 - in trunk: connectors/connector-ldap/src/test/java/com/metamatrix/connector/ldap and 1 other directories.
by teiid-commits@lists.jboss.org
Author: shawkins
Date: 2009-07-21 22:48:37 -0400 (Tue, 21 Jul 2009)
New Revision: 1166
Added:
trunk/connectors/connector-ldap/src/test/java/com/metamatrix/connector/ldap/TestLDAPConnection.java
Modified:
trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPConnection.java
trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPConnector.java
trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ExecutionContextImpl.java
Log:
TEIID-731 fixing the ldapconnection initialization logic
Modified: trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPConnection.java
===================================================================
--- trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPConnection.java 2009-07-22 01:23:58 UTC (rev 1165)
+++ trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPConnection.java 2009-07-22 02:48:37 UTC (rev 1166)
@@ -59,6 +59,7 @@
private String ldapAdminUserDN;
private String ldapAdminUserPass;
private String ldapTxnTimeoutInMillis;
+ private String jndiLdapCtxFactory;
/**
* Constructor.
@@ -67,11 +68,16 @@
* @param logger
*/
public LDAPConnection(ExecutionContext ctx, Properties props, ConnectorLogger logger) throws ConnectorException {
+ this(ctx, props, logger, LDAPConnectorConstants.JNDI_LDAP_CTX_FACTORY);
+ }
+
+ public LDAPConnection(ExecutionContext ctx, Properties props, ConnectorLogger logger, String jndiLdapCtxFactory) throws ConnectorException {
this.logger = logger;
this.props = props;
+ this.jndiLdapCtxFactory = jndiLdapCtxFactory;
-
-
+ parseProperties(props);
+
// Create initial LDAP connection.
try {
this.initCtx = initializeLDAPContext();
@@ -79,11 +85,14 @@
final String msg = LDAPPlugin.Util.getString("LDAPConnection.contextInitFailed"); //$NON-NLS-1$
throw new ConnectorException(ce, msg);
}
+
logger.logDetail("LDAP Connection has been newly created."); //$NON-NLS-1$
-
- parseProperties(props);
}
+ public void setJndiLdapCtxFactory(String jndiLdapCtxFactory) {
+ this.jndiLdapCtxFactory = jndiLdapCtxFactory;
+ }
+
/**
* Helper method to retrieve the LDAP Connector properties. If any properties are in error,
* a ConnectorException is thrown.
@@ -122,7 +131,7 @@
InitialLdapContext initContext;
Hashtable connenv = new Hashtable();
- connenv.put(Context.INITIAL_CONTEXT_FACTORY, LDAPConnectorConstants.JNDI_LDAP_CTX_FACTORY);
+ connenv.put(Context.INITIAL_CONTEXT_FACTORY, jndiLdapCtxFactory);
connenv.put(Context.PROVIDER_URL, this.ldapURL);
connenv.put(Context.REFERRAL, LDAP_REFERRAL_MODE);
// If username is blank, we will perform an anonymous bind.
Modified: trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPConnector.java
===================================================================
--- trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPConnector.java 2009-07-22 01:23:58 UTC (rev 1165)
+++ trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPConnector.java 2009-07-22 02:48:37 UTC (rev 1166)
@@ -41,9 +41,7 @@
private ConnectorLogger logger;
private Properties props;
private LDAPConnectorCapabilities myCaps;
- private int ldapMaxCriteria;
-
@Override
public ConnectorCapabilities getCapabilities() {
return myCaps;
Added: trunk/connectors/connector-ldap/src/test/java/com/metamatrix/connector/ldap/TestLDAPConnection.java
===================================================================
--- trunk/connectors/connector-ldap/src/test/java/com/metamatrix/connector/ldap/TestLDAPConnection.java (rev 0)
+++ trunk/connectors/connector-ldap/src/test/java/com/metamatrix/connector/ldap/TestLDAPConnection.java 2009-07-22 02:48:37 UTC (rev 1166)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+
+package com.metamatrix.connector.ldap;
+
+import java.util.Hashtable;
+import java.util.Properties;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.naming.spi.InitialContextFactory;
+
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import com.metamatrix.cdk.api.EnvironmentUtility;
+import com.metamatrix.cdk.api.SysLogger;
+
+public class TestLDAPConnection {
+
+ public static class FakeFactory implements InitialContextFactory {
+ @Override
+ public Context getInitialContext(Hashtable<?, ?> environment)
+ throws NamingException {
+ return Mockito.mock(Context.class);
+ }
+ }
+
+ @Test public void testInitialization() throws Exception {
+ Properties p = new Properties();
+ p.setProperty(LDAPConnectorPropertyNames.LDAP_URL, "ldap://foo"); //$NON-NLS-1$
+ p.setProperty(LDAPConnectorPropertyNames.LDAP_ADMIN_USER_DN, "admin"); //$NON-NLS-1$
+ p.setProperty(LDAPConnectorPropertyNames.LDAP_ADMIN_USER_PASSWORD, "password"); //$NON-NLS-1$
+ new LDAPConnection(EnvironmentUtility.createExecutionContext("1", "1"), p, EnvironmentUtility.createStdoutLogger(SysLogger.ERROR), FakeFactory.class.getName()); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+}
Property changes on: trunk/connectors/connector-ldap/src/test/java/com/metamatrix/connector/ldap/TestLDAPConnection.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ExecutionContextImpl.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ExecutionContextImpl.java 2009-07-22 01:23:58 UTC (rev 1165)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ExecutionContextImpl.java 2009-07-22 02:48:37 UTC (rev 1166)
@@ -27,16 +27,13 @@
import java.util.LinkedList;
import java.util.List;
-import org.teiid.connector.api.CacheScope;
import org.teiid.connector.api.ConnectorIdentity;
import org.teiid.connector.api.ExecutionContext;
import org.teiid.dqp.internal.cache.DQPContextCache;
-import org.teiid.dqp.internal.process.DQPWorkContext;
import com.metamatrix.cache.Cache;
import com.metamatrix.common.buffer.impl.BufferConfig;
import com.metamatrix.core.util.HashCodeUtil;
-import com.metamatrix.dqp.service.BufferService;
/**
*/
14 years, 11 months
Warning: could not send message for past 4 hours
by Mail Delivery Subsystem
**********************************************
** THIS IS A WARNING MESSAGE ONLY **
** YOU DO NOT NEED TO RESEND YOUR MESSAGE **
**********************************************
The original message was received at Tue, 21 Jul 2009 17:07:33 -0400
from svn01.web.mwc.hst.phx2.redhat.com [10.5.105.7]
----- Transcript of session follows -----
<teiid-commits(a)lists.jboss.org>... Deferred: Connection refused by mx1.lists.jboss.org.
Warning: message still undelivered after 4 hours
Will keep trying until message is 5 days old
14 years, 11 months
teiid SVN: r1165 - in trunk/embedded/src: main/java/com/metamatrix/dqp/embedded/services and 2 other directories.
by teiid-commits@lists.jboss.org
Author: rareddy
Date: 2009-07-21 21:23:58 -0400 (Tue, 21 Jul 2009)
New Revision: 1165
Modified:
trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/configuration/ServerConfigFileReader.java
trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java
trunk/embedded/src/test/java/com/metamatrix/dqp/embedded/services/TestEmbeddedConfigurationService.java
trunk/embedded/src/test/resources/dqp/dqp.properties
Log:
TEIID-652: Corrected issue such that if the default properties for the connector type are not found in the configuration.xml, then the default properties from the connector type object instantiated will be taken. Also, stream lined the loading of VDB during the initialization of the embedded configuration service similar to that of adding VDB through admin api, so that there is only one way to load a VDB.
Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/configuration/ServerConfigFileReader.java
===================================================================
--- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/configuration/ServerConfigFileReader.java 2009-07-21 23:33:56 UTC (rev 1164)
+++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/configuration/ServerConfigFileReader.java 2009-07-22 01:23:58 UTC (rev 1165)
@@ -173,7 +173,11 @@
// Load connector bindings, do we ever need connector types?
Collection<ConnectorBinding> bindings = configuration.getConfiguration().getConnectorBindings();
for(ConnectorBinding binding:bindings) {
- if (binding.getFullName().equalsIgnoreCase(name)) {
+ String deployedName = binding.getDeployedName();
+ if (deployedName == null) {
+ deployedName = binding.getFullName();
+ }
+ if (deployedName.equalsIgnoreCase(name)) {
return true;
}
}
Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java
===================================================================
--- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java 2009-07-21 23:33:56 UTC (rev 1164)
+++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java 2009-07-22 01:23:58 UTC (rev 1165)
@@ -728,7 +728,7 @@
}
private boolean isGlobalConnectorBinding(ConnectorBinding binding) {
- return ServerConfigFileReader.containsBinding(this.configurationModel, binding.getFullName());
+ return ServerConfigFileReader.containsBinding(this.configurationModel, binding.getDeployedName());
}
/**
@@ -755,9 +755,11 @@
DQPEmbeddedPlugin.logInfo("EmbeddedConfigurationService.connector_delete", new Object[] {binding.getDeployedName()}); //$NON-NLS-1$
loadedConnectorBindings.remove(binding.getDeployedName());
- // only save to the configuration xml only if the shared tag is set to true
- this.configurationModel = ServerConfigFileWriter.deleteConnectorBinding(configurationModel, binding);
- saveSystemConfiguration(this.configurationModel);
+ if (isGlobalConnectorBinding(binding)) {
+ // only save to the configuration xml only if the shared tag is set to true
+ this.configurationModel = ServerConfigFileWriter.deleteConnectorBinding(configurationModel, binding);
+ saveSystemConfiguration(this.configurationModel);
+ }
}
else {
throw new MetaMatrixComponentException(DQPEmbeddedPlugin.Util.getString("EmbeddedConfigurationService.connector_binding_delete_failed", deployedConnectorBindingName)); //$NON-NLS-1$
Modified: trunk/embedded/src/test/java/com/metamatrix/dqp/embedded/services/TestEmbeddedConfigurationService.java
===================================================================
--- trunk/embedded/src/test/java/com/metamatrix/dqp/embedded/services/TestEmbeddedConfigurationService.java 2009-07-21 23:33:56 UTC (rev 1164)
+++ trunk/embedded/src/test/java/com/metamatrix/dqp/embedded/services/TestEmbeddedConfigurationService.java 2009-07-22 01:23:58 UTC (rev 1165)
@@ -140,7 +140,7 @@
public void testGetDirectoryToStoreVDBS() throws Exception {
Properties p = EmbeddedTestUtil.getProperties();
service.setUserPreferences(p);
- assertTrue(service.getVDBSaveLocation().toString().endsWith("dqp/config/")); //$NON-NLS-1$
+ assertTrue(service.getVDBSaveLocation().toString().endsWith("dqp/config/QT_Ora9DS.vdb")); //$NON-NLS-1$
}
public void testGetDirectoryToStoreVDBSByVDBName() throws Exception {
Modified: trunk/embedded/src/test/resources/dqp/dqp.properties
===================================================================
--- trunk/embedded/src/test/resources/dqp/dqp.properties 2009-07-21 23:33:56 UTC (rev 1164)
+++ trunk/embedded/src/test/resources/dqp/dqp.properties 2009-07-22 01:23:58 UTC (rev 1165)
@@ -20,7 +20,7 @@
# 02110-1301 USA.
#
-vdb.definition=./config
+vdb.definition=./config/QT_Ora9DS.vdb;./config/Admin.vdb
#dqp.metadata.systemURL=file://${system-vdb-path}/System.vdb
dqp.configFile=./config/ServerConfig.xml
dqp.classpath=./lib
14 years, 11 months
teiid SVN: r1164 - trunk/embedded/src/main/java/com/metamatrix/platform/security/session/service.
by teiid-commits@lists.jboss.org
Author: shawkins
Date: 2009-07-21 19:33:56 -0400 (Tue, 21 Jul 2009)
New Revision: 1164
Modified:
trunk/embedded/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java
Log:
TEIID-733 fix for CME in the SessionServiceImpl
Modified: trunk/embedded/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java
===================================================================
--- trunk/embedded/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java 2009-07-21 23:02:07 UTC (rev 1163)
+++ trunk/embedded/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java 2009-07-21 23:33:56 UTC (rev 1164)
@@ -26,11 +26,11 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import java.util.Timer;
import java.util.TimerTask;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;
import org.teiid.dqp.internal.process.DQPCore;
@@ -83,7 +83,7 @@
private DQPCore dqpCore;
private VDBService vdbService;
- private Map<MetaMatrixSessionID, MetaMatrixSessionInfo> sessionCache = new HashMap<MetaMatrixSessionID, MetaMatrixSessionInfo>();
+ private Map<MetaMatrixSessionID, MetaMatrixSessionInfo> sessionCache = new ConcurrentHashMap<MetaMatrixSessionID, MetaMatrixSessionInfo>();
private Timer sessionMonitor;
private AtomicLong idSequence = new AtomicLong();
private SessionListener sessionListener;
14 years, 11 months