March 2009 - teiid-commits - Jboss List Archives

teiid SVN: r628 - in trunk: adminshell and 41 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2009-03-23 19:04:06 -0400 (Mon, 23 Mar 2009) New Revision: 628 Modified: trunk/adminshell/pom.xml trunk/cache-jbosscache/pom.xml trunk/client-jdbc/pom.xml trunk/client/pom.xml trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerInstanceImpl.java trunk/common-core/pom.xml trunk/common-internal/pom.xml trunk/common-internal/src/test/java/com/metamatrix/common/config/connector/ConnectorBindingCreationTest.java trunk/connector-api/pom.xml trunk/connector-metadata/pom.xml trunk/connector-sdk/pom.xml trunk/connectors/connector-jdbc/pom.xml trunk/connectors/connector-ldap/pom.xml trunk/connectors/connector-loopback/pom.xml trunk/connectors/connector-salesforce/pom.xml trunk/connectors/connector-text/pom.xml trunk/connectors/connector-xml-common/pom.xml trunk/connectors/connector-xml/pom.xml trunk/connectors/pom.xml trunk/connectors/salesforce-api/pom.xml trunk/connectors/sandbox/connector-exec/pom.xml trunk/connectors/sandbox/connector-object/pom.xml trunk/connectors/sandbox/connector-oracle-spatial/pom.xml trunk/connectors/sandbox/connector-yahoo/pom.xml trunk/connectors/sandbox/pom.xml trunk/console/pom.xml trunk/documentation/admin-guide/pom.xml trunk/documentation/connector-developer-guide/pom.xml trunk/documentation/jdbc-connector-guide/pom.xml trunk/documentation/pom.xml trunk/documentation/quick-start-example/pom.xml trunk/documentation/reference/pom.xml trunk/documentation/server-extensions-guide/pom.xml trunk/embedded/pom.xml trunk/embedded/src/main/resources/configuration-designer.xml trunk/engine/pom.xml trunk/metadata/pom.xml trunk/pom.xml trunk/server-installer/pom.xml trunk/server/pom.xml trunk/soap/pom.xml trunk/test-integration/pom.xml trunk/txn-jbossts/pom.xml Log: updating to 6.1.0 release Modified: trunk/adminshell/pom.xml =================================================================== --- trunk/adminshell/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/adminshell/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-adminshell</artifactId> Modified: trunk/cache-jbosscache/pom.xml =================================================================== --- trunk/cache-jbosscache/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/cache-jbosscache/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -4,7 +4,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-cache-jbosscache</artifactId> Modified: trunk/client/pom.xml =================================================================== --- trunk/client/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/client/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -5,7 +5,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-client</artifactId> Modified: trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerInstanceImpl.java =================================================================== --- trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerInstanceImpl.java 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerInstanceImpl.java 2009-03-23 23:04:06 UTC (rev 628) @@ -146,8 +146,7 @@ createInstance(channel); fail("exception expected"); //$NON-NLS-1$ } catch (CommunicationException e) { - e.printStackTrace(); - assertEquals("Handshake failed due to version mismatch -- Client Version: 6.0, Server Version: foo", e.getMessage()); //$NON-NLS-1$ + assertTrue(e.getMessage().startsWith("Handshake failed due to version mismatch")); //$NON-NLS-1$ } } Modified: trunk/client-jdbc/pom.xml =================================================================== --- trunk/client-jdbc/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/client-jdbc/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -6,7 +6,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-client-jdbc</artifactId> Modified: trunk/common-core/pom.xml =================================================================== --- trunk/common-core/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/common-core/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -4,7 +4,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-common-core</artifactId> Modified: trunk/common-internal/pom.xml =================================================================== --- trunk/common-internal/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/common-internal/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -5,7 +5,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-common-internal</artifactId> Modified: trunk/common-internal/src/test/java/com/metamatrix/common/config/connector/ConnectorBindingCreationTest.java =================================================================== --- trunk/common-internal/src/test/java/com/metamatrix/common/config/connector/ConnectorBindingCreationTest.java 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/common-internal/src/test/java/com/metamatrix/common/config/connector/ConnectorBindingCreationTest.java 2009-03-23 23:04:06 UTC (rev 628) @@ -103,7 +103,7 @@ */ public void testCreateORACLE_ANSIConnectorBinding() throws Exception { - ComponentType ct = config.getComponentType(ORACLE_ANSI); //$NON-NLS-1$ + ComponentType ct = config.getComponentType(ORACLE_ANSI); helpTestConnectorBinding(ct, "TestOracleANSI"); //$NON-NLS-1$ } @@ -115,7 +115,7 @@ */ public void testCreateORACLE_8ConnectorBinding() throws Exception { - ComponentType ct = config.getComponentType(ORACLE_8); //$NON-NLS-1$ + ComponentType ct = config.getComponentType(ORACLE_8); helpTestConnectorBinding(ct, "ORACLE_8"); //$NON-NLS-1$ } @@ -127,7 +127,7 @@ */ public void testCreateDB2ConnectorBinding() throws Exception { - ComponentType ct = config.getComponentType(DB2); //$NON-NLS-1$ + ComponentType ct = config.getComponentType(DB2); helpTestConnectorBinding(ct, "DB2"); //$NON-NLS-1$ } @@ -139,7 +139,7 @@ */ public void testCreateSYBASE_ANSIConnectorBinding() throws Exception { - ComponentType ct = config.getComponentType(SYBASE_ANSI); //$NON-NLS-1$ + ComponentType ct = config.getComponentType(SYBASE_ANSI); helpTestConnectorBinding(ct, "SYBASE_ANSI"); //$NON-NLS-1$ } @@ -151,7 +151,7 @@ */ public void testCreateSYBASE_11ConnectorBinding() throws Exception { - ComponentType ct = config.getComponentType(SYBASE_11); //$NON-NLS-1$ + ComponentType ct = config.getComponentType(SYBASE_11); helpTestConnectorBinding(ct, "SYBASE_11"); //$NON-NLS-1$ } @@ -163,7 +163,7 @@ */ public void testCreateSQL_SERVERConnectorBinding() throws Exception { - ComponentType ct = config.getComponentType(SQL_SERVER); //$NON-NLS-1$ + ComponentType ct = config.getComponentType(SQL_SERVER); helpTestConnectorBinding(ct, "SQL_SERVER"); //$NON-NLS-1$ } @@ -175,7 +175,7 @@ */ public void testCreateJDBC_GENERICConnectorBinding() throws Exception { - ComponentType ct = config.getComponentType(JDBC_GENERIC); //$NON-NLS-1$ + ComponentType ct = config.getComponentType(JDBC_GENERIC); helpTestConnectorBinding(ct, "JDBC_GENERIC"); //$NON-NLS-1$ } @@ -187,7 +187,7 @@ */ public void testCreateMS_ACCESSConnectorBinding() throws Exception { - ComponentType ct = config.getComponentType(MS_ACCESS); //$NON-NLS-1$ + ComponentType ct = config.getComponentType(MS_ACCESS); helpTestConnectorBinding(ct, "MS_ACCESS"); //$NON-NLS-1$ } @@ -199,7 +199,7 @@ */ public void testCreateJDBC_ODBCConnectorBinding() throws Exception { - ComponentType ct = config.getComponentType(JDBC_ODBC); //$NON-NLS-1$ + ComponentType ct = config.getComponentType(JDBC_ODBC); helpTestConnectorBinding(ct, "JDBC_ODBC"); //$NON-NLS-1$ } @@ -211,7 +211,7 @@ */ public void testCreateTEXT_FILEConnectorBinding() throws Exception { - ComponentType ct = config.getComponentType(TEXT_FILE); //$NON-NLS-1$ + ComponentType ct = config.getComponentType(TEXT_FILE); helpTestConnectorBinding(ct, "TEXT_FILE"); //$NON-NLS-1$ } @@ -223,7 +223,7 @@ */ public void testCreateMYSQLConnectorBinding() throws Exception { - ComponentType ct = config.getComponentType(MYSQL); //$NON-NLS-1$ + ComponentType ct = config.getComponentType(MYSQL); helpTestConnectorBinding(ct, "MYSQL"); //$NON-NLS-1$ } @@ -235,7 +235,7 @@ */ public void testCreatePOSTGRESQLConnectorBinding() throws Exception { - ComponentType ct = config.getComponentType(POSTGRESQL); //$NON-NLS-1$ + ComponentType ct = config.getComponentType(POSTGRESQL); helpTestConnectorBinding(ct, "POSTGRESQL"); //$NON-NLS-1$ } @@ -247,7 +247,7 @@ */ public void testCreateAPACHE_DERBY_EMBEDDEDConnectorBinding() throws Exception { - ComponentType ct = config.getComponentType(APACHE_DERBY_EMBEDDED); //$NON-NLS-1$ + ComponentType ct = config.getComponentType(APACHE_DERBY_EMBEDDED); helpTestConnectorBinding(ct, "APACHE_DERBY_EMBEDDED"); //$NON-NLS-1$ } @@ -259,7 +259,7 @@ */ public void testCreateAPACHE_DERBY_NETWORKConnectorBinding() throws Exception { - ComponentType ct = config.getComponentType(APACHE_DERBY_NETWORK); //$NON-NLS-1$ + ComponentType ct = config.getComponentType(APACHE_DERBY_NETWORK); helpTestConnectorBinding(ct, "APACHE_DERBY_NETWORK"); //$NON-NLS-1$ } @@ -271,7 +271,7 @@ */ public void testCreateSECURE_DATA_SOURCEConnectorBinding() throws Exception { - ComponentType ct = config.getComponentType(SECURE_DATA_SOURCE); //$NON-NLS-1$ + ComponentType ct = config.getComponentType(SECURE_DATA_SOURCE); helpTestConnectorBinding(ct, "SECURE_DATA_SOURCE"); //$NON-NLS-1$ } @@ -283,7 +283,7 @@ */ public void testCreateSOAPConnectorBinding() throws Exception { - ComponentType ct = config.getComponentType(SOAP); //$NON-NLS-1$ + ComponentType ct = config.getComponentType(SOAP); helpTestConnectorBinding(ct, "SOAP"); //$NON-NLS-1$ } @@ -295,7 +295,7 @@ */ public void testCreateXML_FILEConnectorBinding() throws Exception { - ComponentType ct = config.getComponentType(XML_FILE); //$NON-NLS-1$ + ComponentType ct = config.getComponentType(XML_FILE); helpTestConnectorBinding(ct, "XML_FILE"); //$NON-NLS-1$ } @@ -307,7 +307,7 @@ */ public void testCreateXML_HTTPConnectorBinding() throws Exception { - ComponentType ct = config.getComponentType(XML_HTTP); //$NON-NLS-1$ + ComponentType ct = config.getComponentType(XML_HTTP); helpTestConnectorBinding(ct, "XML_HTTP"); //$NON-NLS-1$ } Modified: trunk/connector-api/pom.xml =================================================================== --- trunk/connector-api/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/connector-api/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -5,7 +5,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-connector-api</artifactId> Modified: trunk/connector-metadata/pom.xml =================================================================== --- trunk/connector-metadata/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/connector-metadata/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -4,7 +4,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/connector-sdk/pom.xml =================================================================== --- trunk/connector-sdk/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/connector-sdk/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -5,7 +5,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-connector-sdk</artifactId> Modified: trunk/connectors/connector-jdbc/pom.xml =================================================================== --- trunk/connectors/connector-jdbc/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/connectors/connector-jdbc/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -5,7 +5,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-jdbc</artifactId> Modified: trunk/connectors/connector-ldap/pom.xml =================================================================== --- trunk/connectors/connector-ldap/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/connectors/connector-ldap/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ldap</artifactId> Modified: trunk/connectors/connector-loopback/pom.xml =================================================================== --- trunk/connectors/connector-loopback/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/connectors/connector-loopback/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -5,7 +5,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-loopback</artifactId> Modified: trunk/connectors/connector-salesforce/pom.xml =================================================================== --- trunk/connectors/connector-salesforce/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/connectors/connector-salesforce/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -5,7 +5,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-salesforce</artifactId> Modified: trunk/connectors/connector-text/pom.xml =================================================================== --- trunk/connectors/connector-text/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/connectors/connector-text/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-text</artifactId> Modified: trunk/connectors/connector-xml/pom.xml =================================================================== --- trunk/connectors/connector-xml/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/connectors/connector-xml/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -5,7 +5,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-xml</artifactId> Modified: trunk/connectors/connector-xml-common/pom.xml =================================================================== --- trunk/connectors/connector-xml-common/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/connectors/connector-xml-common/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -5,7 +5,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-xml-common</artifactId> Modified: trunk/connectors/pom.xml =================================================================== --- trunk/connectors/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/connectors/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -4,7 +4,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/connectors/salesforce-api/pom.xml =================================================================== --- trunk/connectors/salesforce-api/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/connectors/salesforce-api/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>salesforce-api</artifactId> Modified: trunk/connectors/sandbox/connector-exec/pom.xml =================================================================== --- trunk/connectors/sandbox/connector-exec/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/connectors/sandbox/connector-exec/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -3,7 +3,7 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.jboss.teiid.connectors</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-exec</artifactId> Modified: trunk/connectors/sandbox/connector-object/pom.xml =================================================================== --- trunk/connectors/sandbox/connector-object/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/connectors/sandbox/connector-object/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -4,7 +4,7 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.jboss.teiid.connectors</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-object</artifactId> Modified: trunk/connectors/sandbox/connector-oracle-spatial/pom.xml =================================================================== --- trunk/connectors/sandbox/connector-oracle-spatial/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/connectors/sandbox/connector-oracle-spatial/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -3,7 +3,7 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.jboss.teiid.connectors</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-oracle-spatial</artifactId> Modified: trunk/connectors/sandbox/connector-yahoo/pom.xml =================================================================== --- trunk/connectors/sandbox/connector-yahoo/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/connectors/sandbox/connector-yahoo/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -3,7 +3,7 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.jboss.teiid.connectors</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-yahoo</artifactId> Modified: trunk/connectors/sandbox/pom.xml =================================================================== --- trunk/connectors/sandbox/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/connectors/sandbox/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid.connectors</groupId> Modified: trunk/console/pom.xml =================================================================== --- trunk/console/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/console/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -4,7 +4,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-console</artifactId> Modified: trunk/documentation/admin-guide/pom.xml =================================================================== --- trunk/documentation/admin-guide/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/documentation/admin-guide/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.teiid.documentation</groupId> <artifactId>documentation</artifactId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>admin-guide</artifactId> Modified: trunk/documentation/connector-developer-guide/pom.xml =================================================================== --- trunk/documentation/connector-developer-guide/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/documentation/connector-developer-guide/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.teiid.documentation</groupId> <artifactId>documentation</artifactId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-developer-guide</artifactId> Modified: trunk/documentation/jdbc-connector-guide/pom.xml =================================================================== --- trunk/documentation/jdbc-connector-guide/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/documentation/jdbc-connector-guide/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.teiid.documentation</groupId> <artifactId>documentation</artifactId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jdbc-connector</artifactId> Modified: trunk/documentation/pom.xml =================================================================== --- trunk/documentation/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/documentation/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid.documentation</groupId> Modified: trunk/documentation/quick-start-example/pom.xml =================================================================== --- trunk/documentation/quick-start-example/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/documentation/quick-start-example/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.teiid.documentation</groupId> <artifactId>documentation</artifactId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>quick-start-guide</artifactId> Modified: trunk/documentation/reference/pom.xml =================================================================== --- trunk/documentation/reference/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/documentation/reference/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.teiid.documentation</groupId> <artifactId>documentation</artifactId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>reference</artifactId> Modified: trunk/documentation/server-extensions-guide/pom.xml =================================================================== --- trunk/documentation/server-extensions-guide/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/documentation/server-extensions-guide/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.teiid.documentation</groupId> <artifactId>documentation</artifactId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>server-extensions-guide</artifactId> Modified: trunk/embedded/pom.xml =================================================================== --- trunk/embedded/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/embedded/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/embedded/src/main/resources/configuration-designer.xml =================================================================== --- trunk/embedded/src/main/resources/configuration-designer.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/embedded/src/main/resources/configuration-designer.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -112,7 +112,7 @@ </ComponentType> <ComponentType Name="LDAP Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.946-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.946-06:00"> <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" Multiplicity="0..1" IsPreferred="true" /> - <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-ldap.6.0.0-SNAPSHOT.jar;" Multiplicity="0..1" IsExpert="true" /> + <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-ldap.6.1.0-SNAPSHOT.jar;" Multiplicity="0..1" IsExpert="true" /> <PropertyDefinition Name="SearchDefaultBaseDN" DisplayName="Default Search Base DN" ShortDescription="Default Base DN for LDAP Searches" IsExpert="true" /> <PropertyDefinition Name="com.metamatrix.data.pool.cleaning_interval" DisplayName="Pool cleaning Interval (seconds)" ShortDescription="Set the interval to cleaning the pool" DefaultValue="300" PropertyType="Integer" IsExpert="true" /> <PropertyDefinition Name="LdapAdminUserDN" DisplayName="Ldap Admin User DN" ShortDescription="User DN for the LDAP admin account." DefaultValue="cn=<>,ou=<>,dc=<>" Multiplicity="1" IsPreferred="true" /> @@ -134,7 +134,7 @@ </ComponentType> <ComponentType Name="Loopback Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.945-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.945-06:00"> <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" Multiplicity="0..1" IsPreferred="true" /> - <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-loopback.6.0.0-SNAPSHOT.jar;" Multiplicity="0..1" IsExpert="true" /> + <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-loopback.6.1.0-SNAPSHOT.jar;" Multiplicity="0..1" IsExpert="true" /> <PropertyDefinition Name="CapabilitiesClass" DisplayName="Capabilities Class" ShortDescription="" DefaultValue="com.metamatrix.connector.loopback.LoopbackCapabilities" Multiplicity="1" IsExpert="true" /> <PropertyDefinition Name="WaitTime" DisplayName="Max Random Wait Time" ShortDescription="" DefaultValue="0" Multiplicity="1" IsExpert="true" /> <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.loopback.LoopbackConnector" Multiplicity="1" IsExpert="true" /> @@ -143,7 +143,7 @@ <ComponentType Name="Salesforce Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.916-06:00" CreationDate="2008-10-31T10:26:19.916-06:00"> <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" Multiplicity="0..1" IsPreferred="true" /> <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" - DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-salesforce.6.0.0-SNAPSHOT.jar;extension:commons-codec-1.2.jar;extension:commons-discovery-0.2.jar;extension:commons-httpclient-3.0.1.jar;extension:xmlsec-1.3.0.jar;extension:axis-1.3.jar;extension:axis-jaxrpc-1.3.jar;extension:axis-saaj-1.2.jar;extension:axis-schema-1.3.jar;extension:commons-discovery-0.2.jar;extension:commons-logging-1.1.jar;extension:jms-1.1.jar;extension:servlet-api-2.5.jar;extension:jaxen-1.1.1.jar;extension:jdom-1.0.jar;extension:log4j-1.2.8.jar;extension:opensaml-1.1b.jar;extension:salesforce-api-6.0.0-SNAPSHOT.jar;extension:wsdl4j-1.5.1.jar;extension:wss4j-1.5.0.jar;extension:xalan-2.7.0.jar;extension:xml-apis-1.0.b2.jar" + DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-salesforce.6.1.0-SNAPSHOT.jar;extension:commons-codec-1.2.jar;extension:commons-discovery-0.2.jar;extension:commons-httpclient-3.0.1.jar;extension:xmlsec-1.3.0.jar;extension:axis-1.3.jar;extension:axis-jaxrpc-1.3.jar;extension:axis-saaj-1.2.jar;extension:axis-schema-1.3.jar;extension:commons-discovery-0.2.jar;extension:commons-logging-1.1.jar;extension:jms-1.1.jar;extension:servlet-api-2.5.jar;extension:jaxen-1.1.1.jar;extension:jdom-1.0.jar;extension:log4j-1.2.8.jar;extension:opensaml-1.1b.jar;extension:salesforce-api-6.1.0-SNAPSHOT.jar;extension:wsdl4j-1.5.1.jar;extension:wss4j-1.5.0.jar;extension:xalan-2.7.0.jar;extension:xml-apis-1.0.b2.jar" Multiplicity="0..1" IsExpert="true" /> <PropertyDefinition Name="username" DisplayName="User Name" ShortDescription="Name value for Salesforce authentication" DefaultValue="" Multiplicity="1" IsPreferred="true" /> <PropertyDefinition Name="ConnectorStateClass" DisplayName="Connector State Class" ShortDescription="" DefaultValue="com.metamatrix.connector.salesforce.ConnectorState" Multiplicity="1" IsExpert="true" /> @@ -155,7 +155,7 @@ </ComponentType> <ComponentType Name="Text File Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.945-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.945-06:00"> <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" Multiplicity="0..1" IsPreferred="true" /> - <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-text.6.0.0-SNAPSHOT.jar;" Multiplicity="0..1" IsExpert="true" /> + <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-text.6.1.0-SNAPSHOT.jar;" Multiplicity="0..1" IsExpert="true" /> <PropertyDefinition Name="PartialStartupAllowed" DisplayName="Partial Startup Allowed" ShortDescription="" DefaultValue="true" Multiplicity="1" PropertyType="Boolean" IsExpert="true" IsPreferred="true" /> <PropertyDefinition Name="DescriptorFile" DisplayName="Text File Descriptor" ShortDescription="" Multiplicity="1" IsPreferred="true" /> <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.text.TextConnector" Multiplicity="1" IsExpert="true" /> @@ -166,7 +166,7 @@ <ComponentType Name="XML Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.917-06:00" CreationDate="2008-10-31T10:26:19.917-06:00"> <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" Multiplicity="0..1" IsPreferred="true" /> <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" - DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-xml.6.0.0-SNAPSHOT.jar;extension:commons-codec-1.2.jar;extension:commons-discovery-0.2.jar;extension:commons-httpclient-3.0.1.jar;extension:xmlsec-1.3.0.jar;extension:axis-1.3.jar;extension:axis-jaxrpc-1.3.jar;extension:axis-saaj-1.2.jar;extension:axis-schema-1.3.jar;extension:commons-discovery-0.2.jar;extension:commons-logging-1.1.jar;extension:jms-1.1.jar;extension:servlet-api-2.5.jar;extension:jaxen-1.1.1.jar;extension:jdom-1.0.jar;extension:log4j-1.2.8.jar;extension:opensaml-1.1b.jar;extension:wsdl4j-1.5.1.jar;extension:wss4j-1.5.0.jar;extension:xalan-2.7.0.jar;extension:xml-apis-1.0.b2.jar" + DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-xml.6.1.0-SNAPSHOT.jar;extension:commons-codec-1.2.jar;extension:commons-discovery-0.2.jar;extension:commons-httpclient-3.0.1.jar;extension:xmlsec-1.3.0.jar;extension:axis-1.3.jar;extension:axis-jaxrpc-1.3.jar;extension:axis-saaj-1.2.jar;extension:axis-schema-1.3.jar;extension:commons-discovery-0.2.jar;extension:commons-logging-1.1.jar;extension:jms-1.1.jar;extension:servlet-api-2.5.jar;extension:jaxen-1.1.1.jar;extension:jdom-1.0.jar;extension:log4j-1.2.8.jar;extension:opensaml-1.1b.jar;extension:wsdl4j-1.5.1.jar;extension:wss4j-1.5.0.jar;extension:xalan-2.7.0.jar;extension:xml-apis-1.0.b2.jar" Multiplicity="0..1" IsExpert="true" /> </ComponentType> <ComponentType Name="XML File Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="XML Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.917-06:00" CreationDate="2008-10-31T10:26:19.917-06:00"> @@ -294,7 +294,7 @@ <ComponentType Name="JDBC Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.952-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.952-06:00"> <PropertyDefinition Name="MaxSQLLength" DisplayName="Max SQL String Length" ShortDescription="" DefaultValue="16384" Multiplicity="0..1" PropertyType="Integer" ValueDelimiter="," IsConstrainedToAllowedValues="true" IsExpert="true" IsHidden="false" IsMasked="false" IsModifiable="true" IsPreferred="false" /> <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" Multiplicity="0..1" IsPreferred="true" /> - <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-jdbc.6.0.0-SNAPSHOT.jar;" Multiplicity="0..1" IsExpert="true" /> + <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-jdbc.6.1.0-SNAPSHOT.jar;" Multiplicity="0..1" IsExpert="true" /> <PropertyDefinition Name="UseBindVariables" DisplayName="Use prepared statements and bind variables" ShortDescription="" DefaultValue="false" PropertyType="Boolean" IsExpert="true" /> <PropertyDefinition Name="ExtensionCapabilityClass" DisplayName="Extension Capability Class" ShortDescription="" IsExpert="true" /> <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.JDBCConnector" Multiplicity="1" IsExpert="true" /> Modified: trunk/engine/pom.xml =================================================================== --- trunk/engine/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/engine/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-engine</artifactId> Modified: trunk/metadata/pom.xml =================================================================== --- trunk/metadata/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/metadata/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-metadata</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -6,7 +6,7 @@ <artifactId>teiid</artifactId> <packaging>pom</packaging> <name>Teiid</name> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> <description>Federated SQL and XML query engine.</description> <properties> <ant.version>1.7.0</ant.version> Modified: trunk/server/pom.xml =================================================================== --- trunk/server/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/server/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -5,7 +5,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-server</artifactId> Modified: trunk/server-installer/pom.xml =================================================================== --- trunk/server-installer/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/server-installer/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/soap/pom.xml =================================================================== --- trunk/soap/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/soap/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-soap</artifactId> Modified: trunk/test-integration/pom.xml =================================================================== --- trunk/test-integration/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/test-integration/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -4,7 +4,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-test-integration</artifactId> Modified: trunk/txn-jbossts/pom.xml =================================================================== --- trunk/txn-jbossts/pom.xml 2009-03-23 21:59:58 UTC (rev 627) +++ trunk/txn-jbossts/pom.xml 2009-03-23 23:04:06 UTC (rev 628) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-txn-jbossts</artifactId>

