Author: shawkins
Date: 2009-07-26 23:24:44 -0400 (Sun, 26 Jul 2009)
New Revision: 1192
Modified:
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/derby/TestDerbyCapabilities.java
trunk/connectors/connector-text/src/main/resources/connector-text.xml
trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java
Log:
TEIID-739 minor update to derby and adding immutable=true to the text connector.
Modified:
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/derby/TestDerbyCapabilities.java
===================================================================
---
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/derby/TestDerbyCapabilities.java 2009-07-27
03:23:43 UTC (rev 1191)
+++
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/derby/TestDerbyCapabilities.java 2009-07-27
03:24:44 UTC (rev 1192)
@@ -37,9 +37,9 @@
@Test public void testFunctionSupport() {
DerbyCapabilities derbyCapabilities = new DerbyCapabilities();
- assertEquals(32, derbyCapabilities.getSupportedFunctions().size());
+ assertEquals(27, derbyCapabilities.getSupportedFunctions().size());
derbyCapabilities.setVersion(DerbyCapabilities.TEN_4);
- assertEquals(48, derbyCapabilities.getSupportedFunctions().size());
+ assertEquals(43, derbyCapabilities.getSupportedFunctions().size());
}
}
Modified: trunk/connectors/connector-text/src/main/resources/connector-text.xml
===================================================================
--- trunk/connectors/connector-text/src/main/resources/connector-text.xml 2009-07-27
03:23:43 UTC (rev 1191)
+++ trunk/connectors/connector-text/src/main/resources/connector-text.xml 2009-07-27
03:24:44 UTC (rev 1192)
@@ -7,5 +7,6 @@
<PropertyDefinition Name="EnforceColumnCount"
DisplayName="Enforce Column Count" ShortDescription="This forces the number
of columns in text file to match what was modeled" DefaultValue="false"
PropertyType="Boolean" />
<PropertyDefinition Name="DateResultFormatsDelimiter"
DisplayName="Date Result Formats Delimiter" ShortDescription=""
IsExpert="true" />
<PropertyDefinition Name="DateResultFormats"
DisplayName="Date Result Formats" ShortDescription=""
IsExpert="true" />
+ <PropertyDefinition Name="Immutable" DisplayName="Is
Immutable" ShortDescription="True if the source never changes."
DefaultValue="true" IsRequired="true" PropertyType="Boolean"
IsExpert="true" />
</ComponentType>
\ No newline at end of file
Modified:
trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java
===================================================================
---
trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java 2009-07-27
03:23:43 UTC (rev 1191)
+++
trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java 2009-07-27
03:24:44 UTC (rev 1192)
@@ -54,8 +54,6 @@
import com.metamatrix.common.log.LogManager;
import com.metamatrix.common.protocol.URLHelper;
import com.metamatrix.common.util.PropertiesUtils;
-import com.metamatrix.common.util.crypto.CryptoException;
-import com.metamatrix.common.util.crypto.CryptoUtil;
import com.metamatrix.common.vdb.api.ModelInfo;
import com.metamatrix.common.vdb.api.VDBArchive;
import com.metamatrix.common.vdb.api.VDBDefn;