teiid SVN: r2369 - in trunk: build/kits/jboss-container and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2010-07-22 17:40:25 -0400 (Thu, 22 Jul 2010)
New Revision: 2369
Modified:
trunk/build/kits/jboss-container/teiid-releasenotes.html
trunk/pom.xml
trunk/runtime/src/test/java/org/teiid/transport/TestCommSockets.java
Log:
TEIID-1165 upgrading netty
Modified: trunk/build/kits/jboss-container/teiid-releasenotes.html
===================================================================
--- trunk/build/kits/jboss-container/teiid-releasenotes.html 2010-07-22 15:15:43 UTC (rev 2368)
+++ trunk/build/kits/jboss-container/teiid-releasenotes.html 2010-07-22 21:40:25 UTC (rev 2369)
@@ -120,6 +120,7 @@
The following components have been updated:
<h4>From 7.0</h4>
<ul>
+ <li>Netty was upgraded to 3.2.0
<li>JDOM was removed.
</ul>
<h4>From 6.2</h4>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-07-22 15:15:43 UTC (rev 2368)
+++ trunk/pom.xml 2010-07-22 21:40:25 UTC (rev 2369)
@@ -482,7 +482,7 @@
<dependency>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.1.5.GA</version>
+ <version>3.2.0.Final</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
Modified: trunk/runtime/src/test/java/org/teiid/transport/TestCommSockets.java
===================================================================
--- trunk/runtime/src/test/java/org/teiid/transport/TestCommSockets.java 2010-07-22 15:15:43 UTC (rev 2368)
+++ trunk/runtime/src/test/java/org/teiid/transport/TestCommSockets.java 2010-07-22 21:40:25 UTC (rev 2369)
@@ -33,7 +33,6 @@
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.teiid.client.security.ILogon;
import org.teiid.client.security.LogonException;
@@ -198,22 +197,16 @@
config.setAuthenticationMode(SSLConfiguration.ANONYMOUS);
Properties p = new Properties();
p.setProperty(SocketUtil.TRUSTSTORE_FILENAME, SocketUtil.NONE);
- try {
- helpEstablishConnection(true, config, p);
- } catch (CommunicationException e) {
-
- }
+ helpEstablishConnection(true, config, p);
SocketServerConnection conn = helpEstablishConnection(true, config, p);
conn.close();
}
- @Ignore("should be enabled with Netty 3.2")
@Test(expected=CommunicationException.class) public void testNonSSLConnectWithSSLServer() throws Exception {
SSLConfiguration config = new SSLConfiguration();
config.setSslEnabled(true);
config.setAuthenticationMode(SSLConfiguration.ANONYMOUS);
Properties p = new Properties();
- p.setProperty(SocketUtil.TRUSTSTORE_FILENAME, SocketUtil.NONE);
helpEstablishConnection(true, config, p);
}
15 years, 6 months
teiid SVN: r2368 - in trunk/runtime/src: test/java/org/teiid/services and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-07-22 11:15:43 -0400 (Thu, 22 Jul 2010)
New Revision: 2368
Modified:
trunk/runtime/src/main/java/org/teiid/services/TeiidLoginContext.java
trunk/runtime/src/test/java/org/teiid/services/TestMembershipServiceImpl.java
Log:
TEIID-1048: adding a unit test for pass though identity
Modified: trunk/runtime/src/main/java/org/teiid/services/TeiidLoginContext.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/services/TeiidLoginContext.java 2010-07-22 13:29:41 UTC (rev 2367)
+++ trunk/runtime/src/main/java/org/teiid/services/TeiidLoginContext.java 2010-07-22 15:15:43 UTC (rev 2368)
@@ -78,7 +78,7 @@
if (existing != null) {
this.userName = getUserName(existing)+AT+domain;
this.securitydomain = domain;
- this.loginContext = new LoginContext(domain, existing);
+ this.loginContext = createLoginContext(domain, existing);
return;
}
@@ -133,6 +133,10 @@
protected LoginContext createLoginContext(String domain, CallbackHandler handler) throws LoginException {
return new LoginContext(domain, handler);
}
+
+ protected LoginContext createLoginContext(String domain, Subject subject) throws LoginException {
+ return new LoginContext(domain, subject);
+ }
public LoginContext getLoginContext() {
return this.loginContext;
Modified: trunk/runtime/src/test/java/org/teiid/services/TestMembershipServiceImpl.java
===================================================================
--- trunk/runtime/src/test/java/org/teiid/services/TestMembershipServiceImpl.java 2010-07-22 13:29:41 UTC (rev 2367)
+++ trunk/runtime/src/test/java/org/teiid/services/TestMembershipServiceImpl.java 2010-07-22 15:15:43 UTC (rev 2368)
@@ -22,9 +22,12 @@
package org.teiid.services;
+import java.security.Principal;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
+import javax.security.auth.Subject;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
@@ -51,11 +54,24 @@
}
private TeiidLoginContext createMembershipService() throws Exception {
- TeiidLoginContext membershipService = new TeiidLoginContext(Mockito.mock(SecurityHelper.class)) {
+ Principal p = Mockito.mock(Principal.class);
+ Mockito.stub(p.getName()).toReturn("alreadylogged"); //$NON-NLS-1$
+ HashSet<Principal> principals = new HashSet<Principal>();
+ principals.add(p);
+
+ Subject subject = new Subject(false, principals, new HashSet(), new HashSet());
+ SecurityHelper sh = Mockito.mock(SecurityHelper.class);
+ Mockito.stub(sh.getSubjectInContext("passthrough")).toReturn(subject); //$NON-NLS-1$
+
+ TeiidLoginContext membershipService = new TeiidLoginContext(sh) {
public LoginContext createLoginContext(String domain, CallbackHandler handler) throws LoginException {
LoginContext context = Mockito.mock(LoginContext.class);
return context;
}
+ protected LoginContext createLoginContext(String domain, Subject subject) throws LoginException {
+ LoginContext context = Mockito.mock(LoginContext.class);
+ return context;
+ }
};
return membershipService;
}
@@ -64,7 +80,7 @@
public void testAuthenticate() throws Exception {
TeiidLoginContext ms = createMembershipService();
List<String> domains = new ArrayList<String>();
- domains.add("testFile");
+ domains.add("testFile"); //$NON-NLS-1$
ms.authenticateUser("user1", new Credentials("pass1".toCharArray()), null, domains); //$NON-NLS-1$ //$NON-NLS-2$
Mockito.verify(ms.getLoginContext()).login();
@@ -73,4 +89,12 @@
}
+ public void testPassThrough() throws Exception {
+ TeiidLoginContext ms = createMembershipService();
+ List<String> domains = new ArrayList<String>();
+ domains.add("passthrough"); //$NON-NLS-1$
+ ms.authenticateUser("user1", new Credentials("pass1".toCharArray()), null, domains); //$NON-NLS-1$ //$NON-NLS-2$
+
+ assertEquals("alreadylogged@passthrough", ms.getUserName()); //$NON-NLS-1$
+ }
}
15 years, 6 months
teiid SVN: r2367 - trunk/runtime/src/test/java/org/teiid/services.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-07-22 09:29:41 -0400 (Thu, 22 Jul 2010)
New Revision: 2367
Modified:
trunk/runtime/src/test/java/org/teiid/services/TestMembershipServiceImpl.java
Log:
TEIID-1048: Fixing the unit test
Modified: trunk/runtime/src/test/java/org/teiid/services/TestMembershipServiceImpl.java
===================================================================
--- trunk/runtime/src/test/java/org/teiid/services/TestMembershipServiceImpl.java 2010-07-21 22:27:10 UTC (rev 2366)
+++ trunk/runtime/src/test/java/org/teiid/services/TestMembershipServiceImpl.java 2010-07-22 13:29:41 UTC (rev 2367)
@@ -33,7 +33,7 @@
import org.mockito.Mockito;
import org.teiid.security.Credentials;
-import org.teiid.services.TeiidLoginContext;
+import org.teiid.security.SecurityHelper;
public class TestMembershipServiceImpl extends TestCase {
@@ -51,7 +51,7 @@
}
private TeiidLoginContext createMembershipService() throws Exception {
- TeiidLoginContext membershipService = new TeiidLoginContext(null) {
+ TeiidLoginContext membershipService = new TeiidLoginContext(Mockito.mock(SecurityHelper.class)) {
public LoginContext createLoginContext(String domain, CallbackHandler handler) throws LoginException {
LoginContext context = Mockito.mock(LoginContext.class);
return context;
15 years, 6 months
teiid SVN: r2366 - in trunk: jboss-integration/src/main/java/org/teiid/jboss and 2 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-07-21 18:27:10 -0400 (Wed, 21 Jul 2010)
New Revision: 2366
Modified:
trunk/engine/src/main/java/org/teiid/security/SecurityHelper.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/JBossSecurityHelper.java
trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java
trunk/runtime/src/main/java/org/teiid/services/TeiidLoginContext.java
trunk/runtime/src/test/java/org/teiid/services/TestMembershipServiceImpl.java
trunk/runtime/src/test/java/org/teiid/services/TestSessionServiceImpl.java
Log:
TEIID-1048: check for the security context in the current thread context with the same security domain name, if match use that as the login credentials instead of authenticating again.
Modified: trunk/engine/src/main/java/org/teiid/security/SecurityHelper.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/security/SecurityHelper.java 2010-07-21 19:15:52 UTC (rev 2365)
+++ trunk/engine/src/main/java/org/teiid/security/SecurityHelper.java 2010-07-21 22:27:10 UTC (rev 2366)
@@ -36,4 +36,5 @@
Object createSecurityContext(String securityDomain, Principal p, Object credentials, Subject subject);
+ Subject getSubjectInContext(String securityDomain);
}
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/JBossSecurityHelper.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/JBossSecurityHelper.java 2010-07-21 19:15:52 UTC (rev 2365)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/JBossSecurityHelper.java 2010-07-21 22:27:10 UTC (rev 2366)
@@ -28,6 +28,7 @@
import javax.security.auth.Subject;
import org.jboss.security.SecurityContext;
+import org.jboss.security.SubjectInfo;
import org.teiid.security.SecurityHelper;
public class JBossSecurityHelper implements SecurityHelper, Serializable {
@@ -65,5 +66,16 @@
SecurityActions.pushSecurityContext(p, credentials, subject, securityDomain);
return getSecurityContext(securityDomain);
}
+
+ @Override
+ public Subject getSubjectInContext(String securityDomain) {
+ SecurityContext sc = SecurityActions.getSecurityContext();
+ if (sc != null && sc.getSecurityDomain().equals(securityDomain)) {
+ SubjectInfo si = sc.getSubjectInfo();
+ Subject subject = si.getAuthenticatedSubject();
+ return subject;
+ }
+ return null;
+ }
}
Modified: trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java 2010-07-21 19:15:52 UTC (rev 2365)
+++ trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java 2010-07-21 22:27:10 UTC (rev 2366)
@@ -150,11 +150,11 @@
if (!domains.isEmpty()) {
// Authenticate user...
// if not authenticated, this method throws exception
- TeiidLoginContext membership = authenticate(userName, credentials, applicationName, domains);
+ TeiidLoginContext membership = authenticate(userName, credentials, applicationName, domains, this.securityHelper);
loginContext = membership.getLoginContext();
userName = membership.getUserName();
securityDomain = membership.getSecurityDomain();
- securityContext = membership.getSecurityContext(securityHelper);
+ securityContext = membership.getSecurityContext();
}
// Validate VDB and version if logging on to server product...
@@ -204,9 +204,9 @@
return newSession;
}
- protected TeiidLoginContext authenticate(String userName, Credentials credentials, String applicationName, List<String> domains)
+ protected TeiidLoginContext authenticate(String userName, Credentials credentials, String applicationName, List<String> domains, SecurityHelper helper)
throws LoginException {
- TeiidLoginContext membership = new TeiidLoginContext();
+ TeiidLoginContext membership = new TeiidLoginContext(helper);
membership.authenticateUser(userName, credentials, applicationName, domains);
return membership;
}
Modified: trunk/runtime/src/main/java/org/teiid/services/TeiidLoginContext.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/services/TeiidLoginContext.java 2010-07-21 19:15:52 UTC (rev 2365)
+++ trunk/runtime/src/main/java/org/teiid/services/TeiidLoginContext.java 2010-07-21 22:27:10 UTC (rev 2366)
@@ -24,10 +24,12 @@
import java.io.IOException;
import java.security.Principal;
+import java.security.acl.Group;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
+import java.util.Set;
import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
@@ -56,7 +58,12 @@
private String userName;
private String securitydomain;
private Object credentials;
+ private SecurityHelper securityHelper;
+ public TeiidLoginContext(SecurityHelper helper) {
+ this.securityHelper = helper;
+ }
+
public void authenticateUser(String username, final Credentials credential, String applicationName, List<String> domains) throws LoginException {
LogManager.logDetail(LogConstants.CTX_SECURITY, new Object[] {"authenticateUser", username, applicationName}); //$NON-NLS-1$
@@ -67,6 +74,14 @@
// If username specifies no domain, then all domains are tried in order.
for (String domain:getDomainsForUser(domains, username)) {
+ Subject existing = this.securityHelper.getSubjectInContext(domain);
+ if (existing != null) {
+ this.userName = getUserName(existing)+AT+domain;
+ this.securitydomain = domain;
+ this.loginContext = new LoginContext(domain, existing);
+ return;
+ }
+
try {
CallbackHandler handler = new CallbackHandler() {
@Override
@@ -104,7 +119,18 @@
throw new LoginException(RuntimePlugin.Util.getString("SessionServiceImpl.The_username_0_and/or_password_are_incorrect", username )); //$NON-NLS-1$
}
- protected LoginContext createLoginContext(String domain, CallbackHandler handler) throws LoginException {
+ private String getUserName(Subject subject) {
+ Set<Principal> principals = subject.getPrincipals();
+ for (Principal p:principals) {
+ if (p instanceof Group) {
+ continue;
+ }
+ return p.getName();
+ }
+ return null;
+ }
+
+ protected LoginContext createLoginContext(String domain, CallbackHandler handler) throws LoginException {
return new LoginContext(domain, handler);
}
@@ -120,10 +146,10 @@
return this.securitydomain;
}
- public Object getSecurityContext(SecurityHelper helper) {
+ public Object getSecurityContext() {
Object sc = null;
if (this.loginContext != null) {
- sc = helper.getSecurityContext(this.securitydomain);
+ sc = this.securityHelper.getSecurityContext(this.securitydomain);
if ( sc == null){
Subject subject = this.loginContext.getSubject();
Principal principal = null;
@@ -133,7 +159,7 @@
break;
}
}
- return helper.createSecurityContext(this.securitydomain, principal, credentials, subject);
+ return this.securityHelper.createSecurityContext(this.securitydomain, principal, credentials, subject);
}
}
return sc;
Modified: trunk/runtime/src/test/java/org/teiid/services/TestMembershipServiceImpl.java
===================================================================
--- trunk/runtime/src/test/java/org/teiid/services/TestMembershipServiceImpl.java 2010-07-21 19:15:52 UTC (rev 2365)
+++ trunk/runtime/src/test/java/org/teiid/services/TestMembershipServiceImpl.java 2010-07-21 22:27:10 UTC (rev 2366)
@@ -51,7 +51,7 @@
}
private TeiidLoginContext createMembershipService() throws Exception {
- TeiidLoginContext membershipService = new TeiidLoginContext() {
+ TeiidLoginContext membershipService = new TeiidLoginContext(null) {
public LoginContext createLoginContext(String domain, CallbackHandler handler) throws LoginException {
LoginContext context = Mockito.mock(LoginContext.class);
return context;
Modified: trunk/runtime/src/test/java/org/teiid/services/TestSessionServiceImpl.java
===================================================================
--- trunk/runtime/src/test/java/org/teiid/services/TestSessionServiceImpl.java 2010-07-21 19:15:52 UTC (rev 2365)
+++ trunk/runtime/src/test/java/org/teiid/services/TestSessionServiceImpl.java 2010-07-21 22:27:10 UTC (rev 2366)
@@ -15,6 +15,7 @@
import org.teiid.adminapi.impl.SessionMetadata;
import org.teiid.client.security.InvalidSessionException;
import org.teiid.security.Credentials;
+import org.teiid.security.SecurityHelper;
import org.teiid.services.TeiidLoginContext;
import org.teiid.services.SessionServiceImpl;
@@ -30,7 +31,7 @@
SessionServiceImpl ssi = new SessionServiceImpl() {
@Override
- protected TeiidLoginContext authenticate(String userName, Credentials credentials, String applicationName, List<String> domains)
+ protected TeiidLoginContext authenticate(String userName, Credentials credentials, String applicationName, List<String> domains, SecurityHelper helper)
throws LoginException {
impl.authenticateUser(userName, credentials, applicationName, domains);
return impl;
15 years, 6 months
teiid SVN: r2365 - trunk/build/kits/jboss-container/deployers/teiid.deployer.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-07-21 15:15:52 -0400 (Wed, 21 Jul 2010)
New Revision: 2365
Modified:
trunk/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml
Log:
package name changes
Modified: trunk/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml
===================================================================
--- trunk/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml 2010-07-21 16:16:51 UTC (rev 2364)
+++ trunk/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml 2010-07-21 19:15:52 UTC (rev 2365)
@@ -5,7 +5,7 @@
<!-- Deployer specific Stuff -->
<bean name="VDBStructure" class="org.teiid.deployers.VDBStructure" />
<bean name="VDBRepository" class="org.teiid.deployers.VDBRepository"/>
- <bean name="ConnectorManagerRepository" class="org.teiid.dqp.internal.datamgr.impl.ConnectorManagerRepository"/>
+ <bean name="ConnectorManagerRepository" class="org.teiid.dqp.internal.datamgr.ConnectorManagerRepository"/>
<bean name="SecurityHelper" class="org.teiid.jboss.JBossSecurityHelper"/>
<bean name="JBossLifeCycleListener" class="org.teiid.jboss.JBossLifeCycleListener"/>
@@ -60,7 +60,7 @@
<property name="VDBStatusChecker"><inject bean="VDBStatusChecker"/></property>
</bean>
- <bean name="translatorRepository" class="org.teiid.dqp.internal.datamgr.impl.TranslatorRepository"/>
+ <bean name="translatorRepository" class="org.teiid.dqp.internal.datamgr.TranslatorRepository"/>
<bean name="TranslatorParserDeployer" class="org.teiid.deployers.TranslatorParserDeployer"/>
<bean name="TranslatorDeployer" class="org.teiid.deployers.TranslatorDeployer">
15 years, 6 months
teiid SVN: r2364 - trunk/runtime/src/main/java/org/teiid/odbc.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-07-21 12:16:51 -0400 (Wed, 21 Jul 2010)
New Revision: 2364
Modified:
trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
Log:
TEIID-860: Adding ODBC as the application name.
Modified: trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2010-07-21 16:08:56 UTC (rev 2363)
+++ trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2010-07-21 16:16:51 UTC (rev 2364)
@@ -169,7 +169,7 @@
@Override
public void logon(String databaseName, String user, String password) {
try {
- this.connection = (ConnectionImpl)DriverManager.getConnection("jdbc:teiid:"+databaseName, user, password); //$NON-NLS-1$
+ this.connection = (ConnectionImpl)DriverManager.getConnection("jdbc:teiid:"+databaseName+";ApplicationName=ODBC", user, password); //$NON-NLS-1$ //$NON-NLS-2$
int hash = this.connection.getConnectionId().hashCode();
this.client.authenticationSucess(hash, hash);
sync();
15 years, 6 months
teiid SVN: r2363 - in trunk/documentation: reference/src/main/docbook/en-US/content and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-07-21 12:08:56 -0400 (Wed, 21 Jul 2010)
New Revision: 2363
Modified:
trunk/documentation/client-developers-guide/src/main/docbook/en-US/content/odbc.xml
trunk/documentation/reference/src/main/docbook/en-US/content/system_schema.xml
Log:
TEIID-860: Adding OID info to System schema and information about 64 bit drivers for Windows.
Modified: trunk/documentation/client-developers-guide/src/main/docbook/en-US/content/odbc.xml
===================================================================
--- trunk/documentation/client-developers-guide/src/main/docbook/en-US/content/odbc.xml 2010-07-20 21:37:32 UTC (rev 2362)
+++ trunk/documentation/client-developers-guide/src/main/docbook/en-US/content/odbc.xml 2010-07-21 16:08:56 UTC (rev 2363)
@@ -35,9 +35,9 @@
<title>Microsoft Windows</title>
<orderedlist>
<listitem><para>Download the ODBC driver from <ulink url="http://wwwmaster.postgresql.org/download/mirrors-ftp/odbc/versions/msi/ps...">
- PostgreSQL download site</ulink>.</para></listitem>
+ PostgreSQL download site</ulink>. If you are looking for 64-bit Windows driver download the driver from <ulink url="http://code.google.com/p/visionmap/wiki/psqlODBC">here</ulink>. </para></listitem>
<listitem><para>Extract the contents of the ZIP file into a temporary location on you system. For example: "c:\temp\pgodbc"</para></listitem>
- <listitem><para>Double click on "psqlodbc.msi" file to start installation of the driver.</para></listitem>
+ <listitem><para>Double click on "psqlodbc.msi" file or (.exe file in the case of 64 bit) to start installation of the driver.</para></listitem>
<listitem>
<para>The Wizard appears as</para>
<figure id="step1">
Modified: trunk/documentation/reference/src/main/docbook/en-US/content/system_schema.xml
===================================================================
--- trunk/documentation/reference/src/main/docbook/en-US/content/system_schema.xml 2010-07-20 21:37:32 UTC (rev 2362)
+++ trunk/documentation/reference/src/main/docbook/en-US/content/system_schema.xml 2010-07-21 16:08:56 UTC (rev 2363)
@@ -122,6 +122,17 @@
<para>Unique ID</para>
</entry>
</row>
+ <row>
+ <entry>
+ <para>OID</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Unique ID</para>
+ </entry>
+ </row>
<row>
<entry>
<para>Description</para>
@@ -204,6 +215,17 @@
<para>Key unique ID</para>
</entry>
</row>
+ <row>
+ <entry>
+ <para>OID</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Unique ID</para>
+ </entry>
+ </row>
</tbody>
</tgroup>
</informaltable>
@@ -321,6 +343,17 @@
<para>Group unique ID</para>
</entry>
</row>
+ <row>
+ <entry>
+ <para>OID</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Unique ID</para>
+ </entry>
+ </row>
<row>
<entry>
<para>Cardinality</para>
@@ -706,6 +739,17 @@
<para>Element unique ID</para>
</entry>
</row>
+ <row>
+ <entry>
+ <para>OID</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Unique ID</para>
+ </entry>
+ </row>
<row>
<entry>
<para>Description</para>
@@ -854,6 +898,17 @@
<para>Key unique ID</para>
</entry>
</row>
+ <row>
+ <entry>
+ <para>OID</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Unique ID</para>
+ </entry>
+ </row>
</tbody>
</tgroup>
</informaltable>
@@ -968,6 +1023,17 @@
<para>Key UID</para>
</entry>
</row>
+ <row>
+ <entry>
+ <para>OID</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Unique ID</para>
+ </entry>
+ </row>
<row>
<entry>
<para>Position</para>
@@ -1075,6 +1141,17 @@
<para>Procedure UID</para>
</entry>
</row>
+ <row>
+ <entry>
+ <para>OID</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Unique ID</para>
+ </entry>
+ </row>
<row>
<entry>
<para>Description</para>
@@ -1457,6 +1534,17 @@
<para>Data type unique ID</para>
</entry>
</row>
+ <row>
+ <entry>
+ <para>OID</para>
+ </entry>
+ <entry>
+ <para>integer</para>
+ </entry>
+ <entry>
+ <para>Unique ID</para>
+ </entry>
+ </row>
<row>
<entry>
<para>RuntimeType</para>
15 years, 6 months
teiid SVN: r2362 - in trunk: build/kits/jboss-container/deploy/teiid and 10 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-07-20 17:37:32 -0400 (Tue, 20 Jul 2010)
New Revision: 2362
Removed:
trunk/api/src/main/java/org/teiid/translator/CacheScope.java
trunk/engine/src/main/java/org/teiid/dqp/internal/cache/
trunk/engine/src/test/java/org/teiid/dqp/internal/cache/
Modified:
trunk/api/src/main/java/org/teiid/translator/ExecutionContext.java
trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml
trunk/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml
trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java
trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java
trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ExecutionContextImpl.java
trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java
trunk/engine/src/main/java/org/teiid/dqp/service/BufferService.java
trunk/engine/src/test/java/org/teiid/dqp/service/FakeBufferService.java
trunk/runtime/pom.xml
trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java
trunk/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java
Log:
TEIID-1140: commons-logging was set to "provided". The jboss-cache need was removed, by removing the DQPContextCache as this feature is no longer internally used.
Deleted: trunk/api/src/main/java/org/teiid/translator/CacheScope.java
===================================================================
--- trunk/api/src/main/java/org/teiid/translator/CacheScope.java 2010-07-20 20:42:43 UTC (rev 2361)
+++ trunk/api/src/main/java/org/teiid/translator/CacheScope.java 2010-07-20 21:37:32 UTC (rev 2362)
@@ -1,46 +0,0 @@
-/*
- * 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 org.teiid.translator;
-
-import java.io.Serializable;
-
-/**
- * Cache Scope
- *
- * REQUEST - Items placed in this scope are retained until the end of the top level request. The items to be placed
- * does not need to implement {@link Serializable}, however recommended. These items are not replicated across the cluster.
- * SERVICE - Items from this scope are available to the identified connector
- *
- * All the items placed in the below scopes must be {@link Serializable}, as they are replicated across cluster.
- *
- * SESSION - Items placed in the scope retained until the particular User's session of top level request is alive.
- * VDB - Items placed with this scope retained until the life of the VDB;
- *
- * GLOBAL - Items placed in this will available to all until the Query Service is recycled.
- */
-public enum CacheScope {
- REQUEST,
- SERVICE,
- SESSION,
- VDB,
- GLOBAL;
-}
Modified: trunk/api/src/main/java/org/teiid/translator/ExecutionContext.java
===================================================================
--- trunk/api/src/main/java/org/teiid/translator/ExecutionContext.java 2010-07-20 20:42:43 UTC (rev 2361)
+++ trunk/api/src/main/java/org/teiid/translator/ExecutionContext.java 2010-07-20 21:37:32 UTC (rev 2362)
@@ -132,36 +132,4 @@
* @return
*/
boolean isTransactional();
-
- /**
- * Get a item that has been placed previously from cache. If no such object then a null will be returned.
- * The item is placed in {@link CacheScope#REQUEST} scope.
- * @param key
- * @return
- */
- Object get(Object key);
-
- /**
- * Place a item in the Cache in {@link CacheScope#REQUEST} scope.
- * @param key
- * @param value
- */
- void put(Object key, Object value);
-
- /**
- * Get a item that has been placed previously from cache. If no such object then a null will be returned. The item looked
- * up in the specified scope.
- * @param scope
- * @param key
- * @return
- */
- Object getFromCache(CacheScope scope, Object key);
-
- /**
- * Place a item in the Cache in the given scope.
- * @param scope
- * @param key
- * @param value
- */
- void storeInCache(CacheScope scope, Object key, Object value);
}
Modified: trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml
===================================================================
--- trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml 2010-07-20 20:42:43 UTC (rev 2361)
+++ trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml 2010-07-20 21:37:32 UTC (rev 2362)
@@ -16,8 +16,6 @@
</bean>
<bean name="BufferService" class="org.teiid.services.BufferServiceImpl">
- <property name="contextCache"><inject bean="ContextCache"/></property>
- <property name="cacheFactory"><inject bean="TeiidCache"/></property>
<!-- Use disk for buffer management -->
<property name="useDisk">true</property>
<!-- Directory location for the buffer files -->
Modified: trunk/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml
===================================================================
--- trunk/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml 2010-07-20 20:42:43 UTC (rev 2361)
+++ trunk/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml 2010-07-20 21:37:32 UTC (rev 2362)
@@ -45,7 +45,6 @@
</parameter>
</uninstall>
<property name="VDBRepository"><inject bean="VDBRepository"/></property>
- <property name="contextCache"><inject bean="ContextCache"/></property>
<property name="objectSerializer"><inject bean="ObjectSerializer"/></property>
<property name="connectorManagerRepository"><inject bean="ConnectorManagerRepository"/></property>
<property name="translatorRepository"><inject bean="translatorRepository"/></property>
@@ -98,79 +97,4 @@
<!-- used for the translators -->
<bean name="TranslatorDeploymentTemplateInfoFactory" class="org.teiid.templates.TranslatorTemplateInfoFactory"/>
- <!-- JBOSS Cache -->
- <!-- Uncomment for JBoss Cache -->
- <!--
- <bean name="TeiidJBossCacheConfig" class="org.jboss.cache.config.Configuration">
- <property name="runtimeConfig">
- <bean class="org.jboss.cache.config.RuntimeConfig">
- <property name="transactionManager">
- <inject bean="TransactionManager" property="transactionManager"/>
- </property>
- </bean>
- </property>
-
- <property name="isolationLevel">READ_COMMITTED</property>
-
- <property name="cacheMode">LOCAL</property>
-
- <property name="lockAcquisitionTimeout">15000</property>
-
- <property name="exposeManagementStatistics">true</property>
-
- <property name="evictionConfig">
- <bean class="org.jboss.cache.config.EvictionConfig">
- <property name="defaultEvictionPolicyClass">org.jboss.cache.eviction.LRUPolicy</property>
- <property name="wakeupIntervalSeconds">15</property>
- <property name="evictionRegionConfigs">
- <list>
- <bean class="org.jboss.cache.config.EvictionRegionConfig">
- <property name="regionName">/_default_</property>
- <property name="evictionAlgorithmConfig">
- <bean class="org.jboss.cache.eviction.LRUAlgorithmConfig">
- <property name="maxAge">-1</property>
- <property name="timeToLive">-1</property>
- <property name="maxNodes">10000</property>
- </bean>
- </property>
- </bean>
- </list>
- </property>
- </bean>
- </property>
- </bean>
-
- <bean name="TeiidDefaultCacheFactory" class="org.jboss.cache.DefaultCacheFactory">
- <constructor factoryClass="org.jboss.cache.DefaultCacheFactory" factoryMethod="getInstance"/>
- </bean>
-
- <bean name="TeiidJBossCache" class="org.jboss.cache.Cache">
- <constructor factoryMethod="createCache">
- <factory bean="TeiidDefaultCacheFactory"/>
- <parameter class="org.jboss.cache.config.Configuration"><inject bean="TeiidJBossCacheConfig"/></parameter>
- <parameter class="boolean">false</parameter>
- </constructor>
- </bean>
-
- <bean name="TeiidJBossCacheMBean" class="org.jboss.cache.jmx.CacheJmxWrapper">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.cache:service=TeiidCache",exposedInterface=org.jboss.cache.jmx.CacheJmxWrapperMBean.class,registerDirectly=true)</annotation>
- <constructor>
- <parameter class="org.jboss.cache.Cache"><inject bean="TeiidJBossCache"/></parameter>
- </constructor>
- </bean>
-
- <bean name="TeiidCache" class="com.metamatrix.cache.jboss.JBossCacheFactory">
- <property name="cacheName">jboss.cache:service=TeiidCache</property>
- <demand>TransactionManager</demand>
- <demand>TeiidJBossCacheMBean</demand>
- </bean>
- -->
-
- <bean name="TeiidCache" class="org.teiid.cache.DefaultCacheFactory">
- </bean>
-
- <bean name="ContextCache" class="org.teiid.dqp.internal.cache.DQPContextCache">
- <property name="cacheFactory"><inject bean="TeiidCache"/></property>
- <property name="processName">localhost</property>
- </bean>
</deployment>
\ No newline at end of file
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java 2010-07-20 20:42:43 UTC (rev 2361)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java 2010-07-20 21:37:32 UTC (rev 2362)
@@ -37,7 +37,6 @@
import org.teiid.core.TeiidComponentException;
import org.teiid.core.util.Assertion;
import org.teiid.dqp.DQPPlugin;
-import org.teiid.dqp.internal.cache.DQPContextCache;
import org.teiid.dqp.message.AtomicRequestID;
import org.teiid.dqp.message.AtomicRequestMessage;
import org.teiid.dqp.service.BufferService;
@@ -252,14 +251,6 @@
return null;
}
-
- DQPContextCache getContextCache() {
- if (bufferService != null) {
- return bufferService.getContextCache();
- }
- return null;
- }
-
private void checkStatus() throws TeiidComponentException {
if (stopped) {
throw new TeiidComponentException(DQPPlugin.Util.getString("ConnectorManager.not_in_valid_state", this.translatorName)); //$NON-NLS-1$
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java 2010-07-20 20:42:43 UTC (rev 2361)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java 2010-07-20 21:37:32 UTC (rev 2362)
@@ -102,7 +102,6 @@
);
this.securityContext.setUser(requestMsg.getWorkContext().getSubject());
this.securityContext.setBatchSize(this.requestMsg.getFetchSize());
- this.securityContext.setContextCache(manager.getContextCache());
this.connector = manager.getExecutionFactory();
VDBMetaData vdb = requestMsg.getWorkContext().getVDB();
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ExecutionContextImpl.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ExecutionContextImpl.java 2010-07-20 20:42:43 UTC (rev 2361)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ExecutionContextImpl.java 2010-07-20 21:37:32 UTC (rev 2362)
@@ -30,13 +30,8 @@
import javax.security.auth.Subject;
-import org.teiid.cache.Cache;
import org.teiid.common.buffer.BufferManager;
import org.teiid.core.util.HashCodeUtil;
-import org.teiid.dqp.DQPPlugin;
-import org.teiid.dqp.internal.cache.DQPContextCache;
-import org.teiid.dqp.internal.process.DQPWorkContext;
-import org.teiid.translator.CacheScope;
import org.teiid.translator.ExecutionContext;
@@ -66,7 +61,6 @@
private boolean keepAlive = false;
private boolean isTransactional;
- private DQPContextCache contextCache;
private int batchSize = BufferManager.DEFAULT_CONNECTOR_BATCH_SIZE;
private List<Exception> warnings = new LinkedList<Exception>();
@@ -210,79 +204,4 @@
warnings.clear();
return result;
}
-
- public void setContextCache(DQPContextCache cache) {
- this.contextCache = cache;
- }
-
- @Override
- public Object get(Object key) {
- if (this.contextCache != null) {
- Cache cache = contextCache.getRequestScopedCache(getRequestIdentifier());
- return cache.get(key);
- }
- return null;
- }
-
- @Override
- public void put(Object key, Object value) {
- if (this.contextCache != null) {
- Cache cache = contextCache.getRequestScopedCache(getRequestIdentifier());
- cache.put(key, value);
- }
- }
-
-
- @Override
- public Object getFromCache(CacheScope scope, Object key) {
- DQPWorkContext context = DQPWorkContext.getWorkContext();
- checkScopeValidity(scope, context);
-
- Cache cache = getScopedCache(scope, context);
- if (cache != null) {
- return cache.get(key);
- }
- return null;
- }
-
- @Override
- public void storeInCache(CacheScope scope, Object key, Object value) {
- DQPWorkContext context = DQPWorkContext.getWorkContext();
- checkScopeValidity(scope, context);
- Cache cache = getScopedCache(scope, context);
- if (cache != null) {
- cache.put(key, value);
- }
- }
-
- private Cache getScopedCache(CacheScope scope, DQPWorkContext context) {
- switch (scope) {
- case SERVICE:
- return contextCache.getServiceScopedCache(getConnectorIdentifier());
- case SESSION:
- return contextCache.getSessionScopedCache(String.valueOf(context.getSessionToken().getSessionID()));
- case VDB:
- return contextCache.getVDBScopedCache(context.getVdbName(), context.getVdbVersion());
- case GLOBAL:
- return contextCache.getGlobalScopedCache();
- }
- return null;
- }
-
- private void checkScopeValidity(CacheScope scope, DQPWorkContext context) {
- if (scope == CacheScope.REQUEST) {
- throw new IllegalStateException(DQPPlugin.Util.getString("ConnectorEnvironmentImpl.request_scope_error")); //$NON-NLS-1$
- }
-
- if (scope == CacheScope.SESSION) {
- if (context == null || context.getSessionToken() == null) {
- throw new IllegalStateException(DQPPlugin.Util.getString("ConnectorEnvironmentImpl.session_scope_error")); //$NON-NLS-1$
- }
- }
- else if (scope == CacheScope.VDB) {
- if (context == null || context.getVdbName() == null || context.getVdbVersion() == 0) {
- throw new IllegalStateException(DQPPlugin.Util.getString("ConnectorEnvironmentImpl.vdb_scope_error")); //$NON-NLS-1$
- }
- }
- }
}
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2010-07-20 20:42:43 UTC (rev 2361)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2010-07-20 21:37:32 UTC (rev 2362)
@@ -58,7 +58,6 @@
import org.teiid.core.TeiidProcessingException;
import org.teiid.core.types.Streamable;
import org.teiid.dqp.DQPPlugin;
-import org.teiid.dqp.internal.cache.DQPContextCache;
import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository;
import org.teiid.dqp.internal.process.ThreadReuseExecutor.PrioritizedRunnable;
import org.teiid.dqp.message.AtomicRequestMessage;
@@ -203,7 +202,6 @@
private Map<RequestID, RequestWorkItem> requests = new ConcurrentHashMap<RequestID, RequestWorkItem>();
private Map<String, ClientState> clientState = Collections.synchronizedMap(new HashMap<String, ClientState>());
- private DQPContextCache contextCache;
private boolean useEntitlements = false;
private int maxActivePlans = DQPConfiguration.DEFAULT_MAX_ACTIVE_PLANS;
@@ -396,7 +394,6 @@
if (state != null) {
state.removeRequest(workItem.requestID);
}
- contextCache.removeRequestScopedCache(workItem.requestID.toString());
}
void addWork(Runnable work) {
@@ -489,7 +486,6 @@
} catch (XATransactionException err) {
LogManager.logWarning(LogConstants.CTX_DQP, "rollback failed for requestID=" + sessionId); //$NON-NLS-1$
}
- contextCache.removeSessionScopedCache(sessionId);
}
public boolean cancelRequest(String sessionId, long requestId) throws TeiidComponentException {
@@ -668,7 +664,6 @@
//get buffer manager
this.bufferManager = bufferService.getBufferManager();
- this.contextCache = bufferService.getContextCache();
this.processWorkerPool = new ThreadReuseExecutor(DQPConfiguration.PROCESS_PLAN_QUEUE_NAME, config.getMaxThreads());
@@ -683,13 +678,8 @@
public void setBufferService(BufferService service) {
this.bufferService = service;
- setContextCache(service.getContextCache());
}
- public void setContextCache(DQPContextCache cache) {
- this.contextCache = cache;
- }
-
public void setTransactionService(TransactionService service) {
this.transactionService = service;
}
Modified: trunk/engine/src/main/java/org/teiid/dqp/service/BufferService.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/service/BufferService.java 2010-07-20 20:42:43 UTC (rev 2361)
+++ trunk/engine/src/main/java/org/teiid/dqp/service/BufferService.java 2010-07-20 21:37:32 UTC (rev 2362)
@@ -22,19 +22,10 @@
package org.teiid.dqp.service;
-import org.teiid.cache.CacheFactory;
import org.teiid.common.buffer.BufferManager;
-import org.teiid.dqp.internal.cache.DQPContextCache;
-/**
- */
public interface BufferService {
-
BufferManager getBufferManager();
+}
- DQPContextCache getContextCache();
-
- CacheFactory getCacheFactory();
- }
-
Modified: trunk/engine/src/test/java/org/teiid/dqp/service/FakeBufferService.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/service/FakeBufferService.java 2010-07-20 20:42:43 UTC (rev 2361)
+++ trunk/engine/src/test/java/org/teiid/dqp/service/FakeBufferService.java 2010-07-20 21:37:32 UTC (rev 2362)
@@ -22,12 +22,8 @@
package org.teiid.dqp.service;
-import org.teiid.cache.CacheFactory;
-import org.teiid.cache.FakeCache.FakeCacheFactory;
import org.teiid.common.buffer.BufferManager;
import org.teiid.common.buffer.BufferManagerFactory;
-import org.teiid.dqp.internal.cache.DQPContextCache;
-import org.teiid.dqp.service.BufferService;
public class FakeBufferService implements BufferService {
@@ -43,16 +39,4 @@
return bufferMgr;
}
- @Override
- public DQPContextCache getContextCache() {
- DQPContextCache cache = new DQPContextCache();
- cache.setCacheFactory(new FakeCacheFactory());
- cache.setProcessName("test");
- return cache;
- }
-
- @Override
- public CacheFactory getCacheFactory() {
- return null;
- }
}
Modified: trunk/runtime/pom.xml
===================================================================
--- trunk/runtime/pom.xml 2010-07-20 20:42:43 UTC (rev 2361)
+++ trunk/runtime/pom.xml 2010-07-20 21:37:32 UTC (rev 2362)
@@ -45,10 +45,6 @@
<artifactId>teiid-metadata</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-cache-jbosscache</artifactId>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>provided</scope>
@@ -56,6 +52,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.netty</groupId>
Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java 2010-07-20 20:42:43 UTC (rev 2361)
+++ trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java 2010-07-20 21:37:32 UTC (rev 2362)
@@ -41,7 +41,6 @@
import org.teiid.adminapi.impl.VDBTranslatorMetaData;
import org.teiid.core.CoreConstants;
import org.teiid.core.util.FileUtils;
-import org.teiid.dqp.internal.cache.DQPContextCache;
import org.teiid.dqp.internal.datamgr.ConnectorManager;
import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository;
import org.teiid.dqp.internal.datamgr.TranslatorRepository;
@@ -60,7 +59,6 @@
private VDBRepository vdbRepository;
private ConnectorManagerRepository connectorManagerRepository;
private TranslatorRepository translatorRepository;
- private DQPContextCache contextCache;
private ObjectSerializer serializer;
private ContainerLifeCycleListener shutdownListener;
@@ -245,11 +243,6 @@
this.vdbRepository.removeVDB(deployment.getName(), deployment.getVersion());
}
- if (this.contextCache != null) {
- // remove any vdb specific context cache
- this.contextCache.removeVDBScopedCache(deployment.getName(), deployment.getVersion());
- }
-
try {
deleteMetadataStore((VFSDeploymentUnit)unit, deployment);
} catch (IOException e) {
@@ -259,10 +252,6 @@
LogManager.logInfo(LogConstants.CTX_RUNTIME, RuntimePlugin.Util.getString("vdb_undeployed", deployment)); //$NON-NLS-1$
}
- public void setContextCache(DQPContextCache cache) {
- this.contextCache = cache;
- }
-
public void setObjectSerializer(ObjectSerializer serializer) {
this.serializer = serializer;
}
Modified: trunk/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java 2010-07-20 20:42:43 UTC (rev 2361)
+++ trunk/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java 2010-07-20 21:37:32 UTC (rev 2362)
@@ -38,7 +38,6 @@
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidRuntimeException;
import org.teiid.core.util.FileUtils;
-import org.teiid.dqp.internal.cache.DQPContextCache;
import org.teiid.dqp.service.BufferService;
import org.teiid.runtime.RuntimePlugin;
@@ -58,7 +57,6 @@
private BufferManagerImpl bufferMgr;
private File bufferDir;
private boolean useDisk = true;
- private DQPContextCache contextCache;
private int processorBatchSize = BufferManager.DEFAULT_PROCESSOR_BATCH_SIZE;
private int connectorBatchSize = BufferManager.DEFAULT_CONNECTOR_BATCH_SIZE;
private CacheFactory cacheFactory;
@@ -128,16 +126,7 @@
public BufferManager getBufferManager() {
return this.bufferMgr;
}
-
- @Override
- public DQPContextCache getContextCache() {
- return this.contextCache;
- }
- public void setContextCache(DQPContextCache cache) {
- this.contextCache = cache;
- }
-
public void setUseDisk(boolean flag) {
this.useDisk = flag;
}
@@ -174,11 +163,6 @@
return this.connectorBatchSize;
}
- @Override
- public CacheFactory getCacheFactory() {
- return this.cacheFactory;
- }
-
public void setCacheFactory(CacheFactory cf) {
this.cacheFactory = cf;
}
15 years, 6 months
