June 2009 - teiid-commits - Jboss List Archives

teiid SVN: r1035 - in branches/6.1.x: adminshell and 39 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2009-06-10 12:59:11 -0400 (Wed, 10 Jun 2009) New Revision: 1035 Modified: branches/6.1.x/adminshell/pom.xml branches/6.1.x/build/pom.xml branches/6.1.x/cache-jbosscache/pom.xml branches/6.1.x/client-jdbc/pom.xml branches/6.1.x/client/pom.xml branches/6.1.x/common-core/pom.xml branches/6.1.x/common-internal/pom.xml branches/6.1.x/connector-api/pom.xml branches/6.1.x/connector-metadata/pom.xml branches/6.1.x/connector-sdk/pom.xml branches/6.1.x/connectors/connector-jdbc/pom.xml branches/6.1.x/connectors/connector-ldap/pom.xml branches/6.1.x/connectors/connector-loopback/pom.xml branches/6.1.x/connectors/connector-salesforce/pom.xml branches/6.1.x/connectors/connector-text/pom.xml branches/6.1.x/connectors/connector-xml-common/pom.xml branches/6.1.x/connectors/connector-xml/pom.xml branches/6.1.x/connectors/pom.xml branches/6.1.x/connectors/salesforce-api/pom.xml branches/6.1.x/connectors/sandbox/connector-exec/pom.xml branches/6.1.x/connectors/sandbox/connector-object/pom.xml branches/6.1.x/connectors/sandbox/connector-oracle-spatial/pom.xml branches/6.1.x/connectors/sandbox/connector-yahoo/pom.xml branches/6.1.x/connectors/sandbox/pom.xml branches/6.1.x/console/pom.xml branches/6.1.x/documentation/admin-guide/pom.xml branches/6.1.x/documentation/connector-developer-guide/pom.xml branches/6.1.x/documentation/pom.xml branches/6.1.x/documentation/quick-start-example/pom.xml branches/6.1.x/documentation/reference/pom.xml branches/6.1.x/documentation/server-extensions-guide/pom.xml branches/6.1.x/embedded/pom.xml branches/6.1.x/engine/pom.xml branches/6.1.x/hibernate-dialect/pom.xml branches/6.1.x/metadata/pom.xml branches/6.1.x/pom.xml branches/6.1.x/server-installer/pom.xml branches/6.1.x/server/pom.xml branches/6.1.x/soap/pom.xml branches/6.1.x/test-integration/pom.xml branches/6.1.x/txn-jbossts/pom.xml Log: [maven-release-plugin] prepare release teiid-6.1.0 Modified: branches/6.1.x/adminshell/pom.xml =================================================================== --- branches/6.1.x/adminshell/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/adminshell/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-adminshell</artifactId> Modified: branches/6.1.x/build/pom.xml =================================================================== --- branches/6.1.x/build/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/build/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,9 +1,8 @@ -<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"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>build</artifactId> Modified: branches/6.1.x/cache-jbosscache/pom.xml =================================================================== --- branches/6.1.x/cache-jbosscache/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/cache-jbosscache/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,10 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<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"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-cache-jbosscache</artifactId> Modified: branches/6.1.x/client/pom.xml =================================================================== --- branches/6.1.x/client/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/client/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,11 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-client</artifactId> Modified: branches/6.1.x/client-jdbc/pom.xml =================================================================== --- branches/6.1.x/client-jdbc/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/client-jdbc/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,12 +1,9 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-client-jdbc</artifactId> Modified: branches/6.1.x/common-core/pom.xml =================================================================== --- branches/6.1.x/common-core/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/common-core/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,10 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<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"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-common-core</artifactId> Modified: branches/6.1.x/common-internal/pom.xml =================================================================== --- branches/6.1.x/common-internal/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/common-internal/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,11 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-common-internal</artifactId> Modified: branches/6.1.x/connector-api/pom.xml =================================================================== --- branches/6.1.x/connector-api/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/connector-api/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,11 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-connector-api</artifactId> Modified: branches/6.1.x/connector-metadata/pom.xml =================================================================== --- branches/6.1.x/connector-metadata/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/connector-metadata/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,10 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<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"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: branches/6.1.x/connector-sdk/pom.xml =================================================================== --- branches/6.1.x/connector-sdk/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/connector-sdk/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,10 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<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"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-connector-sdk</artifactId> @@ -22,8 +21,7 @@ <tstamp> <format property="TSTAMP" pattern="yyyy-MM-dd'T'HH:mm:ss.SSS" /> </tstamp> - <replace dir="${project.build.outputDirectory}" token="@build-date@" - value="${TSTAMP}"> + <replace dir="${project.build.outputDirectory}" token="@build-date@" value="${TSTAMP}"> <include name="**/*.cdk" /> </replace> </tasks> Modified: branches/6.1.x/connectors/connector-jdbc/pom.xml =================================================================== --- branches/6.1.x/connectors/connector-jdbc/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/connectors/connector-jdbc/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,11 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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"> +<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>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-jdbc</artifactId> Modified: branches/6.1.x/connectors/connector-ldap/pom.xml =================================================================== --- branches/6.1.x/connectors/connector-ldap/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/connectors/connector-ldap/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ldap</artifactId> Modified: branches/6.1.x/connectors/connector-loopback/pom.xml =================================================================== --- branches/6.1.x/connectors/connector-loopback/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/connectors/connector-loopback/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,11 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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"> +<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>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-loopback</artifactId> Modified: branches/6.1.x/connectors/connector-salesforce/pom.xml =================================================================== --- branches/6.1.x/connectors/connector-salesforce/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/connectors/connector-salesforce/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,11 +1,8 @@ -<?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"> +<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>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-salesforce</artifactId> Modified: branches/6.1.x/connectors/connector-text/pom.xml =================================================================== --- branches/6.1.x/connectors/connector-text/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/connectors/connector-text/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,9 +1,8 @@ -<?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"> +<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>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-text</artifactId> Modified: branches/6.1.x/connectors/connector-xml/pom.xml =================================================================== --- branches/6.1.x/connectors/connector-xml/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/connectors/connector-xml/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,11 +1,8 @@ -<?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"> +<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>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-xml</artifactId> Modified: branches/6.1.x/connectors/connector-xml-common/pom.xml =================================================================== --- branches/6.1.x/connectors/connector-xml-common/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/connectors/connector-xml-common/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,11 +1,8 @@ -<?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"> +<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>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-xml-common</artifactId> Modified: branches/6.1.x/connectors/pom.xml =================================================================== --- branches/6.1.x/connectors/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/connectors/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,10 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<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"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: branches/6.1.x/connectors/salesforce-api/pom.xml =================================================================== --- branches/6.1.x/connectors/salesforce-api/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/connectors/salesforce-api/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>salesforce-api</artifactId> Modified: branches/6.1.x/connectors/sandbox/connector-exec/pom.xml =================================================================== --- branches/6.1.x/connectors/sandbox/connector-exec/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/connectors/sandbox/connector-exec/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,9 +1,8 @@ -<?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"> +<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>sandbox</artifactId> <groupId>org.jboss.teiid.connectors</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-exec</artifactId> Modified: branches/6.1.x/connectors/sandbox/connector-object/pom.xml =================================================================== --- branches/6.1.x/connectors/sandbox/connector-object/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/connectors/sandbox/connector-object/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,10 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<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"> +<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>sandbox</artifactId> <groupId>org.jboss.teiid.connectors</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-object</artifactId> Modified: branches/6.1.x/connectors/sandbox/connector-oracle-spatial/pom.xml =================================================================== --- branches/6.1.x/connectors/sandbox/connector-oracle-spatial/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/connectors/sandbox/connector-oracle-spatial/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,9 +1,8 @@ -<?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"> +<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>sandbox</artifactId> <groupId>org.jboss.teiid.connectors</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-oracle-spatial</artifactId> Modified: branches/6.1.x/connectors/sandbox/connector-yahoo/pom.xml =================================================================== --- branches/6.1.x/connectors/sandbox/connector-yahoo/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/connectors/sandbox/connector-yahoo/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,9 +1,8 @@ -<?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"> +<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>sandbox</artifactId> <groupId>org.jboss.teiid.connectors</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-yahoo</artifactId> Modified: branches/6.1.x/connectors/sandbox/pom.xml =================================================================== --- branches/6.1.x/connectors/sandbox/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/connectors/sandbox/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,9 +1,8 @@ -<?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"> +<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>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid.connectors</groupId> Modified: branches/6.1.x/console/pom.xml =================================================================== --- branches/6.1.x/console/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/console/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,10 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<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"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-console</artifactId> Modified: branches/6.1.x/documentation/admin-guide/pom.xml =================================================================== --- branches/6.1.x/documentation/admin-guide/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/documentation/admin-guide/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,9 +1,8 @@ -<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/xsd/maven-4.0.0.xsd"> +<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/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.jboss.teiid.documentation</groupId> <artifactId>documentation</artifactId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>admin-guide</artifactId> Modified: branches/6.1.x/documentation/connector-developer-guide/pom.xml =================================================================== --- branches/6.1.x/documentation/connector-developer-guide/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/documentation/connector-developer-guide/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,9 +1,8 @@ -<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/xsd/maven-4.0.0.xsd"> +<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/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.jboss.teiid.documentation</groupId> <artifactId>documentation</artifactId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-developer-guide</artifactId> Modified: branches/6.1.x/documentation/pom.xml =================================================================== --- branches/6.1.x/documentation/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/documentation/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,9 +1,8 @@ -<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"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid.documentation</groupId> Modified: branches/6.1.x/documentation/quick-start-example/pom.xml =================================================================== --- branches/6.1.x/documentation/quick-start-example/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/documentation/quick-start-example/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,9 +1,8 @@ -<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/xsd/maven-4.0.0.xsd"> +<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/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.jboss.teiid.documentation</groupId> <artifactId>documentation</artifactId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>quick-start-guide</artifactId> Modified: branches/6.1.x/documentation/reference/pom.xml =================================================================== --- branches/6.1.x/documentation/reference/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/documentation/reference/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,9 +1,8 @@ -<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/xsd/maven-4.0.0.xsd"> +<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/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.jboss.teiid.documentation</groupId> <artifactId>documentation</artifactId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>reference</artifactId> Modified: branches/6.1.x/documentation/server-extensions-guide/pom.xml =================================================================== --- branches/6.1.x/documentation/server-extensions-guide/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/documentation/server-extensions-guide/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,9 +1,8 @@ -<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/xsd/maven-4.0.0.xsd"> +<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/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.jboss.teiid.documentation</groupId> <artifactId>documentation</artifactId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>server-extensions-guide</artifactId> Modified: branches/6.1.x/embedded/pom.xml =================================================================== --- branches/6.1.x/embedded/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/embedded/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,9 +1,8 @@ -<?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"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: branches/6.1.x/engine/pom.xml =================================================================== --- branches/6.1.x/engine/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/engine/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-engine</artifactId> Modified: branches/6.1.x/hibernate-dialect/pom.xml =================================================================== --- branches/6.1.x/hibernate-dialect/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/hibernate-dialect/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,14 +1,13 @@ -<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"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-hibernate-dialect</artifactId> <name>Hibernate Dialect</name> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> <description>Teiid Hibernate Dialect</description> <dependencies> <dependency> Modified: branches/6.1.x/metadata/pom.xml =================================================================== --- branches/6.1.x/metadata/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/metadata/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-metadata</artifactId> Modified: branches/6.1.x/pom.xml =================================================================== --- branches/6.1.x/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,19 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<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"> +<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"> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> <artifactId>teiid</artifactId> <packaging>pom</packaging> <name>Teiid</name> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> <description>Federated SQL and XML query engine.</description> <properties> <ant.version>1.7.0</ant.version> <site.url>http://www.jboss.org/teiid</site.url> </properties> <scm> - <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/trunk</developerConnection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-6.1.0</developerConnection> </scm> <licenses> <license> Modified: branches/6.1.x/server/pom.xml =================================================================== --- branches/6.1.x/server/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/server/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,11 +1,8 @@ -<?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"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-server</artifactId> Modified: branches/6.1.x/server-installer/pom.xml =================================================================== --- branches/6.1.x/server-installer/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/server-installer/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: branches/6.1.x/soap/pom.xml =================================================================== --- branches/6.1.x/soap/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/soap/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-soap</artifactId> Modified: branches/6.1.x/test-integration/pom.xml =================================================================== --- branches/6.1.x/test-integration/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/test-integration/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -1,10 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<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"> +<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</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-test-integration</artifactId> Modified: branches/6.1.x/txn-jbossts/pom.xml =================================================================== --- branches/6.1.x/txn-jbossts/pom.xml 2009-06-10 15:08:51 UTC (rev 1034) +++ branches/6.1.x/txn-jbossts/pom.xml 2009-06-10 16:59:11 UTC (rev 1035) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-txn-jbossts</artifactId>

14 years, 11 months

1
0
0 / 0

teiid SVN: r1034 - branches/6.1.x/documentation/quick-start-example/src/main/docbook/en-US/content.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2009-06-10 11:08:51 -0400 (Wed, 10 Jun 2009) New Revision: 1034 Modified: branches/6.1.x/documentation/quick-start-example/src/main/docbook/en-US/content/download.xml branches/6.1.x/documentation/quick-start-example/src/main/docbook/en-US/content/preface.xml Log: TEIID-650 correcting basics link and adding a note about the java 6 requirement Modified: branches/6.1.x/documentation/quick-start-example/src/main/docbook/en-US/content/download.xml =================================================================== --- branches/6.1.x/documentation/quick-start-example/src/main/docbook/en-US/content/download.xml 2009-06-10 01:48:53 UTC (rev 1033) +++ branches/6.1.x/documentation/quick-start-example/src/main/docbook/en-US/content/download.xml 2009-06-10 15:08:51 UTC (rev 1034) @@ -28,7 +28,9 @@ file for Teiid Embedded, and the "lib" and "extension" directories containing binaries either directly or indirectly required to execute Teiid Embedded. Later sections describe installing these artifacts.</para> <note> - <para> + <para>Teiid Embedded requires <ulink url="http://java.sun.com/javase/downloads">Java 6</ulink> to run. + </para> + <para> Access to physical data sources such as Oracle, MS-SQL Server, DB2, and Sybase through Teiid relies upon the user supplying their own JDBC drivers in the deployment. Teiid Embedded has been tested extensively with Modified: branches/6.1.x/documentation/quick-start-example/src/main/docbook/en-US/content/preface.xml =================================================================== --- branches/6.1.x/documentation/quick-start-example/src/main/docbook/en-US/content/preface.xml 2009-06-10 01:48:53 UTC (rev 1033) +++ branches/6.1.x/documentation/quick-start-example/src/main/docbook/en-US/content/preface.xml 2009-06-10 15:08:51 UTC (rev 1034) @@ -29,7 +29,7 @@ <note> <para> Please read - <ulink url="http://teiid.org/Documentation.html">Federation Basics</ulink> + <ulink url="http://www.jboss.org/teiid/basics.html">Federation Basics</ulink> and understand different terminologies used, resources needed and artifacts that need to be generated before developing a successful application. This example takes advantage of only a minimal set of features from Teiid Embedded for the sake of simplicity and time.

14 years, 11 months

1
0
0 / 0

teiid SVN: r1033 - in branches/6.1.x/connectors/connector-xml/src: main/java/com/metamatrix/connector/xml/cache and 3 other directories.

by teiid-commits＠lists.jboss.org

Author: jdoyle Date: 2009-06-09 21:48:53 -0400 (Tue, 09 Jun 2009) New Revision: 1033 Added: branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/CachingOutputStream.java Modified: branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/ExecutionInfo.java branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/CachingInputStreamFilter.java branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPDocBuilder.java branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPExecutor.java branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/streaming/ElementProcessor.java branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/streaming/StreamingMultiPathFilter.java branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/streaming/StreamingResultsProducer.java branches/6.1.x/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/TestElementCollector.java Log: TEIID-647 SOAP Relational connector is not returning data from service. Modified: branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/ExecutionInfo.java =================================================================== --- branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/ExecutionInfo.java 2009-06-09 18:11:52 UTC (rev 1032) +++ branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/ExecutionInfo.java 2009-06-10 01:48:53 UTC (rev 1033) @@ -57,6 +57,8 @@ private Properties m_schemaProps; private String m_tablePath; private String m_location; + private Map<String, String> m_prefixToNamespace; + private Map<String, String> m_namespaceToPrefix; public ExecutionInfo() { m_columnCount = 0; @@ -159,42 +161,58 @@ return result; } - public Map<String, String> getNamespaces() throws ConnectorException { - Map<String, String> result = new HashMap<String, String>(); - String namespacePrefixes = getOtherProperties().getProperty( - Constants.NAMESPACE_PREFIX_PROPERTY_NAME); - if (namespacePrefixes == null || namespacePrefixes.trim().length() == 0) { - return null; - } - String prefix = null; - String uri = null; - try { - String xml = "<e " + namespacePrefixes + "/>"; //$NON-NLS-1$ //$NON-NLS-2$ - Reader reader = new StringReader(xml); - SAXBuilder builder = new SAXBuilder(); - Document domDoc = builder.build(reader); - Element elem = domDoc.getRootElement(); - List namespaces = elem.getAdditionalNamespaces(); - for (Iterator iter = namespaces.iterator(); iter.hasNext();) { - Object o = iter.next(); - Namespace namespace = (Namespace) o; - prefix = namespace.getPrefix(); - uri = namespace.getURI(); - result.put(prefix, uri); - } - } catch (JDOMException e) { - String rawMsg = Messages - .getString("Executor.jaxen.error.on.namespace.pairs"); //$NON-NLS-1$ - Object[] objs = new Object[2]; - objs[0] = prefix; - objs[1] = uri; - String msg = MessageFormat.format(rawMsg, objs); - throw new ConnectorException(e, msg); - } catch (IOException e) { - throw new ConnectorException(e, e.getMessage()); - } - return result; + public Map<String, String> getNamespaceToPrefixMap() throws ConnectorException { + if(null != m_namespaceToPrefix) { + return m_namespaceToPrefix; + } else { + getPrefixToNamespacesMap(); + return m_namespaceToPrefix; + } } + + public Map<String, String> getPrefixToNamespacesMap() throws ConnectorException { + if (null != m_prefixToNamespace) { + return m_prefixToNamespace; + } else { + m_prefixToNamespace = new HashMap<String, String>(); + m_namespaceToPrefix = new HashMap<String, String>(); + String namespacePrefixes = getOtherProperties().getProperty( + Constants.NAMESPACE_PREFIX_PROPERTY_NAME); + if (namespacePrefixes == null + || namespacePrefixes.trim().length() == 0) { + return null; + } + String prefix = null; + String uri = null; + try { + String xml = "<e " + namespacePrefixes + "/>"; //$NON-NLS-1$ //$NON-NLS-2$ + Reader reader = new StringReader(xml); + SAXBuilder builder = new SAXBuilder(); + Document domDoc = builder.build(reader); + Element elem = domDoc.getRootElement(); + List namespaces = elem.getAdditionalNamespaces(); + for (Iterator iter = namespaces.iterator(); iter.hasNext();) { + Object o = iter.next(); + Namespace namespace = (Namespace) o; + prefix = namespace.getPrefix(); + uri = namespace.getURI(); + m_prefixToNamespace.put(prefix, uri); + m_namespaceToPrefix.put(uri, prefix); + } + } catch (JDOMException e) { + String rawMsg = Messages + .getString("Executor.jaxen.error.on.namespace.pairs"); //$NON-NLS-1$ + Object[] objs = new Object[2]; + objs[0] = prefix; + objs[1] = uri; + String msg = MessageFormat.format(rawMsg, objs); + throw new ConnectorException(e, msg); + } catch (IOException e) { + throw new ConnectorException(e, e.getMessage()); + } + return m_prefixToNamespace; + } + } public void setSchemaProperties(Properties schemaProperties) { m_schemaProps = schemaProperties; Modified: branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/CachingInputStreamFilter.java =================================================================== --- branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/CachingInputStreamFilter.java 2009-06-09 18:11:52 UTC (rev 1032) +++ branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/CachingInputStreamFilter.java 2009-06-10 01:48:53 UTC (rev 1033) @@ -65,6 +65,7 @@ private void chunk() { if(!idCached) { context.put(requestId, Boolean.TRUE); + idCached = true; } if(buff.length() >= 2560) { Added: branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/CachingOutputStream.java =================================================================== --- branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/CachingOutputStream.java (rev 0) +++ branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/CachingOutputStream.java 2009-06-10 01:48:53 UTC (rev 1033) @@ -0,0 +1,67 @@ +package com.metamatrix.connector.xml.cache; + +import java.io.IOException; +import java.io.OutputStream; + +import org.teiid.connector.api.ExecutionContext; + +public class CachingOutputStream extends OutputStream { + + private ExecutionContext context; + private String requestId; + private Integer chunkIndex; + private boolean idCached = false; + private StringBuffer buff; + + public CachingOutputStream(ExecutionContext context, String requestId) { + super(); + this.context = context; + this.requestId = requestId; + chunkIndex = Integer.valueOf(0); + buff = new StringBuffer(); + } + + @Override + public void write(int b) throws IOException { + buff.append((char)b); + chunk(); + } + + + @Override + public void flush() throws IOException { + super.flush(); + if(buff.length()!= 0) { + context.put(requestId + chunkIndex.toString(), buff.toString()); + chunkIndex++; + buff = new StringBuffer(); + } + } + + @Override + public void close() throws IOException { + flush(); + super.close(); + } + + /** + * 8192 * 5 / 16 + * 1kb * 5 / 16 bit chars = 2560 chars + */ + private void chunk() { + if(!idCached) { + context.put(requestId, Boolean.TRUE); + idCached = true; + } + + if(buff.length() >= 2560) { + context.put(requestId + chunkIndex.toString(), buff.toString()); + chunkIndex++; + buff = new StringBuffer(); + } + } + + public CachedXMLStream getCachedXMLStream() { + return new CachedXMLStream(context, requestId); + } +} Modified: branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPDocBuilder.java =================================================================== --- branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPDocBuilder.java 2009-06-09 18:11:52 UTC (rev 1032) +++ branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPDocBuilder.java 2009-06-10 01:48:53 UTC (rev 1033) @@ -258,18 +258,32 @@ return builder.buildDocument(params, "SOAP-ENV:Header", namespacePrefixes); } - public Document createXMLRequestDoc(List params, SOAPConnectorState state, String namespacePrefixes, String inputParmsXPath) throws ConnectorException { - DocumentBuilder builder = new DocumentBuilder(); - builder.setUseTypeAttributes(state.isEncoded()); - //use dummy root if there is none - final String slash = "/"; - final String dotSlash = "./"; - if(inputParmsXPath.equals(dotSlash) || inputParmsXPath.equals(slash) || inputParmsXPath.equals("")) { - inputParmsXPath = SOAPDocBuilder.DUMMY_NS_PREFIX + ":dummy"; - namespacePrefixes = namespacePrefixes + " xmlns:" + SOAPDocBuilder.DUMMY_NS_PREFIX + "=\"" + SOAPDocBuilder.DUMMY_NS_NAME + "\""; - } - return builder.buildDocument(params, inputParmsXPath, namespacePrefixes); - } + public Document createXMLRequestDoc(List params, SOAPConnectorState state, + String namespacePrefixes, String inputParmsXPath) + throws ConnectorException { + Document doc; + DocumentBuilder builder = new DocumentBuilder(); + builder.setUseTypeAttributes(state.isEncoded()); + final String slash = "/"; + final String dotSlash = "./"; + boolean hasDummy = false; + if (inputParmsXPath.equals(dotSlash) || inputParmsXPath.equals(slash) + || inputParmsXPath.equals("")) { + inputParmsXPath = SOAPDocBuilder.DUMMY_NS_PREFIX + ":dummy"; + namespacePrefixes = namespacePrefixes + " xmlns:" + + SOAPDocBuilder.DUMMY_NS_PREFIX + "=\"" + + SOAPDocBuilder.DUMMY_NS_NAME + "\""; + hasDummy = true; + } + doc = builder.buildDocument(params, inputParmsXPath, namespacePrefixes); + if (hasDummy) { + // Since there is no real root - these should all be elements + Element element = (Element) doc.getRootElement().getChildren().get(0); + element.detach(); + doc = new Document(element); + } + return doc; + } private static void handleSoapFault(Element soapFault, SOAPConnectorState state) throws ConnectorException { String strMessage = soapFault.getChildTextTrim("faultstring"); //$NON-NLS-1$ Modified: branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPExecutor.java =================================================================== --- branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPExecutor.java 2009-06-09 18:11:52 UTC (rev 1032) +++ branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPExecutor.java 2009-06-10 01:48:53 UTC (rev 1033) @@ -24,13 +24,11 @@ package com.metamatrix.connector.xml.soap; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.InputStream; +import java.io.StringReader; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.Properties; import javax.xml.namespace.QName; import javax.xml.transform.Source; @@ -43,11 +41,9 @@ import javax.xml.ws.soap.SOAPBinding; import org.jdom.Document; -import org.jdom.Element; -import org.jdom.output.DOMOutputter; +import org.jdom.output.XMLOutputter; import org.teiid.connector.api.ConnectorEnvironment; import org.teiid.connector.api.ConnectorException; -import org.w3c.dom.NodeList; import com.metamatrix.connector.xml.Constants; import com.metamatrix.connector.xml.SOAPConnectorState; @@ -58,13 +54,15 @@ import com.metamatrix.connector.xml.base.DocumentBuilder; import com.metamatrix.connector.xml.base.ExecutionInfo; import com.metamatrix.connector.xml.base.RequestGenerator; +import com.metamatrix.connector.xml.cache.CachingOutputStream; import com.metamatrix.connector.xml.http.HTTPExecutor; import com.metamatrix.connector.xmlsource.soap.SecurityToken; public class SOAPExecutor extends HTTPExecutor { SecurityToken secToken; - NodeList requestNodes; + XMLOutputter xmlOutputter = new XMLOutputter(); + Document doc; public SOAPExecutor(SOAPConnectorState state, XMLExecution execution, ExecutionInfo exeInfo) throws ConnectorException { super((XMLConnectorState)state, execution, exeInfo); @@ -74,16 +72,10 @@ try { TrustedPayloadHandler handler = execution.getConnection().getTrustedPayloadHandler(); ConnectorEnvironment env = execution.getConnection().getConnectorEnv(); - Properties schemaProperties = getExeInfo().getSchemaProperties(); secToken = SecurityToken.getSecurityToken(env, handler); - - QName svcQname = new QName( - schemaProperties.getProperty(Constants.SERVICE_NAMESPACE), - schemaProperties.getProperty(Constants.SERVICE_NAME)); - QName portQName = new QName( - schemaProperties.getProperty(Constants.PORT_NAMESPACE), - schemaProperties.getProperty(Constants.PORT_NAME)); + QName svcQname = new QName("http://org.apache.cxf", "foo"); + QName portQName = new QName("http://org.apache.cxf", "bar"); Service svc = Service.create(svcQname); svc.addPort( portQName, @@ -94,35 +86,24 @@ portQName, Source.class, Service.Mode.PAYLOAD); - - StringBuffer buffer = new StringBuffer(); - for (int j = 0; j < requestNodes.getLength(); j++) { - org.w3c.dom.Element child = (org.w3c.dom.Element) requestNodes.item(j); - buffer.append(child.getNodeValue()); - } - ByteArrayInputStream bais = new ByteArrayInputStream(buffer.toString().getBytes()); - Source input = new StreamSource(bais); + StringReader reader = new StringReader(xmlOutputter.outputString(doc)); + Source input = new StreamSource(reader); // Invoke the operation. Source output = dispatch.invoke(input); - + // Process the response. - StreamResult result = new StreamResult(new ByteArrayOutputStream()); + CachingOutputStream out = new CachingOutputStream(execution.getExeContext(), getCacheKey()); + StreamResult result = new StreamResult(out); Transformer trans = TransformerFactory.newInstance().newTransformer(); trans.transform(output, result); - ByteArrayOutputStream baos = (ByteArrayOutputStream) result.getOutputStream(); - - // Write out the response content. - String responseContent = new String(baos.toByteArray()); - System.out.println(responseContent); - - return null; + return out.getCachedXMLStream(); } catch (Exception e) { throw new ConnectorException(e); } } - protected void createRequest(List params) + protected void setRequests(List params, String uriString) throws ConnectorException { SOAPConnectorState state = (SOAPConnectorState) getState(); @@ -139,24 +120,10 @@ String namespacePrefixes = getExeInfo().getOtherProperties().getProperty(Constants.NAMESPACE_PREFIX_PROPERTY_NAME); String inputParmsXPath = getExeInfo().getOtherProperties().getProperty(DocumentBuilder.PARM_INPUT_XPATH_TABLE_PROPERTY_NAME); SOAPDocBuilder builder = new SOAPDocBuilder(); - Document doc = builder.createXMLRequestDoc(bodyParams, (SOAPConnectorState)getState(), namespacePrefixes, inputParmsXPath); - Element docRoot = doc.getRootElement(); - DOMOutputter domOutputter = new DOMOutputter(); - try { - if (docRoot.getNamespaceURI().equals(SOAPDocBuilder.DUMMY_NS_NAME)) { - // Since there is no real root - these should all be elements - org.w3c.dom.Document dummyNode = domOutputter.output(doc); - requestNodes = dummyNode.getChildNodes().item(0).getChildNodes(); - } else { - org.w3c.dom.Document document = domOutputter.output(doc); - requestNodes = document.getChildNodes(); - } - } catch (Exception e) { - throw new ConnectorException(e); - } + doc = builder.createXMLRequestDoc(bodyParams, (SOAPConnectorState)getState(), namespacePrefixes, inputParmsXPath); } - protected String getCacheKey(int i) throws ConnectorException { + protected String getCacheKey() throws ConnectorException { StringBuffer cacheKey = new StringBuffer(); cacheKey.append("|"); //$NON-NLS-1$ cacheKey.append(execution.getConnection().getUser()); @@ -164,11 +131,8 @@ cacheKey.append(execution.getConnection().getQueryId()); cacheKey.append("|"); cacheKey.append(buildUriString()); - cacheKey.append("|"); //$NON-NLS-1$ - for (int j = 0; j < requestNodes.getLength(); j++) { - org.w3c.dom.Element child = (org.w3c.dom.Element) requestNodes.item(j); - cacheKey.append(child.toString()); - } + //cacheKey.append("|"); //$NON-NLS-1$ + //cacheKey.append(xmlOutputter.outputString(doc)); return cacheKey.toString(); } Modified: branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/streaming/ElementProcessor.java =================================================================== --- branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/streaming/ElementProcessor.java 2009-06-09 18:11:52 UTC (rev 1032) +++ branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/streaming/ElementProcessor.java 2009-06-10 01:48:53 UTC (rev 1033) @@ -31,10 +31,12 @@ private Object[] row; private Map<String, OutputXPathDesc> resultPaths; private OutputXPathDesc cacheKeyColumn; + private Map<String, String> namespacesToPrefixMap; public ElementProcessor(ExecutionInfo info) throws ConnectorException { this.info = info; resultPaths = generateXPaths(); + namespacesToPrefixMap = info.getNamespaceToPrefixMap(); } /** @@ -76,12 +78,16 @@ * @param path */ private void listChildren(Node current, String path) { - + + if(current.getDocument().equals(current.getParent())) { + path = getLocalQName(current); + } + if (current instanceof Element) { Element temp = (Element) current; for (int i = 0; i < temp.getAttributeCount(); i++) { Attribute attribute = temp.getAttribute(i); - String attrPath = path + '@' + attribute.getQualifiedName(); + String attrPath = path + "/@" + getLocalQName(attribute); if(resultPaths.containsKey(attrPath)) { getColumn(attribute, attrPath); } @@ -108,15 +114,45 @@ if (next instanceof Element) { Element temp = (Element) next; if(path.isEmpty()) { - childPath = temp.getQualifiedName(); + childPath = getLocalQName(temp); } else { - childPath= path + '/' + temp.getQualifiedName(); + childPath= path + '/' + getLocalQName(temp); } } listChildren(next, childPath); } } + /** + * Get the qualified name for the Element, but replace the prefixes + * from the actual doc with the matching prefix from the model. Without + * this prefix we can't do a proper path comparison. + * @throws ConnectorException + */ + private String getLocalQName(Node node) { + String namespaceURI = null; + String localName = null; + if(node instanceof Element) { + Element element = (Element)node; + namespaceURI = element.getNamespaceURI(); + localName = element.getLocalName(); + } else if (node instanceof Attribute) { + Attribute attribute = (Attribute)node; + namespaceURI = attribute.getNamespaceURI(); + localName = attribute.getLocalName(); + } + if(null == namespaceURI) { + throw new Error("namespce URI not found in model namespaces"); + } + String prefix = namespacesToPrefixMap.get(namespaceURI); + String result; + if(null == prefix) { + result = localName; + } else { + result = prefix + ':' + localName; + } + return result; + } private void getColumn(Node node, String path) { OutputXPathDesc columnMetadata = resultPaths.get(path); Modified: branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/streaming/StreamingMultiPathFilter.java =================================================================== --- branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/streaming/StreamingMultiPathFilter.java 2009-06-09 18:11:52 UTC (rev 1032) +++ branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/streaming/StreamingMultiPathFilter.java 2009-06-10 01:48:53 UTC (rev 1033) @@ -29,7 +29,6 @@ } private PathPackage getPathPackage(String locationPath, Map<String, String> prefixes) throws InvalidPathException { - // copied from nux.xom.xquery.StreamingPathFilter if (locationPath == null) throw new InvalidPathException("locationPath must not be null"); if (locationPath.indexOf("//") >= 0) @@ -76,10 +75,10 @@ } // end if localNames[i] = localNames[i].substring(k + 1).trim(); - if (localNames[i].equals("*")) { + //if (localNames[i].equals("*")) { // localName is irrelevant (does not matter) - localNames[i] = null; - } + // localNames[i] = null; + //} } return new PathPackage(localNames, namespaceURIs); } @@ -141,6 +140,10 @@ @Override public Nodes finishMakingElement(Element elem) { if (level == 0) { + // check for / match + if (pathPackages.isMatch(level,elem.getQualifiedName(), elem.getNamespaceURI())) { + return transformMatch(elem); + } //causes nu.xom.WellformednessException: Factory attempted to remove the root element on the request mismatch = null; level--; return super.finishMakingElement(elem); @@ -165,10 +168,14 @@ level--; if (transform == null) return super.finishMakingElement(elem); Nodes results = transform.transform(elem); - - for (int i = results.size(); --i >= 0; ) { - Node node = results.get(i); - if (node != elem) node.detach(); + + if(results.size() == 0) { + results = new Nodes(elem); + } else { + for (int i = results.size(); --i >= 0; ) { + Node node = results.get(i); + if (node != elem) node.detach(); + } } return results; } @@ -269,9 +276,13 @@ public boolean isRequired(int level, String localName, String namespaceURI) { String name = localNames[level]; String uri = namespaceURIs[level]; + if(level == 0 && name.equals("*")) { + return true; + } else { return (name == null || name.equals(localName)) && (uri == null || uri.equals(namespaceURI)); + } } public boolean hasLevelMatch(int level) { @@ -279,8 +290,10 @@ } public boolean isMatch(int level, String localName, String namespaceURI) { - if(level == localNames.length -1) { - return isRequired(level, localName, namespaceURI); + if(level < getPathLength()) { + if(level == localNames.length -1) { + return isRequired(level, localName, namespaceURI); + } } return false; } @@ -303,7 +316,7 @@ Iterator<PathPackage> iter = packages.iterator(); while (iter.hasNext()) { PathPackage pack = iter.next(); - if(level < pack.getPathLength() && pack.isMatch(level, localName, namespaceURI)) { + if(pack.isMatch(level, localName, namespaceURI)) { return true; } } Modified: branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/streaming/StreamingResultsProducer.java =================================================================== --- branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/streaming/StreamingResultsProducer.java 2009-06-09 18:11:52 UTC (rev 1032) +++ branches/6.1.x/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/streaming/StreamingResultsProducer.java 2009-06-10 01:48:53 UTC (rev 1033) @@ -48,7 +48,7 @@ public StreamingResultsProducer(ExecutionInfo info, XMLConnectorState state) throws ConnectorException { this.info = info; - Map<String, String> namespace = info.getNamespaces(); + Map<String, String> namespace = info.getPrefixToNamespacesMap(); XMLReader reader; try { reader = ReaderFactory.getXMLReader(state); Modified: branches/6.1.x/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/TestElementCollector.java =================================================================== --- branches/6.1.x/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/TestElementCollector.java 2009-06-09 18:11:52 UTC (rev 1032) +++ branches/6.1.x/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/TestElementCollector.java 2009-06-10 01:48:53 UTC (rev 1033) @@ -70,4 +70,16 @@ fail(e.getMessage()); } } + + public void testGetRoot() { + String path = "/"; + int itemCount = 1; + try { + Document doc = new DocumentImpl(new FileInputStream(filename), "foo"); + List result = builder.getElements(doc, Arrays.asList(path)); + assertEquals(itemCount, result.size()); + } catch (Exception e) { + fail(e.getMessage()); + } + } }

14 years, 11 months

1
0
0 / 0

teiid SVN: r1032 - in trunk: client-jdbc/src/test/java/com/metamatrix/jdbc and 6 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2009-06-09 14:11:52 -0400 (Tue, 09 Jun 2009) New Revision: 1032 Removed: trunk/common-core/src/main/java/com/metamatrix/common/types/BlobImpl.java trunk/common-core/src/main/java/com/metamatrix/common/types/ClobImpl.java trunk/common-core/src/test/java/com/metamatrix/common/types/TestBlobImpl.java trunk/common-core/src/test/java/com/metamatrix/common/types/TestClobImpl.java Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMBlob.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMClob.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMPreparedStatement.java trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestDataTypeTransformer.java trunk/common-core/src/main/java/com/metamatrix/common/types/BlobType.java trunk/common-core/src/main/java/com/metamatrix/common/types/ClobType.java trunk/common-core/src/main/java/com/metamatrix/common/types/DataTypeManager.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/StringToClobTransform.java trunk/common-core/src/main/java/com/metamatrix/core/util/FileUtil.java trunk/common-core/src/main/java/com/metamatrix/core/util/ObjectConverterUtil.java trunk/common-core/src/test/java/com/metamatrix/common/types/TestBlobValue.java trunk/common-core/src/test/java/com/metamatrix/common/types/TestClobValue.java trunk/common-core/src/test/java/com/metamatrix/common/types/TestDataTypeManager.java trunk/common-core/src/test/java/com/metamatrix/common/types/TestSQLXMLImpl.java trunk/common-core/src/test/java/com/metamatrix/common/types/TestXMLStreamSourceTranslator.java trunk/common-core/src/test/java/com/metamatrix/common/types/basic/TestTransforms.java trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/internal/ObjectProcedureProcessor.java Log: TEIID-649 refactoring to use jsr 114 blob and clob impls Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMBlob.java =================================================================== --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMBlob.java 2009-06-09 18:00:27 UTC (rev 1031) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMBlob.java 2009-06-09 18:11:52 UTC (rev 1032) @@ -28,8 +28,9 @@ import java.sql.Blob; import java.sql.SQLException; +import javax.sql.rowset.serial.SerialBlob; + import com.metamatrix.common.lob.LobChunkInputStream; -import com.metamatrix.common.types.BlobImpl; import com.metamatrix.common.types.BlobType; import com.metamatrix.common.types.Streamable; import com.metamatrix.common.util.SqlUtil; @@ -181,7 +182,7 @@ if (pattern == null) { return -1; } - return position(new BlobImpl(pattern), start); + return position(new SerialBlob(pattern), start); } public void free() throws SQLException { Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMClob.java =================================================================== --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMClob.java 2009-06-09 18:00:27 UTC (rev 1031) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMClob.java 2009-06-09 18:11:52 UTC (rev 1032) @@ -31,9 +31,10 @@ import java.sql.Clob; import java.sql.SQLException; +import javax.sql.rowset.serial.SerialClob; + import com.metamatrix.common.lob.LobChunkInputStream; import com.metamatrix.common.lob.ReaderInputStream; -import com.metamatrix.common.types.ClobImpl; import com.metamatrix.common.types.ClobType; import com.metamatrix.common.types.Streamable; import com.metamatrix.common.util.SqlUtil; @@ -194,7 +195,7 @@ if (searchstr == null) { return -1; } - return position(new ClobImpl(searchstr.toCharArray()), start); + return position(new SerialClob(searchstr.toCharArray()), start); } public void free() throws SQLException { Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMPreparedStatement.java =================================================================== --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMPreparedStatement.java 2009-06-09 18:00:27 UTC (rev 1031) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMPreparedStatement.java 2009-06-09 18:11:52 UTC (rev 1032) @@ -22,31 +22,23 @@ package com.metamatrix.jdbc; +import java.io.IOException; import java.io.InputStream; import java.io.Reader; import java.math.BigDecimal; import java.net.URL; -import java.nio.charset.Charset; import java.sql.Array; import java.sql.Blob; import java.sql.Clob; +import java.sql.NClob; import java.sql.ParameterMetaData; import java.sql.PreparedStatement; import java.sql.Ref; import java.sql.ResultSet; import java.sql.ResultSetMetaData; +import java.sql.RowId; import java.sql.SQLException; - -//## JDBC4.0-begin ## import java.sql.SQLXML; -import java.sql.NClob; -import java.sql.RowId; -//## JDBC4.0-end ## - -/*## JDBC3.0-JDK1.5-begin ## -import com.metamatrix.core.jdbc.SQLXML; -## JDBC3.0-JDK1.5-end ##*/ - import java.sql.Types; import java.util.ArrayList; import java.util.Calendar; @@ -56,14 +48,16 @@ import java.util.TimeZone; import java.util.TreeMap; +import javax.sql.rowset.serial.SerialBlob; +import javax.sql.rowset.serial.SerialClob; + import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.MetaMatrixProcessingException; -import com.metamatrix.common.types.BlobImpl; -import com.metamatrix.common.types.ClobImpl; import com.metamatrix.common.types.MMJDBCSQLTypeInfo; import com.metamatrix.common.util.SqlUtil; import com.metamatrix.common.util.TimestampWithTimezone; import com.metamatrix.core.util.ArgCheck; +import com.metamatrix.core.util.ObjectConverterUtil; import com.metamatrix.dqp.client.MetadataResult; import com.metamatrix.dqp.message.RequestMessage; import com.metamatrix.jdbc.api.ExecutionProperties; @@ -282,7 +276,11 @@ */ public void setAsciiStream (int parameterIndex, java.io.InputStream in, int length) throws SQLException { //create a clob from the ascii stream - setObject(parameterIndex, new ClobImpl(in, Charset.forName("ASCII"), length)); //$NON-NLS-1$ + try { + setObject(parameterIndex, new SerialClob(ObjectConverterUtil.convertToCharArray(in, length, "ASCII"))); //$NON-NLS-1$ + } catch (IOException e) { + throw MMSQLException.create(e); + } } /** @@ -305,7 +303,11 @@ */ public void setBinaryStream(int parameterIndex, java.io.InputStream in, int length) throws SQLException { //create a blob from the ascii stream - setObject(parameterIndex, new BlobImpl(in, length)); + try { + setObject(parameterIndex, new SerialBlob(ObjectConverterUtil.convertToByteArray(in, length))); + } catch (IOException e) { + throw MMSQLException.create(e); + } } /** @@ -347,18 +349,16 @@ */ public void setBytes(int parameterIndex, byte bytes[]) throws SQLException { //create a blob from the ascii stream - setObject(parameterIndex, new BlobImpl(bytes)); + setObject(parameterIndex, new SerialBlob(bytes)); } - /** - * <p>Sets the parameter in position parameterIndex to a Reader stream object. - * @param parameterIndex of the parameter whose value is to be set - * @param Reader object to which the parameter value is to be set. - * @param length indicating number of charachters to be read from the stream - */ public void setCharacterStream (int parameterIndex, java.io.Reader reader, int length) throws SQLException { //create a clob from the ascii stream - setObject(parameterIndex, new ClobImpl(reader, length)); + try { + setObject(parameterIndex, new SerialClob(ObjectConverterUtil.convertToCharArray(reader, length))); + } catch (IOException e) { + throw MMSQLException.create(e); + } } /** Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestDataTypeTransformer.java =================================================================== --- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestDataTypeTransformer.java 2009-06-09 18:00:27 UTC (rev 1031) +++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestDataTypeTransformer.java 2009-06-09 18:11:52 UTC (rev 1032) @@ -25,15 +25,15 @@ import java.sql.Clob; import java.sql.SQLException; +import javax.sql.rowset.serial.SerialClob; + import junit.framework.TestCase; -import com.metamatrix.common.types.ClobImpl; - public class TestDataTypeTransformer extends TestCase { public void testClobToStringConversion() throws Exception { - Clob clob = new ClobImpl("foo".toCharArray()); //$NON-NLS-1$ - String value = DataTypeTransformer.getString(clob); //$NON-NLS-1$ + Clob clob = new SerialClob("foo".toCharArray()); //$NON-NLS-1$ + String value = DataTypeTransformer.getString(clob); assertEquals("foo", value); //$NON-NLS-1$ } Deleted: trunk/common-core/src/main/java/com/metamatrix/common/types/BlobImpl.java =================================================================== --- trunk/common-core/src/main/java/com/metamatrix/common/types/BlobImpl.java 2009-06-09 18:00:27 UTC (rev 1031) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/BlobImpl.java 2009-06-09 18:11:52 UTC (rev 1032) @@ -1,299 +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 com.metamatrix.common.types; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.Serializable; -import java.sql.Blob; -import java.sql.SQLException; - -import com.metamatrix.common.util.SqlUtil; -import com.metamatrix.core.CorePlugin; - -/** - * This object holds a chunk of binary data and implements the JDBC Blob interface. - * This object presents a streaming interface but actually encapsulates the entire - * blob object. Connectors can construct this object when dealing with large - * objects. - */ -public class BlobImpl implements Blob, Serializable { - - //if no default is set, this default size is used by the connector. - public static final int DEFAULT_MAX_SIZE = 5000000; - private byte[] data; - - /** - * Creates a MMBlob object by calling <code>getBytes</code> on the - * <code>Blob</code> argument. - * @param blob the Blob object to get the data from. - */ - public BlobImpl(Blob blob) throws SQLException { - int length = (int) blob.length(); - data = blob.getBytes(1, length); - } - - /** - * Creates a MMBlob object by copying the data in <code>originalData</code> - * @param originalData the array of bytes to copy into this MMBlob object. - */ - public BlobImpl(byte[] originalData) { - data = new byte[originalData.length]; - int originalDataStartPosition = 0; - int dataStartPosition = 0; - int bytesToCopy = originalData.length; - System.arraycopy(originalData, originalDataStartPosition, data, dataStartPosition, bytesToCopy); - } - - public BlobImpl(InputStream in, int length) throws SQLException{ - data = new byte[length]; - try { - in.read(data, 0, length); - } catch (IOException e) { - throw new SQLException(e.getMessage()); - } - } - - /** - * Retrieves the <code>BLOB</code> designated by this - * <code>Blob</code> instance as a stream. - * @return a stream containing the <code>BLOB</code> data - * @exception SQLException if there is an error accessing the - * <code>BLOB</code> - */ - public InputStream getBinaryStream() throws SQLException { - return new ByteArrayInputStream(data); - } - - /** - * Returns as an array of bytes, part or all of the <code>BLOB</code> - * value that this <code>Blob</code> object designates. The byte - * array contains up to <code>length</code> consecutive bytes - * starting at position <code>pos</code>. - * @param pos the ordinal position of the first byte in the - * <code>BLOB</code> value to be extracted; the first byte is at - * position 1 - * @param length the number of consecutive bytes to be copied - * @return a byte array containing up to <code>length</code> - * consecutive bytes from the <code>BLOB</code> value designated - * by this <code>Blob</code> object, starting with the - * byte at position <code>pos</code> - * @exception SQLException if there is an error accessing the - * <code>BLOB</code> - */ - public byte[] getBytes(long pos, int length) throws SQLException { - if (pos < 1) { - throw new SQLException(CorePlugin.Util.getString("BlobImpl.Invalid_byte_position", new Long(pos))); //$NON-NLS-1$ - } - - if (pos > data.length) { - return null; - } - - if (length < 0) { - throw new SQLException(CorePlugin.Util.getString("BlobImpl.Invalid_bytes_length", new Long(length))); //$NON-NLS-1$ - } - - if (length > data.length) { - length = data.length; - } - - byte[] dataCopy = new byte[length]; - int startingDataPosition = (int) pos - 1; //pos is the ordinal index (starts at 1) so we need pos - 1 - int startingCopyPosition = 0; - System.arraycopy(data, startingDataPosition, dataCopy, startingCopyPosition, length); - return dataCopy; - } - - /** - * Returns the number of bytes in the <code>BLOB</code> value - * designated by this <code>Blob</code> object. - * @return length of the <code>BLOB</code> in bytes - * @exception SQLException if there is an error accessing the - * length of the <code>BLOB</code> - */ - public long length() throws SQLException { - return data.length; - } - - /** - * Determines the byte position in the <code>BLOB</code> value - * designated by this <code>Blob</code> object at which - * <code>pattern</code> begins. The search begins at position - * <code>start</code>. - * @param pattern the <code>Blob</code> object designating - * the <code>BLOB</code> value for which to search - * @param start the position in the <code>BLOB</code> value - * at which to begin searching; the first position is 1 - * @return the position at which the pattern begins, else -1 - * @exception SQLException if there is an error accessing the - * <code>BLOB</code> - */ - public long position(Blob pattern, long start) throws SQLException { - if (pattern == null || start > data.length) { - return -1; - } - int length = (int) pattern.length(); - byte[] patternBytes = pattern.getBytes(1, length); - return position(patternBytes, start); - } - - /** - * Determines the byte position at which the specified byte - * <code>pattern</code> begins within the <code>BLOB</code> - * value that this <code>Blob</code> object represents. The - * search for <code>pattern</code> begins at position - * <code>start</code>. - * @param pattern the byte array for which to search - * @param start the position at which to begin searching; the - * first position is 1 - * @return the position at which the pattern appears, else -1 - * @exception SQLException if there is an error accessing the - * <code>BLOB</code> - */ - public long position(byte[] pattern, long start) throws SQLException { - if (start < 1) { - throw new SQLException(CorePlugin.Util.getString("BlobImpl.Invalid_start_position", new Long(start))); //$NON-NLS-1$ - } - if (pattern == null || start > data.length) { - return -1; - } - String patternString = new String(pattern); - String byteString = new String(data); - start--; - int position = byteString.indexOf(patternString, (int) start); - if (position != -1) - position++; - return position; - } - - /** - * Compares two MMBlob objects for equality. - * @return True if equal - * @see java.lang.Object#equals(Object) - */ - public boolean equals(Object obj) { - try { - if (obj == null || data == null) { - return false; - } - - if (obj == this) { - return true; - } - - if (!(obj instanceof BlobImpl)) { - return false; - } - - BlobImpl blob = (BlobImpl) obj; - - if (blob.length() != length()) { - return false; - } - - byte[] bytes = blob.getBytes(1, (int) blob.length()); - - for (int i = 0; i < bytes.length; i++) { - if (bytes[i] != data[i]) { - return false; - } - } - } catch (SQLException e) { - return false; - } - return true; - } - - /** - * Returns a String that is a comma delimited list of up to the first 5 and - * last 5 bytes of the Blob in Hexadecimal. - * @return the String object convenient for displaying this Blob object - */ - public String toString() { - String pre = "{"; //$NON-NLS-1$ - String post = ""; //$NON-NLS-1$ - - int lastByte = data.length - 1; - int frontTruncate = 5; - int endTruncate = lastByte - 5; - - if (lastByte < 10) { - frontTruncate = lastByte; - endTruncate = lastByte; - } - - for (int i = 0; i < frontTruncate; i++) { - pre += Integer.toString(data[i], 16) + ","; //$NON-NLS-1$ - } - - for (int i = endTruncate; i < lastByte; i++) { - post += "," + Integer.toString(data[i], 16); //$NON-NLS-1$ - } - - post += "}"; //$NON-NLS-1$ - - return "Length:" + data.length + ":" + pre + "..." + post; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - /** - * @see java.sql.Blob#setBytes(long, byte[]) - */ - public int setBytes(long pos, byte[] bytes) throws SQLException { - throw SqlUtil.createFeatureNotSupportedException(); - } - - /** - * @see java.sql.Blob#setBytes(long, byte[], int, int) - */ - public int setBytes(long pos, byte[] bytes, int offset, int len) throws SQLException { - throw SqlUtil.createFeatureNotSupportedException(); - } - - /** - * @see java.sql.Blob#setBinaryStream(long) - */ - public OutputStream setBinaryStream(long pos) throws SQLException { - throw SqlUtil.createFeatureNotSupportedException(); - } - - /** - * @see java.sql.Blob#truncate(long) - */ - public void truncate(long len) throws SQLException { - throw SqlUtil.createFeatureNotSupportedException(); - } - - public void free() throws SQLException { - throw SqlUtil.createFeatureNotSupportedException(); - } - - public InputStream getBinaryStream(long arg0, long arg1) - throws SQLException { - throw SqlUtil.createFeatureNotSupportedException(); - } -} - - Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/BlobType.java =================================================================== --- trunk/common-core/src/main/java/com/metamatrix/common/types/BlobType.java 2009-06-09 18:00:27 UTC (rev 1031) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/BlobType.java 2009-06-09 18:11:52 UTC (rev 1032) @@ -29,7 +29,11 @@ import java.sql.Blob; import java.sql.SQLException; +import javax.sql.rowset.serial.SerialBlob; +import javax.sql.rowset.serial.SerialException; + import com.metamatrix.core.CorePlugin; +import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.core.util.ArgCheck; /** @@ -240,4 +244,16 @@ return this.srcBlob.getBinaryStream(pos, length); } //## JDBC4.0-end ## + + public static SerialBlob createBlob(byte[] bytes) { + if (bytes == null) { + return null; + } + try { + return new SerialBlob(bytes); + } catch (SQLException e) { + throw new MetaMatrixRuntimeException(e); + } + } + } Deleted: trunk/common-core/src/main/java/com/metamatrix/common/types/ClobImpl.java =================================================================== --- trunk/common-core/src/main/java/com/metamatrix/common/types/ClobImpl.java 2009-06-09 18:00:27 UTC (rev 1031) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/ClobImpl.java 2009-06-09 18:11:52 UTC (rev 1032) @@ -1,341 +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 com.metamatrix.common.types; - -import java.io.ByteArrayInputStream; -import java.io.CharArrayReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.Reader; -import java.io.Serializable; -import java.io.Writer; -import java.nio.charset.Charset; -import java.sql.Clob; -import java.sql.SQLException; -import java.util.Arrays; -/*## JDBC3.0-JDK1.5-begin ## -import java.io.UnsupportedEncodingException; -## JDBC3.0-JDK1.5-end ##*/ - - -import com.metamatrix.common.util.SqlUtil; -import com.metamatrix.core.CorePlugin; - -/** - * This object holds a chunk of character data and implements the JDBC Clob interface. - * This object presents a streaming interface but actually encapsulates the entire clob - * object. Connectors can construct this object when dealing with large objects. - */ -public class ClobImpl implements Clob, Serializable { - - public static final int DEFAULT_MAX_SIZE = 5000000; - - private char[] data; - - /** - * Creates a MMClob object by using the CharacterStream of the - * <code>Clob</code> argument. - * @param clob the Clob object to get the characters from. - */ - public ClobImpl(Clob clob) throws SQLException { - try { - int length = (int) clob.length(); - data = new char[length]; - Reader reader = clob.getCharacterStream(); - int charsRead = 0; - int start = 0; - int bytesToRead = length; - while ((charsRead = reader.read(data, start, bytesToRead)) != -1 && bytesToRead != 0) { - start += charsRead; - bytesToRead -= charsRead; - } - - } catch (IOException ioe) { - throw new SQLException(CorePlugin.Util.getString("ClobImpl.Failed_copy_clob", ioe.getMessage())); //$NON-NLS-1$ - } - } - - /** - * Creates a MMClob object by copying the chars in <code>originalData</code> - * @param originalData the array of chars to copy into this MMClob object. - */ - public ClobImpl(char[] originalData) { - data = new char[originalData.length]; - int originalDataStartPosition = 0; - int dataStartPosition = 0; - int charsToCopy = originalData.length; - System.arraycopy(originalData, originalDataStartPosition, data, dataStartPosition, charsToCopy); - } - - public ClobImpl(InputStream in, Charset charSet, int length) throws SQLException{ - data = new char[length]; - try { - new InputStreamReader(in, charSet).read(data, 0, length); - } catch (IOException e) { - throw new SQLException(e.getMessage()); - } - } - - public ClobImpl(Reader reader, int length) throws SQLException{ - data = new char[length]; - try { - reader.read(data, 0, length); - } catch (IOException e) { - throw new SQLException(e.getMessage()); - } - } - - /** - * Gets the <code>CLOB</code> value designated by this <code>Clob</code> - * object as a stream of Ascii bytes. - * @return an ascii stream containing the <code>CLOB</code> data - * @exception SQLException if there is an error accessing the - * <code>CLOB</code> value - */ - public InputStream getAsciiStream() throws SQLException { - //## JDBC4.0-begin ## - byte[] bytes = new String(data).getBytes(Charset.forName("US-ASCII")); //$NON-NLS-1$ - //## JDBC4.0-end ## - /*## JDBC3.0-JDK1.5-begin ## - byte[] bytes; - try { - bytes = new String(data).getBytes("US-ASCII"); //$NON-NLS-1$ - } catch (UnsupportedEncodingException e) { - throw new SQLException(e.getMessage()); - } - ## JDBC3.0-JDK1.5-end ##*/ - return new ByteArrayInputStream(bytes); - } - - /** - * Gets the <code>CLOB</code> value designated by this <code>Clob</code> - * object as a Unicode stream. - * @return a Unicode stream containing the <code>CLOB</code> data - * @exception SQLException if there is an error accessing the - * <code>CLOB</code> value - */ - public Reader getCharacterStream() throws SQLException { - return new CharArrayReader(data); - } - - /** - * Returns a copy of the specified substring - * in the <code>CLOB</code> value - * designated by this <code>Clob</code> object. - * The substring begins at position - * <code>pos</code> and has up to <code>length</code> consecutive - * characters. - * @param pos the first character of the substring to be extracted. - * The first character is at position 1. - * @param length the number of consecutive characters to be copied - * @return a <code>String</code> that is the specified substring in - * the <code>CLOB</code> value designated by this <code>Clob</code> object - * @exception SQLException if there is an error accessing the - * <code>CLOB</code> - */ - public String getSubString(long pos, int length) throws SQLException { - - if (pos < 1) { - throw new SQLException(CorePlugin.Util.getString("ClobImpl.Invalid_substring_position", new Long(pos))); //$NON-NLS-1$ - } - - if (pos > data.length) { - return null; - } - - if (length < 0) { - throw new SQLException(CorePlugin.Util.getString("ClobImpl.Invalid_substring_length", new Long(length))); //$NON-NLS-1$ - } - - if (length > data.length) { - length = data.length; - } - - pos--; //the API specifies that the first char is at pos = 1 - return new String(data, (int) pos, length); - } - - /** - * Returns the number of characters - * in the <code>CLOB</code> value - * designated by this <code>Clob</code> object. - * @return length of the <code>CLOB</code> in characters - * @exception SQLException if there is an error accessing the - * length of the <code>CLOB</code> - */ - public long length() throws SQLException { - return data.length; - } - - /** - * Determines the character position at which the specified - * <code>Clob</code> object <code>searchstr</code> appears in this - * <code>Clob</code> object. The search begins at position - * <code>start</code>. - * @param searchstr the <code>Clob</code> object for which to search - * @param start the position at which to begin searching; the first - * position is 1 - * @return the position at which the <code>Clob</code> object appears, - * else -1; the first position is 1 - * @exception SQLException if there is an error accessing the - * <code>CLOB</code> value - */ - public long position(Clob searchstr, long start) throws SQLException { - - if (searchstr == null || start > data.length) { - return -1; - } - int length = (int) searchstr.length(); - String searchString = searchstr.getSubString(1, length); - return position(searchString, start); - } - - /** - * Determines the character position at which the specified substring - * <code>searchstr</code> appears in the SQL <code>CLOB</code> value - * represented by this <code>Clob</code> object. The search - * begins at position <code>start</code>. - * @param searchstr the substring for which to search - * @param start the position at which to begin searching; the first position - * is 1 - * @return the position at which the substring appears, else -1; the first - * position is 1 - * @exception SQLException if there is an error accessing the - * <code>CLOB</code> value - */ - public long position(String searchstr, long start) throws SQLException { - if (start < 1) { - throw new SQLException(CorePlugin.Util.getString("ClobImpl.Invalid_start_position", new Long(start))); //$NON-NLS-1$ - } - if (searchstr == null || start > data.length) { - return -1; - } - String str = new String(data); - start--; - int position = str.indexOf(searchstr, (int) start); - if (position != -1) - position++; - return position; - } - - /** - * Compares two MMClob objects for equality. - * @return True if equal - * @see java.lang.Object#equals(Object) - */ - public boolean equals(Object obj) { - if (obj == null || data == null) { - return false; - } - - if (obj == this) { - return true; - } - - if (!(obj instanceof ClobImpl)) { - return false; - } - - ClobImpl clob = (ClobImpl) obj; - - return Arrays.equals(data, clob.data); - } - - /** - * Returns a String that is a coma delimited list of up to - * the first 5 and last 5 chars of the Clob. - * @return the String object convenient for displaying this Clob object - */ - public String toString() { - - String pre = "{"; //$NON-NLS-1$ - String post = ""; //$NON-NLS-1$ - - int lastByte = data.length - 1; - int frontTruncate = 5; - int endTruncate = lastByte - 5; - - if (lastByte < 10) { - frontTruncate = lastByte; - endTruncate = lastByte; - } - - for (int i = 0; i < frontTruncate; i++) { - pre += data[i] + ","; //$NON-NLS-1$ - } - - for (int i = endTruncate; i < lastByte; i++) { - post += "," + data[i]; //$NON-NLS-1$ - } - - post += "}"; //$NON-NLS-1$ - - return "Length:" + data.length + ":" + pre + "..." + post; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - /** - * @see java.sql.Clob#setString(long, java.lang.String) - */ - public int setString(long pos, String str) throws SQLException { - throw SqlUtil.createFeatureNotSupportedException(); - } - - /** - * @see java.sql.Clob#setString(long, java.lang.String, int, int) - */ - public int setString(long pos, String str, int offset, int len) throws SQLException { - throw SqlUtil.createFeatureNotSupportedException(); - } - - /** - * @see java.sql.Clob#setAsciiStream(long) - */ - public OutputStream setAsciiStream(long pos) throws SQLException { - throw SqlUtil.createFeatureNotSupportedException(); - } - - /** - * @see java.sql.Clob#setCharacterStream(long) - */ - public Writer setCharacterStream(long pos) throws SQLException { - throw SqlUtil.createFeatureNotSupportedException(); - } - - /** - * @see java.sql.Clob#truncate(long) - */ - public void truncate(long len) throws SQLException { - throw SqlUtil.createFeatureNotSupportedException(); - } - - public void free() throws SQLException { - throw SqlUtil.createFeatureNotSupportedException(); - } - - public Reader getCharacterStream(long arg0, long arg1) throws SQLException { - throw SqlUtil.createFeatureNotSupportedException(); - } - -} Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/ClobType.java =================================================================== --- trunk/common-core/src/main/java/com/metamatrix/common/types/ClobType.java 2009-06-09 18:00:27 UTC (rev 1031) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/ClobType.java 2009-06-09 18:11:52 UTC (rev 1032) @@ -31,6 +31,10 @@ import java.sql.Clob; import java.sql.SQLException; +import javax.sql.rowset.serial.SerialBlob; +import javax.sql.rowset.serial.SerialClob; +import javax.sql.rowset.serial.SerialException; + import com.metamatrix.core.CorePlugin; import com.metamatrix.core.MetaMatrixRuntimeException; @@ -304,4 +308,12 @@ return this.srcClob.getCharacterStream(pos, length); } //## JDBC4.0-end ## + + public static SerialClob createClob(char[] chars) { + try { + return new SerialClob(chars); + } catch (SQLException e) { + throw new MetaMatrixRuntimeException(e); + } + } } Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/DataTypeManager.java =================================================================== --- trunk/common-core/src/main/java/com/metamatrix/common/types/DataTypeManager.java 2009-06-09 18:00:27 UTC (rev 1031) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/DataTypeManager.java 2009-06-09 18:11:52 UTC (rev 1032) @@ -993,7 +993,7 @@ @Override //## JDBC4.0-end ## public ClobType transform(char[] value) { - return new ClobType(new ClobImpl(value)); + return new ClobType(ClobType.createClob(value)); } }); sourceConverters.put(Blob.class, new SourceTransform<Blob, BlobType>() { @@ -1009,7 +1009,7 @@ @Override //## JDBC4.0-end ## public BlobType transform(byte[] value) { - return new BlobType(new BlobImpl(value)); + return new BlobType(BlobType.createBlob(value)); } }); sourceConverters.put(SQLXML.class, new SourceTransform<SQLXML, XMLType>() { Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic/StringToClobTransform.java =================================================================== --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/StringToClobTransform.java 2009-06-09 18:00:27 UTC (rev 1031) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/StringToClobTransform.java 2009-06-09 18:11:52 UTC (rev 1032) @@ -23,7 +23,6 @@ package com.metamatrix.common.types.basic; import com.metamatrix.common.types.AbstractTransform; -import com.metamatrix.common.types.ClobImpl; import com.metamatrix.common.types.ClobType; import com.metamatrix.common.types.TransformationException; @@ -43,7 +42,7 @@ } String contents = (String)value; - return new ClobType(new ClobImpl(contents.toCharArray())); + return new ClobType(ClobType.createClob(contents.toCharArray())); } /** Modified: trunk/common-core/src/main/java/com/metamatrix/core/util/FileUtil.java =================================================================== --- trunk/common-core/src/main/java/com/metamatrix/core/util/FileUtil.java 2009-06-09 18:00:27 UTC (rev 1031) +++ trunk/common-core/src/main/java/com/metamatrix/core/util/FileUtil.java 2009-06-09 18:11:52 UTC (rev 1032) @@ -118,10 +118,12 @@ reader = new FileReader(this.file); result = read(reader); } finally { - try { - reader.close(); - } catch (Exception e) { - } + if (reader != null) { + try { + reader.close(); + } catch (Exception e) { + } + } } return result; @@ -140,10 +142,12 @@ } catch (IOException e) { throw new MetaMatrixRuntimeException(e); } finally { - try { - bufferedReader.close(); - } catch (Exception e) { - } + if (bufferedReader != null) { + try { + bufferedReader.close(); + } catch (Exception e) { + } + } } return writer.toString(); } Modified: trunk/common-core/src/main/java/com/metamatrix/core/util/ObjectConverterUtil.java =================================================================== --- trunk/common-core/src/main/java/com/metamatrix/core/util/ObjectConverterUtil.java 2009-06-09 18:00:27 UTC (rev 1031) +++ trunk/common-core/src/main/java/com/metamatrix/core/util/ObjectConverterUtil.java 2009-06-09 18:11:52 UTC (rev 1032) @@ -33,6 +33,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.io.Reader; import java.sql.SQLException; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; @@ -375,6 +376,18 @@ } } } + + public static String convertToString(Reader reader) throws IOException { + return new String(convertToCharArray(reader, Integer.MAX_VALUE)); + } + public static char[] convertToCharArray(Reader reader, int length) throws IOException { + StringBuilder sb = new StringBuilder(); + int chr = -1; + for (int i = 0; i < length && (chr = reader.read()) != -1; i ++) { + sb.append((char)chr); + } + return sb.toString().toCharArray(); + } } Deleted: trunk/common-core/src/test/java/com/metamatrix/common/types/TestBlobImpl.java =================================================================== --- trunk/common-core/src/test/java/com/metamatrix/common/types/TestBlobImpl.java 2009-06-09 18:00:27 UTC (rev 1031) +++ trunk/common-core/src/test/java/com/metamatrix/common/types/TestBlobImpl.java 2009-06-09 18:11:52 UTC (rev 1032) @@ -1,70 +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 com.metamatrix.common.types; - -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.sql.Blob; - -import com.metamatrix.common.types.BlobImpl; - -import junit.framework.TestCase; - -public class TestBlobImpl extends TestCase{ - private Blob blob; - - public TestBlobImpl(String name) { - super(name); - } - - public void setUp() throws Exception{ - ByteArrayInputStream in = new ByteArrayInputStream("test blob".getBytes()); //$NON-NLS-1$ - blob = new BlobImpl(in, 9); - } - - public void testGetBinaryStream() throws Exception{ - InputStream in = blob.getBinaryStream(); - BufferedReader reader = new BufferedReader(new InputStreamReader(in)); - assertEquals("test blob", reader.readLine()); //$NON-NLS-1$ - assertNull(reader.readLine()); - } - - public void testGetBytes() throws Exception{ - byte[] bytes = blob.getBytes(2, 5); - assertEquals("est b", new String(bytes)); //$NON-NLS-1$ - } - - public void testLength() throws Exception{ - assertEquals(9, blob.length()); - } - - public void testPosition() throws Exception{ - assertEquals(3, blob.position("st".getBytes(), 2)); //$NON-NLS-1$ - } - - public void testEquals() throws Exception{ - assertEquals(blob, new BlobImpl(new ByteArrayInputStream("test blob".getBytes()), 9)); //$NON-NLS-1$ - } -} Modified: trunk/common-core/src/test/java/com/metamatrix/common/types/TestBlobValue.java =================================================================== --- trunk/common-core/src/test/java/com/metamatrix/common/types/TestBlobValue.java 2009-06-09 18:00:27 UTC (rev 1031) +++ trunk/common-core/src/test/java/com/metamatrix/common/types/TestBlobValue.java 2009-06-09 18:11:52 UTC (rev 1032) @@ -28,6 +28,8 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import javax.sql.rowset.serial.SerialBlob; + import com.metamatrix.core.util.UnitTestUtil; import junit.framework.TestCase; @@ -37,7 +39,7 @@ public void testBlobValue() throws Exception { String testString = "this is test blob"; //$NON-NLS-1$ - BlobImpl blob = new BlobImpl(testString.getBytes()); + SerialBlob blob = new SerialBlob(testString.getBytes()); BlobType bv = new BlobType(blob); assertEquals(testString, new String(bv.getBytes(1L, (int)bv.length()))); @@ -46,7 +48,7 @@ public void testClobValuePersistence() throws Exception { String testString = "this is test clob"; //$NON-NLS-1$ - BlobImpl blob = new BlobImpl(testString.getBytes()); + SerialBlob blob = new SerialBlob(testString.getBytes()); String key = "keytodata"; //$NON-NLS-1$ BlobType bv = new BlobType(blob); @@ -76,10 +78,4 @@ saved.delete(); } - public void testEquals() { - BlobType blob = new BlobType(new BlobImpl(new byte[3])); - BlobType blob1 = new BlobType(new BlobImpl(new byte[3])); - assertTrue(blob.equals(blob1)); - } - } Deleted: trunk/common-core/src/test/java/com/metamatrix/common/types/TestClobImpl.java =================================================================== --- trunk/common-core/src/test/java/com/metamatrix/common/types/TestClobImpl.java 2009-06-09 18:00:27 UTC (rev 1031) +++ trunk/common-core/src/test/java/com/metamatrix/common/types/TestClobImpl.java 2009-06-09 18:11:52 UTC (rev 1032) @@ -1,76 +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 com.metamatrix.common.types; - -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.io.StringReader; -import java.sql.Clob; - -import com.metamatrix.common.types.ClobImpl; - -import junit.framework.TestCase; - -public class TestClobImpl extends TestCase{ - private Clob clob; - - public TestClobImpl(String name) { - super(name); - } - - public void setUp() throws Exception{ - Reader reader = new StringReader("test clob"); //$NON-NLS-1$ - clob = new ClobImpl(reader, 9); - } - - public void testGetAsciiStream() throws Exception{ - InputStream in = clob.getAsciiStream(); - BufferedReader reader = new BufferedReader(new InputStreamReader(in)); - assertEquals("test clob", reader.readLine()); //$NON-NLS-1$ - assertNull(reader.readLine()); - } - - public void testGetCharacterStream() throws Exception{ - BufferedReader reader = new BufferedReader(clob.getCharacterStream()); - assertEquals("test clob", reader.readLine()); //$NON-NLS-1$ - assertNull(reader.readLine()); - } - - public void testGetSubString() throws Exception{ - assertEquals("est", clob.getSubString(2,3)); //$NON-NLS-1$ - } - - public void testLength() throws Exception{ - assertEquals(9, clob.length()); - } - - public void testPosition() throws Exception{ - assertEquals(3, clob.position("st", 2)); //$NON-NLS-1$ - } - - public void testEquals() throws Exception{ - assertEquals(clob, new ClobImpl(new StringReader("test clob"), 9)); //$NON-NLS-1$ - } -} Modified: trunk/common-core/src/test/java/com/metamatrix/common/types/TestClobValue.java =================================================================== --- trunk/common-core/src/test/java/com/metamatrix/common/types/TestClobValue.java 2009-06-09 18:00:27 UTC (rev 1031) +++ trunk/common-core/src/test/java/com/metamatrix/common/types/TestClobValue.java 2009-06-09 18:11:52 UTC (rev 1032) @@ -28,6 +28,8 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import javax.sql.rowset.serial.SerialClob; + import com.metamatrix.core.util.UnitTestUtil; import junit.framework.TestCase; @@ -37,7 +39,7 @@ public void testClobValue() throws Exception { String testString = "this is test clob"; //$NON-NLS-1$ - ClobImpl clob = new ClobImpl(testString.toCharArray()); + SerialClob clob = new SerialClob(testString.toCharArray()); ClobType cv = new ClobType(clob); assertEquals(testString, cv.getSubString(1L, (int)cv.length())); @@ -46,7 +48,7 @@ public void testClobValuePersistence() throws Exception { String testString = "this is test clob"; //$NON-NLS-1$ - ClobImpl clob = new ClobImpl(testString.toCharArray()); + SerialClob clob = new SerialClob(testString.toCharArray()); String key = "keytodata"; //$NON-NLS-1$ ClobType cv = new ClobType(clob); Modified: trunk/common-core/src/test/java/com/metamatrix/common/types/TestDataTypeManager.java =================================================================== --- trunk/common-core/src/test/java/com/metamatrix/common/types/TestDataTypeManager.java 2009-06-09 18:00:27 UTC (rev 1031) +++ trunk/common-core/src/test/java/com/metamatrix/common/types/TestDataTypeManager.java 2009-06-09 18:11:52 UTC (rev 1032) @@ -26,6 +26,8 @@ import java.util.Iterator; import java.util.Set; +import javax.sql.rowset.serial.SerialBlob; + import junit.framework.TestCase; public class TestDataTypeManager extends TestCase { @@ -186,10 +188,10 @@ assertEquals(MMJDBCSQLTypeInfo.getSQLTypeFromRuntimeType(DataTypeManager.DefaultDataClasses.TIMESTAMP), Types.TIMESTAMP); } - public void testRuntimeTypeConversion() { + public void testRuntimeTypeConversion() throws Exception { assertNull(DataTypeManager.convertToRuntimeType(null)); - assertTrue(DataTypeManager.convertToRuntimeType(new BlobImpl(new byte[0])) instanceof BlobType); + assertTrue(DataTypeManager.convertToRuntimeType(new SerialBlob(new byte[0])) instanceof BlobType); //unknown type should return as same Object foo = new Object(); Modified: trunk/common-core/src/test/java/com/metamatrix/common/types/TestSQLXMLImpl.java =================================================================== --- trunk/common-core/src/test/java/com/metamatrix/common/types/TestSQLXMLImpl.java 2009-06-09 18:00:27 UTC (rev 1031) +++ trunk/common-core/src/test/java/com/metamatrix/common/types/TestSQLXMLImpl.java 2009-06-09 18:11:52 UTC (rev 1032) @@ -23,7 +23,6 @@ package com.metamatrix.common.types; import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.Reader; @@ -36,6 +35,8 @@ import junit.framework.TestCase; +import com.metamatrix.core.util.ObjectConverterUtil; + /** * Basically we want to make sure that nobody has changed the fundamental contract * of translator @@ -83,7 +84,7 @@ public void testGetBinaryStream() throws Exception { SQLXMLImpl xml = new SQLXMLImpl(translator); - assertEquals(testStr, getContents(xml.getBinaryStream())); + assertEquals(testStr, ObjectConverterUtil.convertToString(xml.getBinaryStream())); } @@ -128,17 +129,6 @@ } reader.close(); return sb.toString(); - } + } - private String getContents(InputStream reader) throws IOException { - ByteArrayOutputStream out = new ByteArrayOutputStream(); - int chr = reader.read(); - while(chr != -1) { - out.write((byte)chr); - chr = reader.read(); - } - reader.close(); - return new String(out.toByteArray()); - } - } Modified: trunk/common-core/src/test/java/com/metamatrix/common/types/TestXMLStreamSourceTranslator.java =================================================================== --- trunk/common-core/src/test/java/com/metamatrix/common/types/TestXMLStreamSourceTranslator.java 2009-06-09 18:00:27 UTC (rev 1031) +++ trunk/common-core/src/test/java/com/metamatrix/common/types/TestXMLStreamSourceTranslator.java 2009-06-09 18:11:52 UTC (rev 1032) @@ -33,6 +33,8 @@ import javax.xml.transform.stream.StreamSource; +import com.metamatrix.core.util.ObjectConverterUtil; + import junit.framework.TestCase; @@ -87,25 +89,13 @@ public void testGetReader() throws Exception { XMLStreamSourceTranslator translator = new XMLStreamSourceTranslator(new StreamSource(new StringReader(sourceXML)), new Properties()); Reader reader = translator.getReader(); - StringBuffer sb = readContents(reader); - assertEquals(sourceXML, sb.toString()); + assertEquals(sourceXML, ObjectConverterUtil.convertToString(reader)); } - private StringBuffer readContents(Reader reader) throws IOException { - StringBuffer sb = new StringBuffer(); - int chr = reader.read(); - while(chr != -1) { - sb.append((char)chr); - chr = reader.read(); - } - return sb; - } - public void testCharInput() throws Exception { XMLStreamSourceTranslator translator = new XMLStreamSourceTranslator(sourceXML.toCharArray(), new Properties()); Reader reader = translator.getReader(); - StringBuffer sb = readContents(reader); - assertEquals(sourceXML, sb.toString()); + assertEquals(sourceXML, ObjectConverterUtil.convertToString(reader)); } public void testXMLReaderFactory() throws Exception { @@ -115,8 +105,7 @@ } }, new Properties()); Reader reader = translator.getReader(); - StringBuffer sb = readContents(reader); - assertEquals(sourceXML, sb.toString()); + assertEquals(sourceXML, ObjectConverterUtil.convertToString(reader)); } /* @@ -156,8 +145,7 @@ assertTrue(translator.getSource() instanceof StreamSource); StreamSource s = (StreamSource)translator.getSource(); Reader reader = s.getReader(); - StringBuffer sb = readContents(reader); - assertEquals(sourceXML, sb.toString()); + assertEquals(sourceXML, ObjectConverterUtil.convertToString(reader)); } /* Modified: trunk/common-core/src/test/java/com/metamatrix/common/types/basic/TestTransforms.java =================================================================== --- trunk/common-core/src/test/java/com/metamatrix/common/types/basic/TestTransforms.java 2009-06-09 18:00:27 UTC (rev 1031) +++ trunk/common-core/src/test/java/com/metamatrix/common/types/basic/TestTransforms.java 2009-06-09 18:11:52 UTC (rev 1032) @@ -30,7 +30,6 @@ import junit.framework.TestCase; -import com.metamatrix.common.types.ClobImpl; import com.metamatrix.common.types.ClobType; import com.metamatrix.common.types.DataTypeManager; import com.metamatrix.common.types.SQLXMLImpl; @@ -134,7 +133,7 @@ /*timestamp-13*/{new Timestamp(System.currentTimeMillis()), new Timestamp(System.currentTimeMillis()), new Timestamp(System.currentTimeMillis())}, /*object-14*/ {null, null, null}, /*blob-15*/ {null, null, null}, - /*clob-16*/ {new ClobType(new ClobImpl("ClobData".toCharArray())), new ClobType(new ClobImpl("0".toCharArray())), new ClobType(new ClobImpl("123".toCharArray()))}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + /*clob-16*/ {new ClobType(ClobType.createClob("ClobData".toCharArray())), new ClobType(ClobType.createClob("0".toCharArray())), new ClobType(ClobType.createClob("123".toCharArray()))}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ /*xml-17*/ {new XMLType(new SQLXMLImpl("<foo>bar</foo>")), new XMLType(new SQLXMLImpl("<foo>bar</foo>")), new XMLType(new SQLXMLImpl("<foo>bar</foo>"))}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ }; Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/internal/ObjectProcedureProcessor.java =================================================================== --- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/internal/ObjectProcedureProcessor.java 2009-06-09 18:00:27 UTC (rev 1031) +++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/internal/ObjectProcedureProcessor.java 2009-06-09 18:11:52 UTC (rev 1032) @@ -22,6 +22,7 @@ package com.metamatrix.connector.metadata.internal; +import java.io.IOException; import java.nio.charset.Charset; import java.sql.SQLException; import java.util.ArrayList; @@ -31,14 +32,16 @@ import java.util.List; import java.util.Map; +import javax.sql.rowset.serial.SerialClob; + import org.teiid.connector.api.ConnectorException; -import com.metamatrix.common.types.ClobImpl; import com.metamatrix.common.types.ClobType; import com.metamatrix.common.vdb.api.VDBFile; import com.metamatrix.connector.metadata.MetadataConnectorConstants; import com.metamatrix.connector.metadata.ResultsIterator; import com.metamatrix.core.util.ArgCheck; +import com.metamatrix.core.util.ObjectConverterUtil; /** @@ -167,10 +170,12 @@ if (value instanceof VDBFile) { try { VDBFile record = (VDBFile)value; - value = new ClobImpl(record.getContent(), Charset.defaultCharset(), (int)record.getFileLength()); + value = new SerialClob(ObjectConverterUtil.convertToCharArray(record.getContent(), (int)record.getFileLength(), null)); } catch (SQLException e) { throw new RuntimeException(e); - } + } catch (IOException e) { + throw new RuntimeException(e); + } } } newRow.add(value);

14 years, 11 months

1
0
0 / 0

teiid SVN: r1031 - branches/6.1.x/build/kit-embedded.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2009-06-09 14:00:27 -0400 (Tue, 09 Jun 2009) New Revision: 1031 Modified: branches/6.1.x/build/kit-embedded/deploy.properties Log: TEIID-648 adding more properties and documentation to deploy.properties Modified: branches/6.1.x/build/kit-embedded/deploy.properties =================================================================== --- branches/6.1.x/build/kit-embedded/deploy.properties 2009-06-08 15:51:34 UTC (rev 1030) +++ branches/6.1.x/build/kit-embedded/deploy.properties 2009-06-09 18:00:27 UTC (rev 1031) @@ -1,20 +1,82 @@ -# This is properties file used for bootstrap Teiid embedded for loading - -#Path to the Teiid Configuration file (legacy, use deploy.properties) -dqp.configFile=./deploy/configuration.xml - -# Path to the directory where the VDBs are located, or list of VDBS separated by ";" -vdb.definition=./deploy/ - -#Log file (optional) - will be modified to include the instance name, i.e. teiid_1.log -dqp.logFile=./log/teiid.log - -#Logging level (CRITICAL=1,ERROR=2,WARNING=3,INFO=4,DETAIL=5) (optional: default 3) -dqp.logLevel=3 - -#Extensions directory - where the Connector Binding's classpath jar files are loaded. -#Use of this property is an implicit declaration that each Connector Binding has its own Class Loader. -dqp.extensions=./extensions/ - -#Path to instance specific temporary information for caching, buffering, and transactions +# +# This is properties file used for bootstrap Teiid embedded for loading +# + +#Path to the Teiid Configuration file +dqp.configFile=./deploy/configuration.xml + +# Path to the directory where the VDBs are located, or list of VDBS separated by ";" +vdb.definition=./deploy/ + +#Log file (optional) - will be modified to include the instance name, i.e. teiid_1.log +dqp.logFile=./log/teiid.log + +#Logging level (CRITICAL=1,ERROR=2,WARNING=3,INFO=4,DETAIL=5) (optional: default 3) +dqp.logLevel=3 + +#Extensions directory - where the Connector Binding's classpath jar files are loaded. +#Use of this property is an implicit declaration that each Connector Binding has its own Class Loader. +dqp.extensions=./extensions/ + +#Path to instance specific temporary information for caching, buffering, and transactions dqp.workdir=./work + +#Jars to load, which will be available to all services: UDFs, command logging, etc. +#dqp.extension.CommonClasspath=extensionjar:x.jar,extensionjar:y.jar + +#Location of the UDF model +#dqp.userDefinedFunctionsFile=extensionjar:FunctionDefinition.xmi + +# +# Processor settings +# + +#Process pool maximum thread count. (default 64) +#ProcessPoolMaxThreads=64 + +#Query processor time slice, in milliseconds. (default 2000) +#ProcessorTimeslice=2000 + +#Maximum allowed fetch size, set via JDBC. User requested value ignored above this value. (default 20000) +#MaxFetchSize=20000 + +#The maximum number of query plans that are cached. Note: this is a memory based cache. (default 250) +#MaxPlanCacheSize=250 + +# +# BufferManager Settings +# + +#The max size of a batch sent between connector and query service. Should be even multiple of processorBatchSize. (default 2000) +#dqp.buffer.connectorBatchSize=2000 + +#The max size of a batch sent internally within the query processor. Should be <= the connectorBatchSize. (default 2000) +#dqp.buffer.processorBatchSize=2000 + +#Defines whether to use disk buffering or not. (default 64) +#dqp.buffer.useDisk=true + +#The numeric memory size in MB, to be used before disk buffering kicks in (default 64) +#dqp.buffer.memory=64 + +# +# Cache Settings +# + +#Maximum number of cached lookup tables. Note: this is a memory based cache. (default 20) +#MaxCodeTables=50 + +#Maximum number of records in a single lookup table (default 10000) +#MaxCodeTableRecords=10000 + +#Denotes whether or not result set caching is enabled. (default false) +#ResultSetCacheEnabled=false + +#The maximum size in MB the result set cache will be allowed to grow to before objects are removed. 0 indicates no limit. (default 50) +#ResultSetCacheSize=50 + +#The maximum time a result set will be kept in cache before being automatically cleared. 0 indicates no limit. (default 3600000) +#ResultSetCacheMaxAge=3600000 + +#Defines whether caching is restricted to a specific session ('session') or a specific VDB version ('vdb'). (default vdb) +#ResultSetCacheScope=vdb \ No newline at end of file

14 years, 11 months

1
0
0 / 0

teiid SVN: r1030 - in branches/6.1.x: engine/src/main/java/org/teiid/dqp/internal/datamgr/impl and 1 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2009-06-08 11:51:34 -0400 (Mon, 08 Jun 2009) New Revision: 1030 Modified: branches/6.1.x/build/ branches/6.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorManager.java branches/6.1.x/engine/src/main/resources/com/metamatrix/dqp/i18n.properties Log: TEIID-646 expanding upon the legacy failed message. Property changes on: branches/6.1.x/build ___________________________________________________________________ Name: svn:ignore - target + target .classpath .project .settings Modified: branches/6.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorManager.java =================================================================== --- branches/6.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorManager.java 2009-06-08 14:20:38 UTC (rev 1029) +++ branches/6.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorManager.java 2009-06-08 15:51:34 UTC (rev 1030) @@ -404,10 +404,13 @@ } else { try { Class legacyConnector = classloader.loadClass("com.metamatrix.data.api.Connector"); //$NON-NLS-1$ + if (!legacyConnector.isAssignableFrom(o.getClass())) { + throw new ApplicationLifecycleException(DQPPlugin.Util.getString("failed_legacy", connectorClassName)); //$NON-NLS-1$ + } c = (Connector)ReflectionHelper.create("com.metamatrix.dqp.internal.datamgr.ConnectorWrapper", new Object[] {o}, new Class[] {legacyConnector}, classloader); //$NON-NLS-1$ this.isXa = classloader.loadClass("com.metamatrix.data.xa.api.XAConnector").isAssignableFrom(o.getClass()); //$NON-NLS-1$ } catch (ClassNotFoundException e) { - throw new ApplicationLifecycleException(e, DQPPlugin.Util.getString("failed_find_Connector_class", connectorClassName)); //$NON-NLS-1$ + throw new ApplicationLifecycleException(e, DQPPlugin.Util.getString("failed_legacy", connectorClassName)); //$NON-NLS-1$ } } } catch (MetaMatrixCoreException e) { Modified: branches/6.1.x/engine/src/main/resources/com/metamatrix/dqp/i18n.properties =================================================================== --- branches/6.1.x/engine/src/main/resources/com/metamatrix/dqp/i18n.properties 2009-06-08 14:20:38 UTC (rev 1029) +++ branches/6.1.x/engine/src/main/resources/com/metamatrix/dqp/i18n.properties 2009-06-08 15:51:34 UTC (rev 1030) @@ -37,7 +37,8 @@ ConnectorManagerImpl.Initializing_connector=Initializing connector {0} ConnectorManagerImpl.Couldn__t_parse_property=Could not parse property: {0} Error_closing_client_connection=Error closing client connection in ConnectorManager -failed_find_Connector_class=Could not find Connector class {0} +failed_find_Connector_class=Could not find Connector class {0} +failed_legacy=The specified connector class {0} is not an instance of a Teiid connector. This may be due to an inappropriate classpath entry. An attempt was also made to treat the class as a legacy MetaMatrix connector, however this was not successful either. failed_instantiate_Connector_class=Could not instantiate Connector class {0} failed_start_Connector=Could not start Connector {0}. {1} ConnectorManagerImpl.request_inactive_for_cancel=RequestID {0} is not active and the cancel request will not be processed.

14 years, 11 months

1
0
0 / 0

teiid SVN: r1029 - in trunk: adminshell and 40 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2009-06-08 10:20:38 -0400 (Mon, 08 Jun 2009) New Revision: 1029 Modified: trunk/adminshell/pom.xml trunk/build/pom.xml trunk/cache-jbosscache/pom.xml trunk/client-jdbc/pom.xml trunk/client/pom.xml trunk/common-core/pom.xml trunk/common-internal/pom.xml 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/engine/pom.xml trunk/hibernate-dialect/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: Moving trunk to 6.2 development. Modified: trunk/adminshell/pom.xml =================================================================== --- trunk/adminshell/pom.xml 2009-06-08 14:09:08 UTC (rev 1028) +++ trunk/adminshell/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-adminshell</artifactId> Modified: trunk/build/pom.xml =================================================================== --- trunk/build/pom.xml 2009-06-08 14:09:08 UTC (rev 1028) +++ trunk/build/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>build</artifactId> Modified: trunk/cache-jbosscache/pom.xml =================================================================== --- trunk/cache-jbosscache/pom.xml 2009-06-08 14:09:08 UTC (rev 1028) +++ trunk/cache-jbosscache/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -4,7 +4,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-cache-jbosscache</artifactId> Modified: trunk/client/pom.xml =================================================================== --- trunk/client/pom.xml 2009-06-08 14:09:08 UTC (rev 1028) +++ trunk/client/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -5,7 +5,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-client</artifactId> Modified: trunk/client-jdbc/pom.xml =================================================================== --- trunk/client-jdbc/pom.xml 2009-06-08 14:09:08 UTC (rev 1028) +++ trunk/client-jdbc/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -6,7 +6,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/common-core/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -4,7 +4,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/common-internal/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -5,7 +5,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-common-internal</artifactId> Modified: trunk/connector-api/pom.xml =================================================================== --- trunk/connector-api/pom.xml 2009-06-08 14:09:08 UTC (rev 1028) +++ trunk/connector-api/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -5,7 +5,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/connector-metadata/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -4,7 +4,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/connector-sdk/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -4,7 +4,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/connectors/connector-jdbc/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -5,7 +5,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/connectors/connector-ldap/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/connectors/connector-loopback/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -5,7 +5,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/connectors/connector-salesforce/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -5,7 +5,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/connectors/connector-text/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/connectors/connector-xml/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -5,7 +5,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/connectors/connector-xml-common/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -5,7 +5,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-xml-common</artifactId> Modified: trunk/connectors/pom.xml =================================================================== --- trunk/connectors/pom.xml 2009-06-08 14:09:08 UTC (rev 1028) +++ trunk/connectors/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -4,7 +4,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/connectors/salesforce-api/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/connectors/sandbox/connector-exec/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -3,7 +3,7 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.jboss.teiid.connectors</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/connectors/sandbox/connector-object/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -4,7 +4,7 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.jboss.teiid.connectors</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/connectors/sandbox/connector-oracle-spatial/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -3,7 +3,7 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.jboss.teiid.connectors</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/connectors/sandbox/connector-yahoo/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -3,7 +3,7 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.jboss.teiid.connectors</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/connectors/sandbox/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/console/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -4,7 +4,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/documentation/admin-guide/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.teiid.documentation</groupId> <artifactId>documentation</artifactId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/documentation/connector-developer-guide/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.teiid.documentation</groupId> <artifactId>documentation</artifactId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/documentation/jdbc-connector-guide/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.teiid.documentation</groupId> <artifactId>documentation</artifactId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jdbc-connector</artifactId> Modified: trunk/documentation/pom.xml =================================================================== --- trunk/documentation/pom.xml 2009-06-08 14:09:08 UTC (rev 1028) +++ trunk/documentation/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/documentation/quick-start-example/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.teiid.documentation</groupId> <artifactId>documentation</artifactId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/documentation/reference/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.teiid.documentation</groupId> <artifactId>documentation</artifactId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/documentation/server-extensions-guide/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.teiid.documentation</groupId> <artifactId>documentation</artifactId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>server-extensions-guide</artifactId> Modified: trunk/embedded/pom.xml =================================================================== --- trunk/embedded/pom.xml 2009-06-08 14:09:08 UTC (rev 1028) +++ trunk/embedded/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/engine/pom.xml =================================================================== --- trunk/engine/pom.xml 2009-06-08 14:09:08 UTC (rev 1028) +++ trunk/engine/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-engine</artifactId> Modified: trunk/hibernate-dialect/pom.xml =================================================================== --- trunk/hibernate-dialect/pom.xml 2009-06-08 14:09:08 UTC (rev 1028) +++ trunk/hibernate-dialect/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -3,12 +3,12 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-hibernate-dialect</artifactId> <name>Hibernate Dialect</name> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> <description>Teiid Hibernate Dialect</description> <dependencies> <dependency> Modified: trunk/metadata/pom.xml =================================================================== --- trunk/metadata/pom.xml 2009-06-08 14:09:08 UTC (rev 1028) +++ trunk/metadata/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-metadata</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-06-08 14:09:08 UTC (rev 1028) +++ trunk/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -6,7 +6,7 @@ <artifactId>teiid</artifactId> <packaging>pom</packaging> <name>Teiid</name> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/server/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -5,7 +5,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/server-installer/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/soap/pom.xml =================================================================== --- trunk/soap/pom.xml 2009-06-08 14:09:08 UTC (rev 1028) +++ trunk/soap/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/test-integration/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -4,7 +4,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.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-06-08 14:09:08 UTC (rev 1028) +++ trunk/txn-jbossts/pom.xml 2009-06-08 14:20:38 UTC (rev 1029) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid</artifactId> <groupId>org.jboss.teiid</groupId> - <version>6.1.0-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-txn-jbossts</artifactId>

14 years, 11 months

1
0
0 / 0

teiid SVN: r1028 - branches.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2009-06-08 10:09:08 -0400 (Mon, 08 Jun 2009) New Revision: 1028 Added: branches/6.1.x/ Log: adding the 6.1.x branch Copied: branches/6.1.x (from rev 1027, trunk)

14 years, 11 months

1
0
0 / 0

teiid SVN: r1027 - trunk/documentation/quick-start-example/src/main/docbook/en-US/content.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2009-06-08 10:08:42 -0400 (Mon, 08 Jun 2009) New Revision: 1027 Modified: trunk/documentation/quick-start-example/src/main/docbook/en-US/content/buildvdb.xml trunk/documentation/quick-start-example/src/main/docbook/en-US/content/deployment.xml trunk/documentation/quick-start-example/src/main/docbook/en-US/content/download.xml trunk/documentation/quick-start-example/src/main/docbook/en-US/content/example-explained.xml Log: TEIID-645 updating the quickstart for 6.1 Modified: trunk/documentation/quick-start-example/src/main/docbook/en-US/content/buildvdb.xml =================================================================== --- trunk/documentation/quick-start-example/src/main/docbook/en-US/content/buildvdb.xml 2009-06-08 13:25:47 UTC (rev 1026) +++ trunk/documentation/quick-start-example/src/main/docbook/en-US/content/buildvdb.xml 2009-06-08 14:08:42 UTC (rev 1027) @@ -28,7 +28,7 @@ list that will take you though all the steps involved.</para> <orderedlist> <listitem> - <para>Switch to the Designer Perspective, by opening the "Window->Open Prespective.."</para> + <para>Switch to the Designer Perspective, by opening the "Window->Open Perspective.."</para> </listitem> <listitem> <para>Create new "Model Project", using "File->New->ModelProject"</para> Modified: trunk/documentation/quick-start-example/src/main/docbook/en-US/content/deployment.xml =================================================================== --- trunk/documentation/quick-start-example/src/main/docbook/en-US/content/deployment.xml 2009-06-08 13:25:47 UTC (rev 1026) +++ trunk/documentation/quick-start-example/src/main/docbook/en-US/content/deployment.xml 2009-06-08 14:08:42 UTC (rev 1027) @@ -31,21 +31,12 @@ <para /> <sect1 id="stand-alone-deployment"> <title>Stand-alone Application Deployment</title> - <para>Copy the "Teiid-${version}-embedded.jar" and all dependent jars in "lib" directory in your Java - application's classpath along with your VDB. If your application is already using the any of dependent jars - defined in "lib" directory you can safely ignore adding that jar file to the classpath. Make sure the that - the versions match</para> <orderedlist> <listitem> - <para>Add "Teiid-${version}-embedded.jar" to your application classpath</para> + <para>Add the "${embedded root}/teiid-${version}-client.jar" to your application classpath</para> </listitem> <listitem> - <para>Add all the dependent jar files in the "lib" directory to your application's classpath. If your - application is already using the any of the "lib" directory's dependent jars, you can safely ignore - adding that jar to the classpath. Make sure the versions match.</para> - </listitem> - <listitem> - <para>Place the VDB in a folder and add this folder to your application's classpath. + <para>Place your VDB in a the "${embedded root}/deploy" or another location referenced by the deploy.properties file. </para> </listitem> <listitem> Modified: trunk/documentation/quick-start-example/src/main/docbook/en-US/content/download.xml =================================================================== --- trunk/documentation/quick-start-example/src/main/docbook/en-US/content/download.xml 2009-06-08 13:25:47 UTC (rev 1026) +++ trunk/documentation/quick-start-example/src/main/docbook/en-US/content/download.xml 2009-06-08 14:08:42 UTC (rev 1027) @@ -24,8 +24,8 @@ <emphasis>Teiid Embedded Kit</emphasis> and extract this tar/zip file to a directory you can access. </para> - <para>In the expanded directory, you will find "Teiid-${version}-embedded.jar", which is the main binary jar - file for Teiid Embedded, and the "lib" and "extension" directories containing supporting 3rd party binaries + <para>In the expanded directory, you will find "teiid-${version}-client.jar", which is the main client binary jar + file for Teiid Embedded, and the "lib" and "extension" directories containing binaries either directly or indirectly required to execute Teiid Embedded. Later sections describe installing these artifacts.</para> <note> <para> Modified: trunk/documentation/quick-start-example/src/main/docbook/en-US/content/example-explained.xml =================================================================== --- trunk/documentation/quick-start-example/src/main/docbook/en-US/content/example-explained.xml 2009-06-08 13:25:47 UTC (rev 1026) +++ trunk/documentation/quick-start-example/src/main/docbook/en-US/content/example-explained.xml 2009-06-08 14:08:42 UTC (rev 1027) @@ -82,45 +82,19 @@ <programlisting><![CDATA[ - -Contains the name and address of a Customer who owns portfolio account CREATE TABLE CUSTOMER - ( - SSN char(10), - FIRSTNAME varchar(64), - LASTNAME varchar(64), - ST_ADDRESS varchar(256), - APT_NUMBER varchar(32), - CITY varchar(64), - STATE varchar(32), - ZIPCODE varchar(10), - PHONE varchar(15) - ); + ... --Contains Customer's account number and its current status CREATE TABLE ACCOUNT - ( - ACCOUNT_ID integer, - SSN char(10), - STATUS char(10), - TYPE char(10), - DATEOPENED timestamp, - DATECLOSED timestamp - ); - + ... + --Contains information about stock symbol, company name etc. - CREATE TABLE PRODUCT ( - ID integer, - SYMBOL varchar(16), - COMPANY_NAME varchar(256) - ); + CREATE TABLE PRODUCT + ... --Contains each Account's holdings of Stocks CREATE TABLE HOLDINGS - ( - TRANSACTION_ID integer, - ACCOUNT_ID integer, - PRODUCT_ID integer, - PURCHASE_DATE timestamp, - SHARES_COUNT integer - ); + ... ]]> </programlisting> <para>We need to start the Derby RDBMS and create the "accounts" database with the below schema. These

14 years, 11 months

1
0
0 / 0

teiid SVN: r1026 - in trunk: connectors/connector-salesforce and 2 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2009-06-08 09:25:47 -0400 (Mon, 08 Jun 2009) New Revision: 1026 Modified: trunk/build/assembly/embedded/embedded-dist.xml trunk/connectors/connector-salesforce/pom.xml trunk/connectors/connector-xml-common/pom.xml trunk/connectors/connector-xml/pom.xml Log: TEIID-644 further refining xml dependencies. Modified: trunk/build/assembly/embedded/embedded-dist.xml =================================================================== --- trunk/build/assembly/embedded/embedded-dist.xml 2009-06-07 00:28:15 UTC (rev 1025) +++ trunk/build/assembly/embedded/embedded-dist.xml 2009-06-08 13:25:47 UTC (rev 1026) @@ -49,14 +49,6 @@ </fileSet> <fileSet> - <directory>target/distribution/teiid-${version}-connector-dependencies.dir</directory> - <includes> - <include>*.jar</include> - </includes> - <outputDirectory>extensions</outputDirectory> - </fileSet> - - <fileSet> <directory>build/target/kit-embedded</directory> <outputDirectory>/</outputDirectory> <excludes> Modified: trunk/connectors/connector-salesforce/pom.xml =================================================================== --- trunk/connectors/connector-salesforce/pom.xml 2009-06-07 00:28:15 UTC (rev 1025) +++ trunk/connectors/connector-salesforce/pom.xml 2009-06-08 13:25:47 UTC (rev 1026) @@ -22,7 +22,22 @@ <groupId>org.jboss.teiid</groupId> <artifactId>teiid-common-core</artifactId> <scope>provided</scope> - </dependency> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.jboss.teiid.connectors</groupId> <artifactId>connector-xml-common</artifactId> Modified: trunk/connectors/connector-xml/pom.xml =================================================================== --- trunk/connectors/connector-xml/pom.xml 2009-06-07 00:28:15 UTC (rev 1025) +++ trunk/connectors/connector-xml/pom.xml 2009-06-08 13:25:47 UTC (rev 1026) @@ -23,18 +23,28 @@ <groupId>org.jboss.teiid</groupId> <artifactId>teiid-common-core</artifactId> <scope>provided</scope> - </dependency> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.jboss.teiid.connectors</groupId> <artifactId>connector-xml-common</artifactId> <version>${project.version}</version> <type>pom</type> </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <scope>compile</scope> - </dependency> </dependencies> <!-- This build portion is identical for all the connectors that are deployed; so when making changes make sure Modified: trunk/connectors/connector-xml-common/pom.xml =================================================================== --- trunk/connectors/connector-xml-common/pom.xml 2009-06-07 00:28:15 UTC (rev 1025) +++ trunk/connectors/connector-xml-common/pom.xml 2009-06-08 13:25:47 UTC (rev 1026) @@ -14,11 +14,6 @@ <description>This project holds the common dependencies for the XML Connector</description> <dependencies> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - </dependency> - <dependency> <groupId>apache-httpclient</groupId> <artifactId>commons-httpclient</artifactId> <version>3.0.1</version> @@ -49,13 +44,13 @@ <groupId>xom</groupId> <artifactId>xom</artifactId> </exclusion> + <exclusion> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + </exclusion> </exclusions> </dependency> <dependency> - <groupId>jdom</groupId> - <artifactId>jdom</artifactId> - </dependency> - <dependency> <groupId>javax.jms</groupId> <artifactId>jms</artifactId> <version>1.1</version> @@ -64,6 +59,12 @@ <groupId>axis</groupId> <artifactId>axis</artifactId> <version>1.3</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>wss4j</groupId> @@ -100,15 +101,16 @@ <scope>runtime</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId> <version>2.7.0</version> <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>xom</groupId>

14 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

teiid-commits June 2009