teiid SVN: r3807 - in trunk/build: assembly and 1 other directory.
by teiid-commits@lists.jboss.org
Author: rareddy
Date: 2012-01-20 16:49:18 -0500 (Fri, 20 Jan 2012)
New Revision: 3807
Modified:
trunk/build/assembly/client-jar.xml
trunk/build/pom.xml
Log:
TEIID-1898: Making the JDBC jar name explicit as "teiid-{version}-jdbc.jar" to avoid confusion from the "client" module.
Modified: trunk/build/assembly/client-jar.xml
===================================================================
--- trunk/build/assembly/client-jar.xml 2012-01-20 21:47:22 UTC (rev 3806)
+++ trunk/build/assembly/client-jar.xml 2012-01-20 21:49:18 UTC (rev 3807)
@@ -1,7 +1,7 @@
-<!--This script builds a JAR for the Embedded Server Installation -->
+<!--This script builds a JAR for the JDBC Client -->
<assembly>
- <id>client</id>
+ <id>jdbc</id>
<formats>
<format>jar</format>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2012-01-20 21:47:22 UTC (rev 3806)
+++ trunk/build/pom.xml 2012-01-20 21:49:18 UTC (rev 3807)
@@ -118,9 +118,9 @@
<mainClass>net.sf.retrotranslator.transformer.Retrotranslator</mainClass>
<arguments>
<argument>-srcjar</argument>
- <argument>${project.basedir}/target/teiid-${project.version}-client.jar</argument>
+ <argument>${project.basedir}/target/teiid-${project.version}-jdbc.jar</argument>
<argument>-destjar</argument>
- <argument>${project.basedir}/target/teiid-${project.version}-client-jdk15.jar</argument>
+ <argument>${project.basedir}/target/teiid-${project.version}-jdbc-jdk15.jar</argument>
<argument>-embed</argument>
<argument>org.teiid.retroruntime</argument>
</arguments>
12 years, 11 months
teiid SVN: r3806 - trunk/build/assembly/adminshell.
by teiid-commits@lists.jboss.org
Author: rareddy
Date: 2012-01-20 16:47:22 -0500 (Fri, 20 Jan 2012)
New Revision: 3806
Modified:
trunk/build/assembly/adminshell/adminshell-dist.xml
Log:
TEIID-1875
Modified: trunk/build/assembly/adminshell/adminshell-dist.xml
===================================================================
--- trunk/build/assembly/adminshell/adminshell-dist.xml 2012-01-20 21:33:25 UTC (rev 3805)
+++ trunk/build/assembly/adminshell/adminshell-dist.xml 2012-01-20 21:47:22 UTC (rev 3806)
@@ -67,12 +67,5 @@
</fileSet>
</fileSets>
-
- <files>
- <file>
- <source>target/teiid-${project.version}-docs/admin-guide/en-US/pdf/teiid_admin_guide.pdf</source>
- <fileMode>0644</fileMode>
- </file>
- </files>
-
+
</assembly>
12 years, 11 months
teiid SVN: r3805 - in trunk/admin/src: main/resources/org/teiid/adminapi and 1 other directories.
by teiid-commits@lists.jboss.org
Author: rareddy
Date: 2012-01-20 16:33:25 -0500 (Fri, 20 Jan 2012)
New Revision: 3805
Modified:
trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataParser.java
trunk/admin/src/main/resources/org/teiid/adminapi/i18n.properties
trunk/admin/src/test/resources/parser-test-vdb.xml
Log:
TEIID-1906: correcting the typo for "allow-alter" to properly parse
Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataParser.java
===================================================================
--- trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataParser.java 2012-01-20 19:38:25 UTC (rev 3804)
+++ trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataParser.java 2012-01-20 21:33:25 UTC (rev 3805)
@@ -37,6 +37,7 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
+import org.teiid.adminapi.AdminPlugin;
import org.teiid.adminapi.DataPolicy;
import org.teiid.adminapi.Model;
import org.teiid.adminapi.Translator;
@@ -63,7 +64,7 @@
parseVDB(reader, vdb);
return vdb;
default:
- throw new XMLStreamException("Unexpected element '" + reader.getName() + "' encountered", reader.getLocation());
+ throw new XMLStreamException(AdminPlugin.Util.gs("unexpected_element1",reader.getName(), Element.VDB.getLocalName()), reader.getLocation());
}
}
return null;
@@ -98,7 +99,12 @@
// this is designer specific.
break;
default:
- throw new XMLStreamException("Unexpected element '" + reader.getName() + "' encountered", reader.getLocation());
+ throw new XMLStreamException(AdminPlugin.Util.gs("unexpected_element5",reader.getName(),
+ Element.DESCRIPTION.getLocalName(),
+ Element.PROPERTY.getLocalName(),
+ Element.MODEL.getLocalName(),
+ Element.TRANSLATOR.getLocalName(),
+ Element.DATA_ROLE.getLocalName()), reader.getLocation());
}
}
}
@@ -144,7 +150,10 @@
policy.addMappedRoleName(reader.getElementText());
break;
default:
- throw new XMLStreamException("Unexpected element '" + reader.getName() + "' encountered", reader.getLocation());
+ throw new XMLStreamException(AdminPlugin.Util.gs("unexpected_element2",reader.getName(),
+ Element.DESCRIPTION.getLocalName(),
+ Element.PERMISSION.getLocalName(),
+ Element.MAPPED_ROLE_NAME.getLocalName()), reader.getLocation());
}
}
}
@@ -176,7 +185,14 @@
break;
default:
- throw new XMLStreamException("Unexpected element '" + reader.getName() + "' encountered", reader.getLocation());
+ throw new XMLStreamException(AdminPlugin.Util.gs("unexpected_element7",reader.getName(),
+ Element.RESOURCE_NAME.getLocalName(),
+ Element.ALLOW_ALTER.getLocalName(),
+ Element.ALLOW_CREATE.getLocalName(),
+ Element.ALLOW_DELETE.getLocalName(),
+ Element.ALLOW_EXECUTE.getLocalName(),
+ Element.ALLOW_READ.getLocalName(),
+ Element.ALLOW_UPADTE), reader.getLocation());
}
}
}
@@ -194,7 +210,8 @@
parseProperty(reader, translator);
break;
default:
- throw new XMLStreamException("Unexpected element '" + reader.getName() + "' encountered", reader.getLocation());
+ throw new XMLStreamException(AdminPlugin.Util.gs("unexpected_element1",reader.getName(),
+ Element.PROPERTY.getLocalName()), reader.getLocation());
}
}
}
@@ -233,7 +250,11 @@
model.addError(ve);
break;
default:
- throw new XMLStreamException("Unexpected element '" + reader.getName() + "' encountered", reader.getLocation());
+ throw new XMLStreamException(AdminPlugin.Util.gs("unexpected_element4",reader.getName(),
+ Element.DESCRIPTION.getLocalName(),
+ Element.PROPERTY.getLocalName(),
+ Element.SOURCE.getLocalName(),
+ Element.VALIDATION_ERROR.getLocalName()), reader.getLocation());
}
}
}
@@ -280,7 +301,7 @@
ALLOW_UPADTE("allow-update"),
ALLOW_DELETE("allow-delete"),
ALLOW_EXECUTE("allow-execute"),
- ALLOW_ALTER("allow-alyer"),
+ ALLOW_ALTER("allow-alter"),
MAPPED_ROLE_NAME("mapped-role-name"),
ENTRY("entry");
Modified: trunk/admin/src/main/resources/org/teiid/adminapi/i18n.properties
===================================================================
--- trunk/admin/src/main/resources/org/teiid/adminapi/i18n.properties 2012-01-20 19:38:25 UTC (rev 3804)
+++ trunk/admin/src/main/resources/org/teiid/adminapi/i18n.properties 2012-01-20 21:33:25 UTC (rev 3805)
@@ -75,4 +75,11 @@
driver_not_defined=Driver {0} is not configured in the system, install the JDBC driver first
connection_url_required=connection-url is required property
datasource_exists=Data source with name {0} already exists; choose a different deployment name
-datasource_doesnot_exists=Data Source with name {0} does not exists in the system. Check the deployment name.
\ No newline at end of file
+datasource_doesnot_exists=Data Source with name {0} does not exists in the system. Check the deployment name.
+unexpected_element1=Unexpected Element {0} encountered, expecting one of {1}
+unexpected_element2=Unexpected Element {0} encountered, expecting one of {1} {2}
+unexpected_element3=Unexpected Element {0} encountered, expecting one of {1} {2} {3}
+unexpected_element4=Unexpected Element {0} encountered, expecting one of {1} {2} {3} {4}
+unexpected_element5=Unexpected Element {0} encountered, expecting one of {1} {2} {3} {4} {5}
+unexpected_element6=Unexpected Element {0} encountered, expecting one of {1} {2} {3} {4} {5} {6}
+unexpected_element7=Unexpected Element {0} encountered, expecting one of {1} {2} {3} {4} {5} {6} {7}
\ No newline at end of file
Modified: trunk/admin/src/test/resources/parser-test-vdb.xml
===================================================================
--- trunk/admin/src/test/resources/parser-test-vdb.xml 2012-01-20 19:38:25 UTC (rev 3804)
+++ trunk/admin/src/test/resources/parser-test-vdb.xml 2012-01-20 21:33:25 UTC (rev 3805)
@@ -26,6 +26,10 @@
<resource-name>myTable.T2</resource-name>
<allow-read>false</allow-read>
<allow-delete>true</allow-delete>
+ <allow-alter>true</allow-alter>
+ <allow-create>true</allow-create>
+ <allow-update>true</allow-update>
+ <allow-execute>true</allow-execute>
</permission>
<mapped-role-name>ROLE1</mapped-role-name>
<mapped-role-name>ROLE2</mapped-role-name>
12 years, 11 months
teiid SVN: r3804 - in trunk: build and 3 other directories.
by teiid-commits@lists.jboss.org
Author: rareddy
Date: 2012-01-20 14:38:25 -0500 (Fri, 20 Jan 2012)
New Revision: 3804
Removed:
trunk/build/assembly/docs.xml
Modified:
trunk/build/assembly/jboss-as7/dist.xml
trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml
trunk/build/pom.xml
trunk/pom.xml
Log:
TEIID-1875: Migrated the Teiid DocBook formated documents to JBoss Confluence
Deleted: trunk/build/assembly/docs.xml
===================================================================
--- trunk/build/assembly/docs.xml 2012-01-18 20:04:59 UTC (rev 3803)
+++ trunk/build/assembly/docs.xml 2012-01-20 19:38:25 UTC (rev 3804)
@@ -1,42 +0,0 @@
-<!--This script builds a JAR for a Teiid Embedded Server Installation -->
-<assembly>
-
- <id>docs</id>
-
- <formats>
- <format>dir</format>
- </formats>
-
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <moduleSets>
- <moduleSet>
- <includeSubModules>true</includeSubModules>
- <useAllReactorProjects>true</useAllReactorProjects>
-
- <includes>
- <include>org.jboss.teiid.documentation:admin-guide</include>
- <include>org.jboss.teiid.documentation:reference</include>
- <include>org.jboss.teiid.documentation:developer-guide</include>
- <include>org.jboss.teiid.documentation:quick-start-example</include>
- <include>org.jboss.teiid.documentation:client-developers-guide</include>
- <include>org.jboss.teiid.documentation:caching-guide</include>
- </includes>
-
- <sources>
- <includeModuleDirectory>true</includeModuleDirectory>
- <excludeSubModuleDirectories>false</excludeSubModuleDirectories>
- <useDefaultExcludes>true</useDefaultExcludes>
- <fileSets>
- <fileSet>
- <directory>./target/docbook/publish</directory>
- <outputDirectory></outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- </fileSet>
- </fileSets>
- </sources>
-
- </moduleSet>
- </moduleSets>
-
-</assembly>
\ No newline at end of file
Modified: trunk/build/assembly/jboss-as7/dist.xml
===================================================================
--- trunk/build/assembly/jboss-as7/dist.xml 2012-01-18 20:04:59 UTC (rev 3803)
+++ trunk/build/assembly/jboss-as7/dist.xml 2012-01-20 19:38:25 UTC (rev 3804)
@@ -41,43 +41,19 @@
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
</fileSet>
+
+ <fileSet>
+ <directory>../jboss-integration/src/main/resources/schema</directory>
+ <includes>
+ <include>jboss-teiid.xsd</include>
+ </includes>
+ <outputDirectory>docs/schema</outputDirectory>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
</fileSets>
- <files>
- <file>
- <source>target/teiid-${project.version}-docs/admin-guide/en-US/pdf/teiid_admin_guide.pdf</source>
- <outputDirectory>docs/teiid</outputDirectory>
- <fileMode>0644</fileMode>
- </file>
- <file>
- <source>target/teiid-${project.version}-docs/reference/en-US/pdf/teiid_reference.pdf</source>
- <outputDirectory>docs/teiid</outputDirectory>
- <fileMode>0644</fileMode>
- </file>
- <file>
- <source>target/teiid-${project.version}-docs/quick-start-example/en-US/pdf/teiid_quick_start_example.pdf</source>
- <outputDirectory>docs/teiid</outputDirectory>
- <fileMode>0644</fileMode>
- </file>
- <file>
- <source>target/teiid-${project.version}-docs/developer-guide/en-US/pdf/teiid_developer_guide.pdf</source>
- <outputDirectory>docs/teiid</outputDirectory>
- <fileMode>0644</fileMode>
- </file>
- <file>
- <source>target/teiid-${project.version}-docs/client-developers-guide/en-US/pdf/teiid_client_developers_guide.pdf</source>
- <outputDirectory>docs/teiid</outputDirectory>
- <fileMode>0644</fileMode>
- </file>
- <file>
- <source>target/teiid-${project.version}-docs/caching-guide/en-US/pdf/teiid_caching_guide.pdf</source>
- <outputDirectory>docs/teiid</outputDirectory>
- <fileMode>0644</fileMode>
- </file>
- </files>
-
-
<!-- these have external dependent clients like connectors-->
<moduleSets>
Modified: trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml
===================================================================
--- trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml 2012-01-18 20:04:59 UTC (rev 3803)
+++ trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml 2012-01-20 19:38:25 UTC (rev 3804)
@@ -12,6 +12,8 @@
<resource-root path="teiid-admin-${project.version}.jar" />
<resource-root path="saxonhe-9.2.1.5.jar" />
<resource-root path="json-simple-1.1.jar" />
+ <resource-root path="xom-1.2.jar" />
+ <resource-root path="nux-1.6.jar" />
<resource-root path="conf" />
</resources>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2012-01-18 20:04:59 UTC (rev 3803)
+++ trunk/build/pom.xml 2012-01-20 19:38:25 UTC (rev 3804)
@@ -97,7 +97,6 @@
<configuration>
<descriptors>
<descriptor>assembly/src.xml</descriptor>
- <descriptor>assembly/docs.xml</descriptor>
<descriptor>assembly/client-jar.xml</descriptor>
<descriptor>assembly/jboss-as7/dist.xml</descriptor>
<descriptor>assembly/adminshell/adminshell-dist.xml</descriptor>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2012-01-18 20:04:59 UTC (rev 3803)
+++ trunk/pom.xml 2012-01-20 19:38:25 UTC (rev 3804)
@@ -103,7 +103,6 @@
<maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
<modules>
- <module>documentation</module>
<module>build</module>
</modules>
<build>
12 years, 11 months
teiid SVN: r3803 - in branches/7.6.x/engine/src: test/java/org/teiid/query/processor and 1 other directory.
by teiid-commits@lists.jboss.org
Author: shawkins
Date: 2012-01-18 15:04:59 -0500 (Wed, 18 Jan 2012)
New Revision: 3803
Modified:
branches/7.6.x/engine/src/main/java/org/teiid/query/processor/relational/DependentCriteriaProcessor.java
branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java
Log:
TEIID-1899 fixing assertion error during join
Modified: branches/7.6.x/engine/src/main/java/org/teiid/query/processor/relational/DependentCriteriaProcessor.java
===================================================================
--- branches/7.6.x/engine/src/main/java/org/teiid/query/processor/relational/DependentCriteriaProcessor.java 2012-01-18 16:10:12 UTC (rev 3802)
+++ branches/7.6.x/engine/src/main/java/org/teiid/query/processor/relational/DependentCriteriaProcessor.java 2012-01-18 20:04:59 UTC (rev 3803)
@@ -83,6 +83,7 @@
private DependentValueSource dvs;
private List<SetState> dependentSetStates = new LinkedList<SetState>();
private String valueSource;
+ private DependentValueSource originalVs;
public TupleState(String source) {
this.valueSource = source;
@@ -91,7 +92,7 @@
public void sort() throws BlockedException,
TeiidComponentException, TeiidProcessingException {
if (dvs == null) {
- DependentValueSource originalVs = (DependentValueSource)dependentNode.getContext().getVariableContext().getGlobalValue(valueSource);
+ originalVs = (DependentValueSource)dependentNode.getContext().getVariableContext().getGlobalValue(valueSource);
if (!originalVs.isDistinct()) {
if (sortUtility == null) {
List<SingleElementSymbol> sortSymbols = new ArrayList<SingleElementSymbol>(dependentSetStates.size());
@@ -131,7 +132,9 @@
public void close() {
if (dvs != null) {
sortUtility = null;
- dvs.getTupleBuffer().remove();
+ if (dvs != originalVs) {
+ dvs.getTupleBuffer().remove();
+ }
dvs = null;
}
}
@@ -365,6 +368,11 @@
}
hasNextCommand = !restartIndexes.isEmpty();
+ if (hasNextCommand && dependentState.size() > 1) {
+ for (TupleState state : dependentState.values()) {
+ state.originalVs.setUnused(true);
+ }
+ }
}
protected boolean hasNextCommand() {
Modified: branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java
===================================================================
--- branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java 2012-01-18 16:10:12 UTC (rev 3802)
+++ branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java 2012-01-18 20:04:59 UTC (rev 3803)
@@ -45,6 +45,7 @@
import org.teiid.query.sql.lang.Command;
import org.teiid.query.unittest.RealMetadataFactory;
import org.teiid.query.util.CommandContext;
+import org.teiid.translator.ExecutionFactory.NullOrder;
@SuppressWarnings({"unchecked", "nls"})
public class TestDependentJoins {
@@ -847,7 +848,47 @@
//note that the dependent join was performed
assertEquals(4, new HashSet<String>(dataManager.getQueries()).size());
}
+
+ @Test public void testIssue1899() throws Exception {
+ String sql = "SELECT pm1.g1.e1 FROM pm1.g1, pm3.g1 WHERE pm1.g1.e1=pm3.g1.e1"; //$NON-NLS-1$
+ HardcodedDataManager dataManager = new HardcodedDataManager();
+ dataManager.addData("SELECT pm3.g1.e1 FROM pm3.g1 ORDER BY pm3.g1.e1", new List<?>[] {Arrays.asList("a"), Arrays.asList("b"), Arrays.asList("c")});
+ dataManager.addData("SELECT pm1.g1.e1 FROM pm1.g1", new List<?>[] {Arrays.asList("a")});
+
+ TransformationMetadata fakeMetadata = RealMetadataFactory.example4();
+ fakeMetadata.getGroupID("pm1.g1").getAccessPatterns().clear();
+ RealMetadataFactory.setCardinality("pm1.g1", 1000, fakeMetadata);
+ fakeMetadata.getElementID("pm1.g1.e1").setDistinctValues(40);
+ RealMetadataFactory.setCardinality("pm3.g1", 1, fakeMetadata);
+ fakeMetadata.getElementID("pm3.g1.e1").setDistinctValues(1);
+ // Plan query
+ FakeCapabilitiesFinder capFinder = new FakeCapabilitiesFinder();
+ BasicSourceCapabilities depcaps = new BasicSourceCapabilities();
+ depcaps.setCapabilitySupport(Capability.CRITERIA_IN, true);
+ depcaps.setCapabilitySupport(Capability.QUERY_ORDERBY, true);
+ depcaps.setSourceProperty(Capability.QUERY_ORDERBY_DEFAULT_NULL_ORDER, NullOrder.HIGH);
+
+ BasicSourceCapabilities caps = new BasicSourceCapabilities();
+ caps.setCapabilitySupport(Capability.QUERY_ORDERBY, true);
+ caps.setSourceProperty(Capability.QUERY_ORDERBY_DEFAULT_NULL_ORDER, NullOrder.HIGH);
+
+ capFinder.addCapabilities("pm3", caps); //$NON-NLS-1$
+ capFinder.addCapabilities("pm1", depcaps); //$NON-NLS-1$
+
+ List[] expected = new List[] {
+ Arrays.asList(new Object[] {
+ new String("a")})}; //$NON-NLS-1$
+
+ ProcessorPlan plan = TestOptimizer.helpPlan(sql, fakeMetadata, new String[] {
+ "SELECT pm1.g1.e1 FROM pm1.g1 WHERE pm1.g1.e1 IN (<dependent values>)",
+ "SELECT pm3.g1.e1 FROM pm3.g1 ORDER BY pm3.g1.e1"
+ }, capFinder, ComparisonMode.EXACT_COMMAND_STRING);
+
+ // Run query
+ TestProcessor.helpProcess(plan, dataManager, expected);
+ }
+
private FakeDataManager helpTestBackoff(boolean setNdv) throws Exception,
QueryMetadataException, TeiidComponentException,
TeiidProcessingException {
12 years, 11 months
teiid SVN: r3802 - in trunk/build/kits/jboss-as7: docs/teiid/datasources/salesforce/modules and 5 other directories.
by teiid-commits@lists.jboss.org
Author: rareddy
Date: 2012-01-18 11:10:12 -0500 (Wed, 18 Jan 2012)
New Revision: 3802
Added:
trunk/build/kits/jboss-as7/docs/teiid/datasources/salesforce/modules/
trunk/build/kits/jboss-as7/docs/teiid/datasources/salesforce/modules/org/
trunk/build/kits/jboss-as7/docs/teiid/datasources/salesforce/modules/org/springframework/
trunk/build/kits/jboss-as7/docs/teiid/datasources/salesforce/modules/org/springframework/spring/
trunk/build/kits/jboss-as7/docs/teiid/datasources/salesforce/modules/org/springframework/spring/main/
trunk/build/kits/jboss-as7/docs/teiid/datasources/salesforce/modules/org/springframework/spring/main/module.xml
Modified:
trunk/build/kits/jboss-as7/docs/teiid/datasources/salesforce/readme.txt
trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/salesforce/main/module.xml
Log:
TEIID-1720 : correcting the dependencies for salesforce
Added: trunk/build/kits/jboss-as7/docs/teiid/datasources/salesforce/modules/org/springframework/spring/main/module.xml
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/salesforce/modules/org/springframework/spring/main/module.xml (rev 0)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/salesforce/modules/org/springframework/spring/main/module.xml 2012-01-18 16:10:12 UTC (rev 3802)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module xmlns="urn:jboss:module:1.0" name="org.springframework.spring">
+ <resources>
+ <resource-root path="spring-beans.jar"/>
+ <resource-root path="spring-context.jar"/>
+ <resource-root path="spring-core.jar"/>
+ <!--
+ <resource-root path="spring-asm.jar"/>
+ <resource-root path="spring-aop.jar"/>
+ <resource-root path="spring-expression.jar"/>
+ <resource-root path="spring-tx.jar"/>
+ -->
+ </resources>
+ <dependencies>
+ <module name="javax.api"/>
+ </dependencies>
+</module>
\ No newline at end of file
Property changes on: trunk/build/kits/jboss-as7/docs/teiid/datasources/salesforce/modules/org/springframework/spring/main/module.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/salesforce/readme.txt
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/salesforce/readme.txt 2012-01-17 21:27:58 UTC (rev 3801)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/salesforce/readme.txt 2012-01-18 16:10:12 UTC (rev 3802)
@@ -1,3 +1,8 @@
+SalesForce connector requires CXF and SpringFramework to function correctly. The CXF is already installed, however the
+SpringFramework is not. So, you must download the SpringFramework jar files from http://www.springsource.org/download,
+and overlay the "modules" directory in this directory on to modules directory in the JBoss AS, then copy
+the SpringFramework files into "<jboss-as>/modules/org/springframework/spring/main" directory.
+
Option 1:
In Teiid, for Salesforce datasource a JCA connector is provided and deployed at the install time. To create
Modified: trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/salesforce/main/module.xml
===================================================================
--- trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/salesforce/main/module.xml 2012-01-17 21:27:58 UTC (rev 3801)
+++ trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/salesforce/main/module.xml 2012-01-18 16:10:12 UTC (rev 3802)
@@ -11,5 +11,7 @@
<module name="org.jboss.teiid.common-core" />
<module name="org.jboss.teiid.api" />
<module name="org.jboss.teiid.translator.salesforce.api"/>
+ <module name="org.jboss.ws.cxf.jbossws-cxf-client"/>
+ <module name="org.springframework.spring"/>
</dependencies>
</module>
\ No newline at end of file
12 years, 11 months
teiid SVN: r3801 - tags.
by teiid-commits@lists.jboss.org
Author: loleary
Date: 2012-01-17 16:27:58 -0500 (Tue, 17 Jan 2012)
New Revision: 3801
Added:
tags/7.4.2.GA/
Log:
Bug 781155: 7.4.2 tag for revision 3799
12 years, 11 months
teiid SVN: r3800 - tags.
by teiid-commits@lists.jboss.org
Author: loleary
Date: 2012-01-17 16:26:04 -0500 (Tue, 17 Jan 2012)
New Revision: 3800
Removed:
tags/7.4.2.GA/
Log:
Retagging 7.4.2 release
12 years, 11 months
teiid SVN: r3799 - branches/7.4.x/build/kits/jboss-container.
by teiid-commits@lists.jboss.org
Author: loleary
Date: 2012-01-17 16:17:05 -0500 (Tue, 17 Jan 2012)
New Revision: 3799
Modified:
branches/7.4.x/build/kits/jboss-container/teiid-releasenotes.html
Log:
Update of teiid-releasenotes.html for SOA-3656 to include TEIID-1884 for Teiid 7.4.2 tag
Modified: branches/7.4.x/build/kits/jboss-container/teiid-releasenotes.html
===================================================================
--- branches/7.4.x/build/kits/jboss-container/teiid-releasenotes.html 2012-01-17 20:55:06 UTC (rev 3798)
+++ branches/7.4.x/build/kits/jboss-container/teiid-releasenotes.html 2012-01-17 21:17:05 UTC (rev 3799)
@@ -264,6 +264,7 @@
<li>[<a href='https://issues.jboss.org/browse/TEIID-1871'>TEIID-1871</a>] - Teiid is handling MySQL5.0 returning DAYNAME as a blob</li>
<li>[<a href='https://issues.jboss.org/browse/TEIID-1876'>TEIID-1876</a>] - Netezza translator using INTNNOT when it should use INT4NOT</li>
<li>[<a href='https://issues.jboss.org/browse/TEIID-1883'>TEIID-1883</a>] - Query timeout is superceded by synch ttl</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1884'>TEIID-1884</a>] - COMMAND Logging incorrectly reporting END USER COMMAND record count in EDS for forward only resultsets</li>
</ul>
<h4>From 7.4.1</h4>
@@ -565,4 +566,4 @@
information.</p>
</BODY>
-</HTML>
\ No newline at end of file
+</HTML>
12 years, 11 months
teiid SVN: r3798 - branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql.
by teiid-commits@lists.jboss.org
Author: loleary
Date: 2012-01-17 15:55:06 -0500 (Tue, 17 Jan 2012)
New Revision: 3798
Modified:
branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/MySQL5ExecutionFactory.java
Log:
TEIID-1871 adding byte[] type check
Modified: branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/MySQL5ExecutionFactory.java
===================================================================
--- branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/MySQL5ExecutionFactory.java 2012-01-17 19:31:40 UTC (rev 3797)
+++ branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/mysql/MySQL5ExecutionFactory.java 2012-01-17 20:55:06 UTC (rev 3798)
@@ -75,7 +75,7 @@
public Object retrieveValue(ResultSet results, int columnIndex,
Class<?> expectedType) throws SQLException {
Object result = super.retrieveValue(results, columnIndex, expectedType);
- if (expectedType == TypeFacility.RUNTIME_TYPES.STRING && result instanceof Blob) {
+ if (expectedType == TypeFacility.RUNTIME_TYPES.STRING && (result instanceof Blob || result instanceof byte[])) {
return results.getString(columnIndex);
}
return result;
@@ -85,7 +85,7 @@
public Object retrieveValue(CallableStatement results, int parameterIndex,
Class<?> expectedType) throws SQLException {
Object result = super.retrieveValue(results, parameterIndex, expectedType);
- if (expectedType == TypeFacility.RUNTIME_TYPES.STRING && result instanceof Blob) {
+ if (expectedType == TypeFacility.RUNTIME_TYPES.STRING && (result instanceof Blob || result instanceof byte[])) {
return results.getString(parameterIndex);
}
return result;
12 years, 11 months