15 years, 10 months

1
0
0 / 0

teiid SVN: r627 - trunk/common-internal/src/main/java/com/metamatrix/common/config/xml.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2009-03-23 17:59:58 -0400 (Mon, 23 Mar 2009) New Revision: 627 Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_Base_ImportExportUtility.java Log: TEIID-323 Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_Base_ImportExportUtility.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_Base_ImportExportUtility.java 2009-03-23 21:59:31 UTC (rev 626) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_Base_ImportExportUtility.java 2009-03-23 21:59:58 UTC (rev 627) @@ -1257,7 +1257,7 @@ iterator = componentTypes.iterator(); while (iterator.hasNext()) { ComponentType type = (ComponentType)iterator.next(); - checkForComponentTypeID(type.getSuperComponentTypeID(), componentTypeIDs); + // checkForComponentTypeID(type.getSuperComponentTypeID(), componentTypeIDs); // checkForProductTypeID(type, type.getParentComponentTypeID(), productTypeIDs, componentTypeIDs); }

15 years, 10 months

1
0
0 / 0

teiid SVN: r626 - branches.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2009-03-23 17:59:31 -0400 (Mon, 23 Mar 2009) New Revision: 626 Added: branches/6.0.x/ Log: creating release branch Copied: branches/6.0.x (from rev 622, trunk)

15 years, 10 months

1
0
0 / 0

teiid SVN: r625 - trunk/server/src/main/java/com/metamatrix/platform/config/spi/xml.

by teiid-commits＠lists.jboss.org

Author: vhalbert(a)redhat.com Date: 2009-03-23 17:08:59 -0400 (Mon, 23 Mar 2009) New Revision: 625 Modified: trunk/server/src/main/java/com/metamatrix/platform/config/spi/xml/XMLConfigurationConnector.java Log: TEIID-323 - with the confusion of PSC, this includes the useless (internal logic) of product types. This change deprecates getting Producttypes Modified: trunk/server/src/main/java/com/metamatrix/platform/config/spi/xml/XMLConfigurationConnector.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/platform/config/spi/xml/XMLConfigurationConnector.java 2009-03-23 21:08:17 UTC (rev 624) +++ trunk/server/src/main/java/com/metamatrix/platform/config/spi/xml/XMLConfigurationConnector.java 2009-03-23 21:08:59 UTC (rev 625) @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.Date; import java.util.Iterator; import java.util.List; @@ -300,7 +301,8 @@ } public Collection getProductTypes(boolean includedeprecated) throws ConfigurationException { - return getConfigurationReader().getProductTypes(includedeprecated); + return Collections.EMPTY_LIST; +// return getConfigurationReader().getProductTypes(includedeprecated); }

15 years, 10 months

1
0
0 / 0

teiid SVN: r624 - trunk/server/src/main/java/com/metamatrix/platform/config/spi.

by teiid-commits＠lists.jboss.org

Author: vhalbert(a)redhat.com Date: 2009-03-23 17:08:17 -0400 (Mon, 23 Mar 2009) New Revision: 624 Modified: trunk/server/src/main/java/com/metamatrix/platform/config/spi/ConfigurationTransaction.java Log: TEIID-323 - with the confusion of PSC, this includes the useless (internal logic) of product types. This change deprecates getting Producttypes Modified: trunk/server/src/main/java/com/metamatrix/platform/config/spi/ConfigurationTransaction.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/platform/config/spi/ConfigurationTransaction.java 2009-03-23 21:07:19 UTC (rev 623) +++ trunk/server/src/main/java/com/metamatrix/platform/config/spi/ConfigurationTransaction.java 2009-03-23 21:08:17 UTC (rev 624) @@ -233,6 +233,7 @@ * included in the returned list, or false if only non-deprecated constants should be returned. * @return Collection of type <code>ComponentType</code> * @throws ConfigurationException if an error occurred within or during communication with the Configuration Service. + * @deprecated as of v 2.0 beta 1 use {@link #getDesignatedConfigurationID} * */ Collection getProductTypes(boolean includeDeprecated) throws ConfigurationException;

15 years, 10 months

1
0
0 / 0

teiid SVN: r623 - trunk/common-internal/src/main/java/com/metamatrix/common/config/xml.

by teiid-commits＠lists.jboss.org

Author: vhalbert(a)redhat.com Date: 2009-03-23 17:07:19 -0400 (Mon, 23 Mar 2009) New Revision: 623 Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_Base_ImportExportUtility.java Log: TEIID-323 - with the confusion of PSC, this includes the useless (internal logic) of product types. This change will not read or write the product types to / from the configuration. Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_Base_ImportExportUtility.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_Base_ImportExportUtility.java 2009-03-23 20:58:43 UTC (rev 622) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_Base_ImportExportUtility.java 2009-03-23 21:07:19 UTC (rev 623) @@ -50,7 +50,7 @@ import com.metamatrix.common.config.api.DeployedComponent; import com.metamatrix.common.config.api.Host; import com.metamatrix.common.config.api.ProductServiceConfig; -import com.metamatrix.common.config.api.ProductType; +//import com.metamatrix.common.config.api.ProductType; import com.metamatrix.common.config.api.ResourceDescriptor; import com.metamatrix.common.config.api.ServiceComponentDefn; import com.metamatrix.common.config.api.SharedResource; @@ -1145,7 +1145,7 @@ List connectorBindings = lists[CONNECTORS_INDEX]; List configurationIDs = lists[CONFIGURATION_IDS_INDEX]; - List productTypeIDs = lists[PRODUCT_TYPE_IDS_INDEX]; + // List productTypeIDs = lists[PRODUCT_TYPE_IDS_INDEX]; List hostIDs = lists[HOST_IDS_INDEX]; List serviceComponentDefnIDs = lists[SERVICE_COMPONENT_DEFN_IDS_INDEX]; List vmComponentDefnIDs = lists[VM_COMPONENT_DEFN_IDS_INDEX]; @@ -1162,7 +1162,7 @@ serviceComponentDefnIDs.add(null); connectorBindingsIDs.add(null); productServiceConfigIDs.add(null); - productTypeIDs.add(null); + // productTypeIDs.add(null); componentTypeIDs.add(null); // now we must iterate through each object type, pull out any references @@ -1191,7 +1191,7 @@ throwObjectsNotResolvable(deployedComponent, deployedComponent.getProductServiceConfigID(), "psc"); //$NON-NLS-1$ } - checkComponentTypeID(deployedComponent, componentTypeIDs, productTypeIDs); + checkComponentTypeID(deployedComponent, componentTypeIDs); } iterator = resources.iterator(); @@ -1219,14 +1219,14 @@ iterator = serviceComponentDefns.iterator(); while (iterator.hasNext()) { ServiceComponentDefn defn = (ServiceComponentDefn)iterator.next(); - checkComponentTypeID(defn, componentTypeIDs, productTypeIDs); + checkComponentTypeID(defn, componentTypeIDs); checkConfigurationID(defn, configurationIDs); } iterator = vmComponentDefns.iterator(); while (iterator.hasNext()) { VMComponentDefn defn = (VMComponentDefn)iterator.next(); - checkComponentTypeID(defn, componentTypeIDs, productTypeIDs); + checkComponentTypeID(defn, componentTypeIDs); checkConfigurationID(defn, configurationIDs); } @@ -1236,7 +1236,7 @@ ProductServiceConfig config = (ProductServiceConfig)iterator.next(); // psc's component types are based on products, not actual component types - checkPSCProductTypeID(config, productTypeIDs); +// checkPSCProductTypeID(config); // checkComponentTypeID(config, componentTypeIDs, productTypeIDs); checkConfigurationID(config, configurationIDs); @@ -1258,7 +1258,7 @@ while (iterator.hasNext()) { ComponentType type = (ComponentType)iterator.next(); checkForComponentTypeID(type.getSuperComponentTypeID(), componentTypeIDs); - checkForProductTypeID(type, type.getParentComponentTypeID(), productTypeIDs, componentTypeIDs); + // checkForProductTypeID(type, type.getParentComponentTypeID(), productTypeIDs, componentTypeIDs); } // iterator = productTypes.iterator(); @@ -1277,13 +1277,13 @@ iterator = configurations.iterator(); while (iterator.hasNext()) { Configuration config = (Configuration)iterator.next(); - checkComponentTypeID(config, componentTypeIDs, productTypeIDs); + checkComponentTypeID(config, componentTypeIDs); } iterator = hosts.iterator(); while (iterator.hasNext()) { Host host = (Host)iterator.next(); - checkComponentTypeID(host, componentTypeIDs, productTypeIDs); + checkComponentTypeID(host, componentTypeIDs); } //*** LogManager.logTrace(LogCommonConstants.CTX_CONFIG, "Configuration objects resolved properly."); @@ -1320,13 +1320,14 @@ // throw e; // } - private void checkComponentTypeID(ComponentObject object, List componentTypeIDs, List productTypeIDs) throws ConfigObjectsNotResolvableException{ - if (!(componentTypeIDs.contains(object.getComponentTypeID())||productTypeIDs.contains(object.getComponentTypeID()))) { - // LogManager.logTrace(LogCommonConstants.CTX_CONFIG, "The ComponentTypeID: " + object.getComponentTypeID() + " was not found in the list of ComponentTypeIDs: " + componentTypeIDs + " or the list of Product TypeIDs: " + productTypeIDs); - throwObjectsNotResolvable(object, object.getComponentTypeID(), "component type"); //$NON-NLS-1$ -// throwConfigObjectsNotResolvableException(object, object.getComponentTypeID()); - } - } +// private void checkComponentTypeID(ComponentObject object, List componentTypeIDs) throws ConfigObjectsNotResolvableException{ +// if (!(componentTypeIDs.contains(object.getComponentTypeID()))) { +// // ||productTypeIDs.contains(object.getComponentTypeID()))) { +// // LogManager.logTrace(LogCommonConstants.CTX_CONFIG, "The ComponentTypeID: " + object.getComponentTypeID() + " was not found in the list of ComponentTypeIDs: " + componentTypeIDs + " or the list of Product TypeIDs: " + productTypeIDs); +// throwObjectsNotResolvable(object, object.getComponentTypeID(), "component type"); //$NON-NLS-1$ +//// throwConfigObjectsNotResolvableException(object, object.getComponentTypeID()); +// } +// } private void checkConfigurationID(ComponentDefn defn, List configurationIDs) throws ConfigObjectsNotResolvableException { if (!configurationIDs.contains(defn.getConfigurationID())) { @@ -1355,13 +1356,13 @@ * @throws ConfigObjectsNotResolvableException * @since 4.2 */ - private void checkPSCProductTypeID(ProductServiceConfig object, List productTypeIDs) throws ConfigObjectsNotResolvableException{ - if (!(productTypeIDs.contains(object.getComponentTypeID()))) { - // LogManager.logTrace(LogCommonConstants.CTX_CONFIG, "The ComponentTypeID: " + object.getComponentTypeID() + " was not found in the list of ComponentTypeIDs: " + componentTypeIDs + " or the list of Product TypeIDs: " + productTypeIDs); - throwObjectsNotResolvable(object, object.getComponentTypeID(), "component type"); //$NON-NLS-1$ -// throwConfigObjectsNotResolvableException(object, object.getComponentTypeID()); - } - } +// private void checkPSCProductTypeID(ProductServiceConfig object, List productTypeIDs) throws ConfigObjectsNotResolvableException{ +// if (!(productTypeIDs.contains(object.getComponentTypeID()))) { +// // LogManager.logTrace(LogCommonConstants.CTX_CONFIG, "The ComponentTypeID: " + object.getComponentTypeID() + " was not found in the list of ComponentTypeIDs: " + componentTypeIDs + " or the list of Product TypeIDs: " + productTypeIDs); +// throwObjectsNotResolvable(object, object.getComponentTypeID(), "component type"); //$NON-NLS-1$ +//// throwConfigObjectsNotResolvableException(object, object.getComponentTypeID()); +// } +// } private void checkForComponentTypeID(ComponentTypeID id, List componentTypeIDs) throws ConfigObjectsNotResolvableException{ @@ -1432,13 +1433,9 @@ Object obj = iterator.next(); // product types need to go before component type - if (obj instanceof ProductType) { - productTypes.add(obj); - productTypeIDs.add(((ProductType)obj).getID()); + if (obj instanceof ComponentType) { - } else if (obj instanceof ComponentType) { - componentTypes.add(obj); componentTypeIDs.add(((BaseObject)obj).getID()); }else if(obj instanceof ComponentObject) { @@ -1476,17 +1473,11 @@ // ComponentDefn cd = (ComponentDefn) obj; //*** LogManager.logDetail(LogCommonConstants.CTX_CONFIG, "The ComponentDefn: " + cd.getFullName() + " could not be categorized as a Standard Configuration Object and will be ignored. Its class type is: " + cd.getClass()); } - } else { - -// ComponentObject co = (ComponentObject) obj; -//*** LogManager.logDetail(LogCommonConstants.CTX_CONFIG, "The ComponentObject: " + co.getFullName() + " could not be categorized as a Standard Configuration Object and will be ignored. Its class type is: " + co.getClass()); - - } - }else { -//*** LogManager.logDetail(LogCommonConstants.CTX_CONFIG, "The Object: " + obj + " could not be categorized as a Standard Configuration Object and will be ignored. Its class type is: " + obj.getClass()); + } } } + lists[CONFIGURATIONS_INDEX] = configurations; lists[PRODUCT_TYPES_INDEX] = productTypes; lists[HOSTS_INDEX] = hosts;

15 years, 10 months

1
0
0 / 0

teiid SVN: r622 - trunk/common-core/src/test/java/com/metamatrix/api/exception.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2009-03-23 16:58:43 -0400 (Mon, 23 Mar 2009) New Revision: 622 Modified: trunk/common-core/src/test/java/com/metamatrix/api/exception/TestMetaMatrixCoreException.java Log: TEIID-431 deferring a test for now Modified: trunk/common-core/src/test/java/com/metamatrix/api/exception/TestMetaMatrixCoreException.java =================================================================== --- trunk/common-core/src/test/java/com/metamatrix/api/exception/TestMetaMatrixCoreException.java 2009-03-23 20:26:22 UTC (rev 621) +++ trunk/common-core/src/test/java/com/metamatrix/api/exception/TestMetaMatrixCoreException.java 2009-03-23 20:58:43 UTC (rev 622) @@ -1,8 +1,16 @@ package com.metamatrix.api.exception; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.ObjectStreamClass; import java.sql.BatchUpdateException; import java.sql.SQLException; +import javax.naming.OperationNotSupportedException; + import junit.framework.TestCase; import com.metamatrix.core.MetaMatrixCoreException; @@ -11,13 +19,13 @@ public class TestMetaMatrixCoreException extends TestCase { public void testSQLExceptionUnrolling() throws Exception { - SQLException se = new BatchUpdateException("foo", new int[] {1}); + SQLException se = new BatchUpdateException("foo", new int[] {1}); //$NON-NLS-1$ MetaMatrixCoreException mmce = new MetaMatrixCoreException(se); mmce = UnitTestUtil.helpSerialize(mmce); assertEquals(SQLException.class, mmce.getCause().getClass()); - assertEquals("foo", mmce.getMessage()); - assertEquals("java.sql.BatchUpdateException: foo", mmce.getCause().getMessage()); + assertEquals("foo", mmce.getMessage()); //$NON-NLS-1$ + assertEquals("java.sql.BatchUpdateException: foo", mmce.getCause().getMessage()); //$NON-NLS-1$ } public void testInitCause() throws Exception { @@ -30,5 +38,28 @@ } } + + public void defer_testDeserializationUnknownException() throws Exception { + MetaMatrixCoreException mmce = new MetaMatrixCoreException(new OperationNotSupportedException()); + + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + ObjectOutputStream oos = new ObjectOutputStream(baos); + oos.writeObject(mmce); + oos.flush(); + + ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray())) { + @Override + protected Class<?> resolveClass(ObjectStreamClass desc) + throws IOException, ClassNotFoundException { + if (desc.getName().equals(OperationNotSupportedException.class.getName())) { + throw new ClassNotFoundException(); + } + return super.resolveClass(desc); + } + + }; + + mmce = (MetaMatrixComponentException)ois.readObject(); + } }

15 years, 10 months

1
0
0 / 0

teiid SVN: r621 - in trunk: connectors and 14 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2009-03-23 16:26:22 -0400 (Mon, 23 Mar 2009) New Revision: 621 Modified: trunk/connectors/connector-jdbc/pom.xml trunk/connectors/connector-ldap/pom.xml trunk/connectors/connector-loopback/pom.xml trunk/connectors/connector-salesforce/pom.xml trunk/connectors/connector-text/pom.xml trunk/connectors/connector-xml-common/pom.xml trunk/connectors/connector-xml/pom.xml trunk/connectors/pom.xml trunk/connectors/salesforce-api/pom.xml trunk/connectors/sandbox/connector-exec/pom.xml trunk/connectors/sandbox/connector-object/pom.xml trunk/connectors/sandbox/connector-oracle-spatial/pom.xml trunk/connectors/sandbox/connector-yahoo/pom.xml trunk/connectors/sandbox/pom.xml trunk/documentation/pom.xml trunk/pom.xml Log: correcting connector group names Modified: trunk/connectors/connector-jdbc/pom.xml =================================================================== --- trunk/connectors/connector-jdbc/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/connector-jdbc/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -3,12 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>teiid-connectors</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-jdbc</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> <name>JDBC Connector</name> <description>This project contains connectors for a JDBC source. Currently this is an aggregator for all the JDBC connectors relational databases.</description> Modified: trunk/connectors/connector-ldap/pom.xml =================================================================== --- trunk/connectors/connector-ldap/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/connector-ldap/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -1,11 +1,12 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>teiid-connectors</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ldap</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> <name>LDAP Connector</name> <description>LDAP Connector</description> Modified: trunk/connectors/connector-loopback/pom.xml =================================================================== --- trunk/connectors/connector-loopback/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/connector-loopback/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -3,12 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>teiid-connectors</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-loopback</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> <name>Loopback Connector</name> <description>Loopback Connector</description> <dependencies> Modified: trunk/connectors/connector-salesforce/pom.xml =================================================================== --- trunk/connectors/connector-salesforce/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/connector-salesforce/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -3,12 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <parent> - <artifactId>teiid-connectors</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-salesforce</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> <name>Salesforce Connector</name> <description>Integrates the query engine with Salesforce.com.</description> <dependencies> Modified: trunk/connectors/connector-text/pom.xml =================================================================== --- trunk/connectors/connector-text/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/connector-text/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <parent> - <artifactId>teiid-connectors</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-text</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> <name>Text Connector</name> <description>This connector reads data from text files.</description> <dependencies> Modified: trunk/connectors/connector-xml/pom.xml =================================================================== --- trunk/connectors/connector-xml/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/connector-xml/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -3,12 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <parent> - <artifactId>teiid-connectors</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-xml</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> <name>XML Connector</name> <description>This connector produces the XML documents from Web service and transforms the document into a relational structure.</description> Modified: trunk/connectors/connector-xml-common/pom.xml =================================================================== --- trunk/connectors/connector-xml-common/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/connector-xml-common/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -3,12 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <parent> - <artifactId>teiid-connectors</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-xml-common</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> <name>XML Common Connector</name> <description>This project holds the common dependencies for the XML Connector</description> <dependencies> Modified: trunk/connectors/pom.xml =================================================================== --- trunk/connectors/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -7,8 +7,8 @@ <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>teiid-connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <artifactId>connectors</artifactId> <packaging>pom</packaging> <name>Connectors</name> <description>This project is aggregator for all the supported connectors.</description> Modified: trunk/connectors/salesforce-api/pom.xml =================================================================== --- trunk/connectors/salesforce-api/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/salesforce-api/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -1,11 +1,12 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>teiid-connectors</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>salesforce-api</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> <name>Salesforce API</name> <description>The java API for the Salesforce.com partner web service API</description> <dependencies> Modified: trunk/connectors/sandbox/connector-exec/pom.xml =================================================================== --- trunk/connectors/sandbox/connector-exec/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/sandbox/connector-exec/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -2,11 +2,12 @@ <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <parent> <artifactId>sandbox</artifactId> - <groupId>org.jboss.teiid.connectors.sandbox</groupId> + <groupId>org.jboss.teiid.connectors</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-exec</artifactId> + <groupId>org.jboss.teiid.connectors.sandbox</groupId> <name>Exec Connector</name> <description>This connector executes Admin API calls and System.exec calls through the connector using SQL representation</description> <dependencies> Modified: trunk/connectors/sandbox/connector-object/pom.xml =================================================================== --- trunk/connectors/sandbox/connector-object/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/sandbox/connector-object/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -3,11 +3,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <artifactId>sandbox</artifactId> - <groupId>org.jboss.teiid.connectors.sandbox</groupId> + <groupId>org.jboss.teiid.connectors</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-object</artifactId> + <groupId>org.jboss.teiid.connectors.sandbox</groupId> <name>Object Connector</name> <description>This is generic connector that can be used to wrap any JAVA API, and turn it into connector</description> Modified: trunk/connectors/sandbox/connector-oracle-spatial/pom.xml =================================================================== --- trunk/connectors/sandbox/connector-oracle-spatial/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/sandbox/connector-oracle-spatial/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -2,11 +2,12 @@ <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <parent> <artifactId>sandbox</artifactId> - <groupId>org.jboss.teiid.connectors.sandbox</groupId> + <groupId>org.jboss.teiid.connectors</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-oracle-spatial</artifactId> + <groupId>org.jboss.teiid.connectors.sandbox</groupId> <name>Oracle Spatial Connector</name> <description>Oracle Spatial Connector</description> <dependencies> Modified: trunk/connectors/sandbox/connector-yahoo/pom.xml =================================================================== --- trunk/connectors/sandbox/connector-yahoo/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/sandbox/connector-yahoo/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -2,11 +2,12 @@ <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <parent> <artifactId>sandbox</artifactId> - <groupId>org.jboss.teiid.connectors.sandbox</groupId> + <groupId>org.jboss.teiid.connectors</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-yahoo</artifactId> + <groupId>org.jboss.teiid.connectors.sandbox</groupId> <name>Yahoo Connector</name> <description>Test connector used to query ticker symbols from Yahoo website</description> Modified: trunk/connectors/sandbox/pom.xml =================================================================== --- trunk/connectors/sandbox/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/sandbox/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <parent> - <artifactId>teiid-connectors</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.teiid.connectors.sandbox</groupId> + <groupId>org.jboss.teiid.connectors</groupId> <artifactId>sandbox</artifactId> <packaging>pom</packaging> <name>Sandbox</name> Modified: trunk/documentation/pom.xml =================================================================== --- trunk/documentation/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/documentation/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -45,19 +45,4 @@ <url>http://snapshots.jboss.org/maven2</url> </pluginRepository> </pluginRepositories> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-2</version> - <configuration> - <descriptors> - <descriptor>assembly/docs.xml</descriptor> - </descriptors> - <outputDirectory>target/distribution</outputDirectory> - <workDirectory>target/assembly/work</workDirectory> - </configuration> - </plugin> - </plugins> - </build> </project> \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -42,7 +42,62 @@ </roles> <timezone>-6</timezone> </developer> + <developer> + <name>Van Halbert</name> + <id>van</id> + <email>vhalbert(a)redhat.com</email> + <organization>Red Hat</organization> + <roles> + <role>Developer</role> + </roles> + <timezone>-6</timezone> + </developer> + <developer> + <name>Ted Jones</name> + <id>ted</id> + <email>tejones(a)redhat.com</email> + <organization>Red Hat</organization> + <roles> + <role>Developer</role> + </roles> + <timezone>-6</timezone> + </developer> </developers> + <profiles> + <profile> +  + <id>release</id> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-2</version> + <configuration> + <descriptors> + <descriptor>build/assembly/src.xml</descriptor> +  + <descriptor>build/assembly/embedded/embedded-client-jar.xml</descriptor> + <descriptor>build/assembly/embedded/embedded-dependencies.xml</descriptor> + <descriptor>build/assembly/embedded/embedded-connector-dependencies.xml</descriptor> + <descriptor>build/assembly/embedded/embedded-jar.xml</descriptor> + <descriptor>build/assembly/embedded/embedded-dist.xml</descriptor> + <descriptor>build/assembly/cdk/cdk-dependencies.xml</descriptor> + <descriptor>build/assembly/cdk/cdk-dist.xml</descriptor> + <descriptor>documentation/assembly/docs.xml</descriptor> + </descriptors> + <outputDirectory>target/distribution</outputDirectory> + <workDirectory>target/assembly/work</workDirectory> + </configuration> + </plugin> + </plugins> + </build> + <modules> + <module>documentation</module> + </modules> + </profile> + </profiles> <build>  <pluginManagement> @@ -119,25 +174,6 @@ </configuration> </plugin> <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-2</version> - <configuration> - <descriptors> - <descriptor>build/assembly/src.xml</descriptor> - <descriptor>build/assembly/bin.xml</descriptor> - <descriptor>build/assembly/embedded/embedded-client-jar.xml</descriptor> - <descriptor>build/assembly/embedded/embedded-dependencies.xml</descriptor> - <descriptor>build/assembly/embedded/embedded-connector-dependencies.xml</descriptor> - <descriptor>build/assembly/embedded/embedded-jar.xml</descriptor> - <descriptor>build/assembly/embedded/embedded-dist.xml</descriptor> - <descriptor>build/assembly/cdk/cdk-dependencies.xml</descriptor> - <descriptor>build/assembly/cdk/cdk-dist.xml</descriptor> - </descriptors> - <outputDirectory>target/distribution</outputDirectory> - <workDirectory>target/assembly/work</workDirectory> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <version>2.5</version>

15 years, 10 months

1
0
0 / 0

teiid SVN: r620 - trunk/build/kit-embedded/examples/portfolio.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2009-03-23 15:06:58 -0400 (Mon, 23 Mar 2009) New Revision: 620 Modified: trunk/build/kit-embedded/examples/portfolio/run.bat trunk/build/kit-embedded/examples/portfolio/run.sh Log: correcting the script files for release Modified: trunk/build/kit-embedded/examples/portfolio/run.bat =================================================================== --- trunk/build/kit-embedded/examples/portfolio/run.bat 2009-03-23 15:53:50 UTC (rev 619) +++ trunk/build/kit-embedded/examples/portfolio/run.bat 2009-03-23 19:06:58 UTC (rev 620) @@ -2,7 +2,7 @@ set CLIENT_PATH=java/*;PortfolioModel/ rem Second one for the JARs in Teiid embedded -set TEIID_PATH=../../teiid-6.0.0-SNAPSHOT-client.jar;../../lib/*;../../extensions/* +set TEIID_PATH=../../teiid-6.0.0-client.jar;../../deploy;../../lib/*;../../extensions/* java -cp %CLIENT_PATH%;%TEIID_PATH% JDBCClient "select * from CustomerAccount" Modified: trunk/build/kit-embedded/examples/portfolio/run.sh =================================================================== --- trunk/build/kit-embedded/examples/portfolio/run.sh 2009-03-23 15:53:50 UTC (rev 619) +++ trunk/build/kit-embedded/examples/portfolio/run.sh 2009-03-23 19:06:58 UTC (rev 620) @@ -4,6 +4,6 @@ CLIENT_PATH=java/*:PortfolioModel/ #Second one for the JARs in Teiid embedded -TEIID_PATH=../../teiid-6.0.0-SNAPSHOT-client.jar:../../lib/*:../../extensions/* +TEIID_PATH=../../teiid-6.0.0-client.jar:../../deploy:../../lib/*:../../extensions/* java -cp ${CLIENT_PATH}:${TEIID_PATH} JDBCClient "select * from CustomerAccount"

15 years, 10 months

1
0
0 / 0

teiid SVN: r619 - in trunk/test-integration: src/test/java/com/metamatrix and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2009-03-23 11:53:50 -0400 (Mon, 23 Mar 2009) New Revision: 619 Removed: trunk/test-integration/src/test/java/com/metamatrix/data/ trunk/test-integration/teiid/ Log: removing empty directories

15 years, 10 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

teiid-commits March 2009