Author: rareddy Date: 2010-02-24 17:49:00 -0500 (Wed, 24 Feb 2010) New Revision: 1873 Added: branches/JCA/build/kit-jboss-container/deploy/teiid/teiid-connector-templates-jboss-beans.xml Modified: branches/JCA/build/assembly/jboss-container/dist.xml branches/JCA/build/kit-jboss-container/deploy/teiid/teiid-jboss-beans.xml branches/JCA/build/pom.xml branches/JCA/client/src/main/java/org/teiid/adminapi/AdminFactory.java Log: TEIID-833: adding the XML connectors to deployment profile and also moved the connector types to a different xml file Modified: branches/JCA/build/assembly/jboss-container/dist.xml =================================================================== --- branches/JCA/build/assembly/jboss-container/dist.xml 2010-02-24 21:14:30 UTC (rev 1872) +++ branches/JCA/build/assembly/jboss-container/dist.xml 2010-02-24 22:49:00 UTC (rev 1873) @@ -13,7 +13,7 @@ <fileSets> <fileSet> - <directory>build/kit-jboss-container</directory> + <directory>build/target/kit-jboss-container</directory> <outputDirectory>/</outputDirectory> </fileSet> @@ -75,9 +75,7 @@ <include>org.jboss.teiid.connectors:connector-text: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-xml-file:rar</include> <include>org.jboss.teiid.connectors:connector-xml-http:rar</include> - <include>org.jboss.teiid.connectors:connector-xml-soap:rar</include> <include>org.jboss.teiid.connectors:connector-xmlsource-file:rar</include> <include>org.jboss.teiid.connectors:connector-xmlsource-soap:rar</include> </includes> Added: branches/JCA/build/kit-jboss-container/deploy/teiid/teiid-connector-templates-jboss-beans.xml =================================================================== --- branches/JCA/build/kit-jboss-container/deploy/teiid/teiid-connector-templates-jboss-beans.xml (rev 0) +++ branches/JCA/build/kit-jboss-container/deploy/teiid/teiid-connector-templates-jboss-beans.xml 2010-02-24 22:49:00 UTC (rev 1873) @@ -0,0 +1,116 @@ +<?xml version="1.0" encoding="UTF-8"?> +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + <!-- This file defines the connector templates for Teiid based connectors --> + <bean name="connector-jdbc-${project.version}" class="org.teiid.templates.connector.ConnectorTypeTemplate"> + <property name="info"><inject bean="connector-jdbc-templateinfo"/></property> + <property name="targetTemplate"><inject bean="NoTxConnectionFactoryTemplate"/></property> + </bean> + <bean name="connector-jdbc-templateinfo" class="org.teiid.templates.connector.ConnectorTypeTemplateInfo"> + <constructor factoryMethod="createTemplateInfo"> + <factory bean="DSDeploymentTemplateInfoFactory"/> + <parameter class="java.lang.Class">org.teiid.templates.connector.ConnectorTypeTemplateInfo</parameter> + <parameter class="java.lang.Class">org.jboss.resource.metadata.mcf.NoTxConnectionFactoryDeploymentMetaData</parameter> + <parameter class="java.lang.String">connector-jdbc-${project.version}</parameter> + <parameter class="java.lang.String">Teiid JDBC Connector</parameter> + </constructor> + </bean> + + <bean name="connector-ldap-${project.version}" class="org.teiid.templates.connector.ConnectorTypeTemplate"> + <property name="info"><inject bean="connector-ldap-templateinfo"/></property> + <property name="targetTemplate"><inject bean="NoTxConnectionFactoryTemplate"/></property> + </bean> + <bean name="connector-ldap-templateinfo" class="org.teiid.templates.connector.ConnectorTypeTemplateInfo"> + <constructor factoryMethod="createTemplateInfo"> + <factory bean="DSDeploymentTemplateInfoFactory"/> + <parameter class="java.lang.Class">org.teiid.templates.connector.ConnectorTypeTemplateInfo</parameter> + <parameter class="java.lang.Class">org.jboss.resource.metadata.mcf.NoTxConnectionFactoryDeploymentMetaData</parameter> + <parameter class="java.lang.String">connector-ldap-${project.version}</parameter> + <parameter class="java.lang.String">Teiid LDAP Connector</parameter> + </constructor> + </bean> + + <bean name="connector-loopback-${project.version}" class="org.teiid.templates.connector.ConnectorTypeTemplate"> + <property name="info"><inject bean="connector-loopback-templateinfo"/></property> + <property name="targetTemplate"><inject bean="NoTxConnectionFactoryTemplate"/></property> + </bean> + <bean name="connector-loopback-templateinfo" class="org.teiid.templates.connector.ConnectorTypeTemplateInfo"> + <constructor factoryMethod="createTemplateInfo"> + <factory bean="DSDeploymentTemplateInfoFactory"/> + <parameter class="java.lang.Class">org.teiid.templates.connector.ConnectorTypeTemplateInfo</parameter> + <parameter class="java.lang.Class">org.jboss.resource.metadata.mcf.NoTxConnectionFactoryDeploymentMetaData</parameter> + <parameter class="java.lang.String">connector-loopback-${project.version}</parameter> + <parameter class="java.lang.String">Teiid Loopback Connector</parameter> + </constructor> + </bean> + + <bean name="connector-salesforce-${project.version}" class="org.teiid.templates.connector.ConnectorTypeTemplate"> + <property name="info"><inject bean="connector-salesforce-templateinfo"/></property> + <property name="targetTemplate"><inject bean="NoTxConnectionFactoryTemplate"/></property> + </bean> + <bean name="connector-salesforce-templateinfo" class="org.teiid.templates.connector.ConnectorTypeTemplateInfo"> + <constructor factoryMethod="createTemplateInfo"> + <factory bean="DSDeploymentTemplateInfoFactory"/> + <parameter class="java.lang.Class">org.teiid.templates.connector.ConnectorTypeTemplateInfo</parameter> + <parameter class="java.lang.Class">org.jboss.resource.metadata.mcf.NoTxConnectionFactoryDeploymentMetaData</parameter> + <parameter class="java.lang.String">connector-salesforce-${project.version}</parameter> + <parameter class="java.lang.String">Teiid Salesforce Connector</parameter> + </constructor> + </bean> + + <bean name="connector-text-${project.version}" class="org.teiid.templates.connector.ConnectorTypeTemplate"> + <property name="info"><inject bean="connector-text-templateinfo"/></property> + <property name="targetTemplate"><inject bean="NoTxConnectionFactoryTemplate"/></property> + </bean> + <bean name="connector-text-templateinfo" class="org.teiid.templates.connector.ConnectorTypeTemplateInfo"> + <constructor factoryMethod="createTemplateInfo"> + <factory bean="DSDeploymentTemplateInfoFactory"/> + <parameter class="java.lang.Class">org.teiid.templates.connector.ConnectorTypeTemplateInfo</parameter> + <parameter class="java.lang.Class">org.jboss.resource.metadata.mcf.NoTxConnectionFactoryDeploymentMetaData</parameter> + <parameter class="java.lang.String">connector-text-${project.version}</parameter> + <parameter class="java.lang.String">Teiid Text Connector</parameter> + </constructor> + </bean> + + <bean name="connector-xmlsource-file-${project.version}" class="org.teiid.templates.connector.ConnectorTypeTemplate"> + <property name="info"><inject bean="connector-xmlsource-file-templateinfo"/></property> + <property name="targetTemplate"><inject bean="NoTxConnectionFactoryTemplate"/></property> + </bean> + <bean name="connector-xmlsource-file-templateinfo" class="org.teiid.templates.connector.ConnectorTypeTemplateInfo"> + <constructor factoryMethod="createTemplateInfo"> + <factory bean="DSDeploymentTemplateInfoFactory"/> + <parameter class="java.lang.Class">org.teiid.templates.connector.ConnectorTypeTemplateInfo</parameter> + <parameter class="java.lang.Class">org.jboss.resource.metadata.mcf.NoTxConnectionFactoryDeploymentMetaData</parameter> + <parameter class="java.lang.String">connector-xmlsource-file-${project.version}</parameter> + <parameter class="java.lang.String">Teiid XML File Connector</parameter> + </constructor> + </bean> + + <bean name="connector-xmlsource-soap-${project.version}" class="org.teiid.templates.connector.ConnectorTypeTemplate"> + <property name="info"><inject bean="connector-xmlsource-soap-templateinfo"/></property> + <property name="targetTemplate"><inject bean="NoTxConnectionFactoryTemplate"/></property> + </bean> + <bean name="connector-xmlsource-soap-templateinfo" class="org.teiid.templates.connector.ConnectorTypeTemplateInfo"> + <constructor factoryMethod="createTemplateInfo"> + <factory bean="DSDeploymentTemplateInfoFactory"/> + <parameter class="java.lang.Class">org.teiid.templates.connector.ConnectorTypeTemplateInfo</parameter> + <parameter class="java.lang.Class">org.jboss.resource.metadata.mcf.NoTxConnectionFactoryDeploymentMetaData</parameter> + <parameter class="java.lang.String">connector-xmlsource-soap-${project.version}</parameter> + <parameter class="java.lang.String">Teiid XML SOAP Connector</parameter> + </constructor> + </bean> + + <bean name="connector-xml-http-${project.version}" class="org.teiid.templates.connector.ConnectorTypeTemplate"> + <property name="info"><inject bean="connector-xml-http-templateinfo"/></property> + <property name="targetTemplate"><inject bean="NoTxConnectionFactoryTemplate"/></property> + </bean> + <bean name="connector-xml-http-templateinfo" class="org.teiid.templates.connector.ConnectorTypeTemplateInfo"> + <constructor factoryMethod="createTemplateInfo"> + <factory bean="DSDeploymentTemplateInfoFactory"/> + <parameter class="java.lang.Class">org.teiid.templates.connector.ConnectorTypeTemplateInfo</parameter> + <parameter class="java.lang.Class">org.jboss.resource.metadata.mcf.NoTxConnectionFactoryDeploymentMetaData</parameter> + <parameter class="java.lang.String">connector-xml-http-${project.version}</parameter> + <parameter class="java.lang.String">Teiid XML HTTP Connector</parameter> + </constructor> + </bean> + +</deployment> Property changes on: branches/JCA/build/kit-jboss-container/deploy/teiid/teiid-connector-templates-jboss-beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/JCA/build/kit-jboss-container/deploy/teiid/teiid-jboss-beans.xml =================================================================== --- branches/JCA/build/kit-jboss-container/deploy/teiid/teiid-jboss-beans.xml 2010-02-24 21:14:30 UTC (rev 1872) +++ branches/JCA/build/kit-jboss-container/deploy/teiid/teiid-jboss-beans.xml 2010-02-24 22:49:00 UTC (rev 1873) @@ -160,75 +160,5 @@ </login-module> </authentication> </application-policy> - - <!-- Connector Types --> - <bean name="connector-jdbc-7.0.0-SNAPSHOT" class="org.teiid.templates.connector.ConnectorTypeTemplate"> - <property name="info"><inject bean="connector-jdbc-templateinfo"/></property> - <property name="targetTemplate"><inject bean="NoTxConnectionFactoryTemplate"/></property> - </bean> - <bean name="connector-jdbc-templateinfo" class="org.teiid.templates.connector.ConnectorTypeTemplateInfo"> - <constructor factoryMethod="createTemplateInfo"> - <factory bean="DSDeploymentTemplateInfoFactory"/> - <parameter class="java.lang.Class">org.teiid.templates.connector.ConnectorTypeTemplateInfo</parameter> - <parameter class="java.lang.Class">org.jboss.resource.metadata.mcf.NoTxConnectionFactoryDeploymentMetaData</parameter> - <parameter class="java.lang.String">connector-jdbc-7.0.0-SNAPSHOT</parameter> - <parameter class="java.lang.String">Teiid JDBC Connector</parameter> - </constructor> - </bean> - - <bean name="connector-ldap-7.0.0-SNAPSHOT" class="org.teiid.templates.connector.ConnectorTypeTemplate"> - <property name="info"><inject bean="connector-ldap-templateinfo"/></property> - <property name="targetTemplate"><inject bean="NoTxConnectionFactoryTemplate"/></property> - </bean> - <bean name="connector-ldap-templateinfo" class="org.teiid.templates.connector.ConnectorTypeTemplateInfo"> - <constructor factoryMethod="createTemplateInfo"> - <factory bean="DSDeploymentTemplateInfoFactory"/> - <parameter class="java.lang.Class">org.teiid.templates.connector.ConnectorTypeTemplateInfo</parameter> - <parameter class="java.lang.Class">org.jboss.resource.metadata.mcf.NoTxConnectionFactoryDeploymentMetaData</parameter> - <parameter class="java.lang.String">connector-ldap-7.0.0-SNAPSHOT</parameter> - <parameter class="java.lang.String">Teiid LDAP Connector</parameter> - </constructor> - </bean> - - <bean name="connector-loopback-7.0.0-SNAPSHOT" class="org.teiid.templates.connector.ConnectorTypeTemplate"> - <property name="info"><inject bean="connector-loopback-templateinfo"/></property> - <property name="targetTemplate"><inject bean="NoTxConnectionFactoryTemplate"/></property> - </bean> - <bean name="connector-loopback-templateinfo" class="org.teiid.templates.connector.ConnectorTypeTemplateInfo"> - <constructor factoryMethod="createTemplateInfo"> - <factory bean="DSDeploymentTemplateInfoFactory"/> - <parameter class="java.lang.Class">org.teiid.templates.connector.ConnectorTypeTemplateInfo</parameter> - <parameter class="java.lang.Class">org.jboss.resource.metadata.mcf.NoTxConnectionFactoryDeploymentMetaData</parameter> - <parameter class="java.lang.String">connector-loopback-7.0.0-SNAPSHOT</parameter> - <parameter class="java.lang.String">Teiid Loopback Connector</parameter> - </constructor> - </bean> - - <bean name="connector-salesforce-7.0.0-SNAPSHOT" class="org.teiid.templates.connector.ConnectorTypeTemplate"> - <property name="info"><inject bean="connector-salesforce-templateinfo"/></property> - <property name="targetTemplate"><inject bean="NoTxConnectionFactoryTemplate"/></property> - </bean> - <bean name="connector-salesforce-templateinfo" class="org.teiid.templates.connector.ConnectorTypeTemplateInfo"> - <constructor factoryMethod="createTemplateInfo"> - <factory bean="DSDeploymentTemplateInfoFactory"/> - <parameter class="java.lang.Class">org.teiid.templates.connector.ConnectorTypeTemplateInfo</parameter> - <parameter class="java.lang.Class">org.jboss.resource.metadata.mcf.NoTxConnectionFactoryDeploymentMetaData</parameter> - <parameter class="java.lang.String">connector-salesforce-7.0.0-SNAPSHOT</parameter> - <parameter class="java.lang.String">Teiid Salesforce Connector</parameter> - </constructor> - </bean> - - <bean name="connector-text-7.0.0-SNAPSHOT" class="org.teiid.templates.connector.ConnectorTypeTemplate"> - <property name="info"><inject bean="connector-text-templateinfo"/></property> - <property name="targetTemplate"><inject bean="NoTxConnectionFactoryTemplate"/></property> - </bean> - <bean name="connector-text-templateinfo" class="org.teiid.templates.connector.ConnectorTypeTemplateInfo"> - <constructor factoryMethod="createTemplateInfo"> - <factory bean="DSDeploymentTemplateInfoFactory"/> - <parameter class="java.lang.Class">org.teiid.templates.connector.ConnectorTypeTemplateInfo</parameter> - <parameter class="java.lang.Class">org.jboss.resource.metadata.mcf.NoTxConnectionFactoryDeploymentMetaData</parameter> - <parameter class="java.lang.String">connector-text-7.0.0-SNAPSHOT</parameter> - <parameter class="java.lang.String">Teiid Text Connector</parameter> - </constructor> - </bean> + </deployment> Modified: branches/JCA/build/pom.xml =================================================================== --- branches/JCA/build/pom.xml 2010-02-24 21:14:30 UTC (rev 1872) +++ branches/JCA/build/pom.xml 2010-02-24 22:49:00 UTC (rev 1873) @@ -7,113 +7,25 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>build</artifactId> - <packaging>pom</packaging> <name>Build</name> <description>Teiid Build</description> - <!-- <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>package</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-connector-api</artifactId> - <version>${pom.version}</version> - <classifier>bundle</classifier> - <type>zip</type> - <overWrite>true</overWrite> - </artifactItem> - <artifactItem> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>connector-xml</artifactId> - <version>${pom.version}</version> - <classifier>bundle</classifier> - <type>zip</type> - <overWrite>true</overWrite> - </artifactItem> - <artifactItem> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>connector-xml-common</artifactId> - <version>${pom.version}</version> - <classifier>bundle</classifier> - <type>zip</type> - <overWrite>true</overWrite> - </artifactItem> - <artifactItem> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>connector-jdbc</artifactId> - <version>${pom.version}</version> - <classifier>bundle</classifier> - <type>zip</type> - <overWrite>true</overWrite> - </artifactItem> - <artifactItem> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>connector-text</artifactId> - <version>${pom.version}</version> - <classifier>bundle</classifier> - <type>zip</type> - <overWrite>true</overWrite> - </artifactItem> - <artifactItem> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>connector-ldap</artifactId> - <version>${pom.version}</version> - <classifier>bundle</classifier> - <type>zip</type> - <overWrite>true</overWrite> - </artifactItem> - <artifactItem> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>connector-loopback</artifactId> - <version>${pom.version}</version> - <classifier>bundle</classifier> - <type>zip</type> - <overWrite>true</overWrite> - </artifactItem> - <artifactItem> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>connector-salesforce</artifactId> - <version>${pom.version}</version> - <classifier>bundle</classifier> - <type>zip</type> - <overWrite>true</overWrite> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>assemble-artifacts</id> - <phase>package</phase> - <configuration> - <tasks> - <ant antfile="assembly/runtime/build-configuration.xml" /> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> + <outputDirectory>target/kit-jboss-container</outputDirectory> + <resources> + <resource> + <directory>kit-jboss-container</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + </includes> + </resource> + <resource> + <directory>kit-jboss-container</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + </excludes> + </resource> + </resources> </build> - --> </project> \ No newline at end of file Modified: branches/JCA/client/src/main/java/org/teiid/adminapi/AdminFactory.java =================================================================== --- branches/JCA/client/src/main/java/org/teiid/adminapi/AdminFactory.java 2010-02-24 21:14:30 UTC (rev 1872) +++ branches/JCA/client/src/main/java/org/teiid/adminapi/AdminFactory.java 2010-02-24 22:49:00 UTC (rev 1873) @@ -77,7 +77,7 @@ try { registry = serverConnectionFactory.getConnection(p); } catch (ConnectionException e) { - throw new AdminComponentException(e.getMessage()); + throw new AdminComponentException(e); } target = registry.getService(Admin.class); return target; @@ -234,9 +234,9 @@ Admin serverAdmin = (Admin)Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[] { Admin.class }, new ReconnectingProxy(p)); return serverAdmin; } catch (ConnectionException e) { - throw new AdminComponentException(e.getMessage()); + throw new AdminComponentException(e); } catch (CommunicationException e) { - throw new AdminComponentException(e.getMessage()); + throw new AdminComponentException(e); } }