[teiid-commits] teiid SVN: r2340 - in trunk: build/kits/jboss-container and 4 other directories.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Tue Jul 13 21:59:06 EDT 2010
Author: shawkins
Date: 2010-07-13 21:59:05 -0400 (Tue, 13 Jul 2010)
New Revision: 2340
Modified:
trunk/build/assembly/jboss-container/dist.xml
trunk/build/kits/jboss-container/deploy/teiid/teiid-connector-templates-jboss-beans.xml
trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-portfolio/marketdata-file-ds.xml
trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml
trunk/build/kits/jboss-container/teiid-releasenotes.html
trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java
Log:
TEIID-1143 removing version numbers from connector rars and updating the status checker to consider if the java context is used
Modified: trunk/build/assembly/jboss-container/dist.xml
===================================================================
--- trunk/build/assembly/jboss-container/dist.xml 2010-07-13 21:10:14 UTC (rev 2339)
+++ trunk/build/assembly/jboss-container/dist.xml 2010-07-14 01:59:05 UTC (rev 2340)
@@ -136,15 +136,40 @@
<includeSubModules>true</includeSubModules>
<includes>
+ <include>org.jboss.teiid.connectors:connector-file:rar</include>
+ <include>org.jboss.teiid.connectors:connector-ldap:rar</include>
+ <include>org.jboss.teiid.connectors:connector-salesforce:rar</include>
+ <include>org.jboss.teiid.connectors:connector-ws:rar</include>
+ </includes>
+
+ <binaries>
+ <outputFileNameMapping>teiid-${module.artifactId}.rar</outputFileNameMapping>
+ <includeDependencies>true</includeDependencies>
+ <unpack>false</unpack>
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>true</useProjectArtifact>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ </dependencySet>
+ </dependencySets>
+ <outputDirectory>deploy/teiid/connectors</outputDirectory>
+ <fileMode>0644</fileMode>
+ </binaries>
+
+ </moduleSet>
+
+ <!-- These are built in translators -->
+ <moduleSet>
+ <includeSubModules>true</includeSubModules>
+
+ <includes>
<include>org.jboss.teiid.connectors:translator-jdbc</include>
<include>org.jboss.teiid.connectors:translator-loopback</include>
<include>org.jboss.teiid.connectors:translator-file</include>
- <include>org.jboss.teiid.connectors:connector-file:rar</include>
<include>org.jboss.teiid.connectors:translator-ldap</include>
- <include>org.jboss.teiid.connectors:connector-ldap:rar</include>
<include>org.jboss.teiid.connectors:translator-salesforce</include>
- <include>org.jboss.teiid.connectors:connector-salesforce:rar</include>
- <include>org.jboss.teiid.connectors:connector-ws:rar</include>
<include>org.jboss.teiid.connectors:translator-ws</include>
</includes>
Modified: trunk/build/kits/jboss-container/deploy/teiid/teiid-connector-templates-jboss-beans.xml
===================================================================
--- trunk/build/kits/jboss-container/deploy/teiid/teiid-connector-templates-jboss-beans.xml 2010-07-13 21:10:14 UTC (rev 2339)
+++ trunk/build/kits/jboss-container/deploy/teiid/teiid-connector-templates-jboss-beans.xml 2010-07-14 01:59:05 UTC (rev 2340)
@@ -41,7 +41,7 @@
<parameter class="java.lang.String">connector-ldap</parameter>
<parameter class="java.lang.String">LDAP Connection</parameter>
</constructor>
- <property name="rarName">connector-ldap-${project.version}.rar</property>
+ <property name="rarName">teiid-connector-ldap.rar</property>
</bean>
<bean name="connector-salesforce-${project.version}" class="org.teiid.templates.connector.ConnectorDeploymentTemplate">
@@ -56,7 +56,7 @@
<parameter class="java.lang.String">connector-salesforce</parameter>
<parameter class="java.lang.String">Salesforce Connection</parameter>
</constructor>
- <property name="rarName">connector-salesforce-${project.version}.rar</property>
+ <property name="rarName">teiid-connector-salesforce.rar</property>
</bean>
<bean name="connector-file-${project.version}" class="org.teiid.templates.connector.ConnectorDeploymentTemplate">
@@ -71,7 +71,7 @@
<parameter class="java.lang.String">connector-file</parameter>
<parameter class="java.lang.String">File Connection</parameter>
</constructor>
- <property name="rarName">connector-file-${project.version}.rar</property>
+ <property name="rarName">teiid-connector-file.rar</property>
</bean>
<bean name="connector-ws-${project.version}" class="org.teiid.templates.connector.ConnectorDeploymentTemplate">
@@ -86,7 +86,7 @@
<parameter class="java.lang.String">connector-ws</parameter>
<parameter class="java.lang.String">WS Connection</parameter>
</constructor>
- <property name="rarName">connector-ws-${project.version}.rar</property>
+ <property name="rarName">teiid-connector-ws.rar</property>
</bean>
</deployment>
Modified: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-portfolio/marketdata-file-ds.xml
===================================================================
--- trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-portfolio/marketdata-file-ds.xml 2010-07-13 21:10:14 UTC (rev 2339)
+++ trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-portfolio/marketdata-file-ds.xml 2010-07-14 01:59:05 UTC (rev 2340)
@@ -4,7 +4,7 @@
<no-tx-connection-factory>
<jndi-name>marketdata-file</jndi-name>
- <rar-name>connector-file-${project.version}.rar</rar-name>
+ <rar-name>teiid-connector-file.rar</rar-name>
<connection-definition>javax.resource.cci.ConnectionFactory</connection-definition>
<!--
All the available properties for this connector are defined inside the "ra.xml" defined inside the rar
Modified: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml
===================================================================
--- trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml 2010-07-13 21:10:14 UTC (rev 2339)
+++ trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml 2010-07-14 01:59:05 UTC (rev 2340)
@@ -4,7 +4,7 @@
<no-tx-connection-factory>
<jndi-name>WeatherDS</jndi-name>
- <rar-name>connector-ws-${project.version}.rar</rar-name>
+ <rar-name>teiid-connector-ws.rar</rar-name>
<connection-definition>javax.resource.cci.ConnectionFactory</connection-definition>
<config-property name="EndPoint">http://www.weather.gov/forecasts/xml/sample_products/browser_interface/ndfdXMLclient.php</config-property>
Modified: trunk/build/kits/jboss-container/teiid-releasenotes.html
===================================================================
--- trunk/build/kits/jboss-container/teiid-releasenotes.html 2010-07-13 21:10:14 UTC (rev 2339)
+++ trunk/build/kits/jboss-container/teiid-releasenotes.html 2010-07-14 01:59:05 UTC (rev 2340)
@@ -66,6 +66,10 @@
<h2><a name="Configuration">Configuration Issues</a></h2>
See the See the <a href="teiid-docs/teiid_admin_guide.pdf">Admin Guide</a> for more on configuration and installation.
+<h4>from 7.0</h4>
+<ul>
+ <li>Rar file names no longer contain version numbers. -ds.xml files should be updated from connector-XXX-version.rar to teiid-connector-XXX.rar
+<ul>
<h4>from 6.2</h4>
<ul>
@@ -76,7 +80,7 @@
<h2><a name="Other">Other Issues</a></h2>
<ul>
- <li>For compatability with the 7.0 release if a stored procedure parameter list begins with identifier=, then it will be parsed as a named parameter invocation even if the intent was to use a comparison predicate
+ <li>For compatibility with the 7.0 release if a stored procedure parameter list begins with identifier=, then it will be parsed as a named parameter invocation even if the intent was to use a comparison predicate
as the first parameter value. The workaround is to use nesting parens, e.g. call proc((identifier=value), ...), which clarifies that this is positional value. This workaround will not be needed in later releases.
</ul>
<h4>from 7.0</h4>
Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java 2010-07-13 21:10:14 UTC (rev 2339)
+++ trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java 2010-07-14 01:59:05 UTC (rev 2340)
@@ -33,6 +33,7 @@
public class VDBStatusChecker {
+ private static final String JAVA_CONTEXT = "java:"; //$NON-NLS-1$
private VDBRepository vdbRepository;
private ConnectorManagerRepository connectorManagerRepository;
@@ -45,10 +46,16 @@
}
public void dataSourceAdded(String dataSourceName) {
+ if (dataSourceName.startsWith(JAVA_CONTEXT)) {
+ dataSourceName = dataSourceName.substring(5);
+ }
resourceAdded(dataSourceName, false);
}
public void dataSourceRemoved(String dataSourceName) {
+ if (dataSourceName.startsWith(JAVA_CONTEXT)) {
+ dataSourceName = dataSourceName.substring(5);
+ }
resourceremoved(dataSourceName, false);
}
@@ -129,12 +136,19 @@
private String getSourceName(String translatorName, ModelMetaData model, boolean translator) {
for (String sourceName:model.getSourceNames()) {
- if (translator && translatorName.equals(model.getSourceTranslatorName(sourceName))) {
- return sourceName;
+ if (translator) {
+ if (translatorName.equals(model.getSourceTranslatorName(sourceName))) {
+ return sourceName;
+ }
+ } else {
+ String jndiName = model.getSourceConnectionJndiName(sourceName);
+ if (jndiName.startsWith(JAVA_CONTEXT)) {
+ jndiName = jndiName.substring(5);
+ }
+ if (translatorName.equals(jndiName)) {
+ return sourceName;
+ }
}
- else if (translatorName.equals(model.getSourceConnectionJndiName(sourceName))) {
- return sourceName;
- }
}
return null;
}
More information about the teiid-commits
mailing list