[teiid-commits] teiid SVN: r2380 - trunk/runtime/src/main/java/org/teiid/services.

[teiid-commits at lists.jboss.org]

Author: rareddy
Date: 2010-07-27 13:38:29 -0400 (Tue, 27 Jul 2010)
New Revision: 2380

Modified:
   trunk/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java
   trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java
Log:
TEIID-1169: adding a fixed management name as these are singletons

Modified: trunk/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java	2010-07-27 17:15:15 UTC (rev 2379)
+++ trunk/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java	2010-07-27 17:38:29 UTC (rev 2380)
@@ -30,7 +30,6 @@
 import org.jboss.managed.api.annotation.ManagementObject;
 import org.jboss.managed.api.annotation.ManagementProperties;
 import org.jboss.managed.api.annotation.ManagementProperty;
-import org.teiid.cache.CacheFactory;
 import org.teiid.common.buffer.BufferManager;
 import org.teiid.common.buffer.impl.BufferManagerImpl;
 import org.teiid.common.buffer.impl.FileStorageManager;
@@ -48,7 +47,7 @@
  * a mixed disk/memory model which requires use of a directory on the disk 
  * for file service access.
  */
- at ManagementObject(componentType=@ManagementComponent(type="teiid",subtype="dqp"), properties=ManagementProperties.EXPLICIT)
+ at ManagementObject(name="BufferService", componentType=@ManagementComponent(type="teiid",subtype="dqp"), properties=ManagementProperties.EXPLICIT)
 public class BufferServiceImpl implements BufferService, Serializable {
 	private static final long serialVersionUID = -6217808623863643531L;
 	private static final long MB = 1<<20;
@@ -59,7 +58,6 @@
 	private boolean useDisk = true;
 	private int processorBatchSize = BufferManager.DEFAULT_PROCESSOR_BATCH_SIZE;
 	private int connectorBatchSize = BufferManager.DEFAULT_CONNECTOR_BATCH_SIZE;
-	private CacheFactory cacheFactory;
     private int maxOpenFiles = FileStorageManager.DEFAULT_MAX_OPEN_FILES;
     private long maxFileSize = FileStorageManager.DEFAULT_MAX_FILESIZE; // 2GB
     private int maxProcessingBatchesColumns = BufferManager.DEFAULT_MAX_PROCESSING_BATCHES;
@@ -163,10 +161,6 @@
 		return this.connectorBatchSize;
 	}
 
-	public void setCacheFactory(CacheFactory cf) {
-		this.cacheFactory = cf;
-	}
-	
     public void setMaxFileSize(long maxFileSize) {
     	this.maxFileSize = maxFileSize;
 	}

Modified: trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java	2010-07-27 17:15:15 UTC (rev 2379)
+++ trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java	2010-07-27 17:38:29 UTC (rev 2380)
@@ -62,7 +62,7 @@
 /**
  * This class serves as the primary implementation of the Session Service.
  */
- at ManagementObject(componentType=@ManagementComponent(type="teiid",subtype="dqp"), properties=ManagementProperties.EXPLICIT)
+ at ManagementObject(name="SessionService", componentType=@ManagementComponent(type="teiid",subtype="dqp"), properties=ManagementProperties.EXPLICIT)
 public class SessionServiceImpl implements SessionService {
 	public static final String SECURITY_DOMAINS = "securitydomains"; //$NON-NLS-1$