[teiid-commits] teiid SVN: r1915 - in trunk/engine/src/main/java/com/metamatrix/common/buffer: impl and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2010-03-05 09:18:19 -0500 (Fri, 05 Mar 2010)
New Revision: 1915

Modified:
   trunk/engine/src/main/java/com/metamatrix/common/buffer/StorageManager.java
   trunk/engine/src/main/java/com/metamatrix/common/buffer/impl/BufferManagerImpl.java
Log:
TEIID-833 committing JCA merge

Modified: trunk/engine/src/main/java/com/metamatrix/common/buffer/StorageManager.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/common/buffer/StorageManager.java	2010-03-05 14:14:05 UTC (rev 1914)
+++ trunk/engine/src/main/java/com/metamatrix/common/buffer/StorageManager.java	2010-03-05 14:18:19 UTC (rev 1915)
@@ -22,13 +22,11 @@
 
 package com.metamatrix.common.buffer;
 
-import java.util.Properties;
-
 import com.metamatrix.api.exception.MetaMatrixComponentException;
 
 public interface StorageManager {
 
-	void initialize(Properties props) throws MetaMatrixComponentException;
+	void initialize() throws MetaMatrixComponentException;
 
 	FileStore createFileStore(String name);
 

Modified: trunk/engine/src/main/java/com/metamatrix/common/buffer/impl/BufferManagerImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/common/buffer/impl/BufferManagerImpl.java	2010-03-05 14:14:05 UTC (rev 1914)
+++ trunk/engine/src/main/java/com/metamatrix/common/buffer/impl/BufferManagerImpl.java	2010-03-05 14:18:19 UTC (rev 1915)
@@ -32,7 +32,6 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -59,7 +58,6 @@
 import com.metamatrix.common.types.StandardXMLTranslator;
 import com.metamatrix.common.types.Streamable;
 import com.metamatrix.common.types.XMLType;
-import com.metamatrix.common.util.PropertiesUtils;
 import com.metamatrix.core.MetaMatrixRuntimeException;
 import com.metamatrix.core.log.MessageLevel;
 import com.metamatrix.core.util.Assertion;
@@ -367,8 +365,7 @@
     }
     
 	@Override
-	public void initialize(Properties props) throws MetaMatrixComponentException {
-		PropertiesUtils.setBeanProperties(this, props, "org.teiid.buffer"); //$NON-NLS-1$
+	public void initialize() throws MetaMatrixComponentException {
 		DataTypeManager.addSourceTransform(Source.class, new SourceTransform<Source, XMLType>() {
 			@Override
 			public XMLType transform(Source value) {