Author: rareddy Date: 2009-03-12 19:03:44 -0400 (Thu, 12 Mar 2009) New Revision: 554 Modified: trunk/connector-api/pom.xml trunk/connectors/connector-jdbc/pom.xml trunk/connectors/connector-jdbc/src/assembly/bundle.xml trunk/connectors/connector-jdbc/src/main/resources/connector-jdbc.xml trunk/connectors/connector-ldap/pom.xml trunk/connectors/connector-ldap/src/assembly/bundle.xml trunk/connectors/connector-ldap/src/main/resources/connector-ldap.xml trunk/connectors/connector-loopback/pom.xml trunk/connectors/connector-loopback/src/assembly/bundle.xml trunk/connectors/connector-loopback/src/main/resources/connector-loopback.xml trunk/connectors/connector-salesforce/pom.xml trunk/connectors/connector-salesforce/src/assembly/bundle.xml trunk/connectors/connector-salesforce/src/main/resources/connector-salesforce.xml trunk/connectors/connector-text/pom.xml trunk/connectors/connector-text/src/assembly/bundle.xml trunk/connectors/connector-text/src/main/resources/connector-text.xml trunk/connectors/connector-xml/pom.xml trunk/connectors/connector-xml/src/assembly/bundle.xml trunk/connectors/connector-xml/src/main/resources/connector-xml.xml trunk/connectors/pom.xml Log: TEIID-413: classpath for the connectors will be computed based upon the dependencies defined for the connector, and then it will be inserted into the CDK xml fragment, which will be included with the connector artifact zip. Modified: trunk/connector-api/pom.xml =================================================================== --- trunk/connector-api/pom.xml 2009-03-12 22:21:46 UTC (rev 553) +++ trunk/connector-api/pom.xml 2009-03-12 23:03:44 UTC (rev 554) @@ -22,17 +22,14 @@ <groupId>org.jboss.teiid</groupId> <artifactId>teiid-common-core</artifactId> <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.teiid</groupId> <artifactId>teiid-common-internal</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-internal</artifactId> <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> Modified: trunk/connectors/connector-jdbc/pom.xml =================================================================== --- trunk/connectors/connector-jdbc/pom.xml 2009-03-12 22:21:46 UTC (rev 553) +++ trunk/connectors/connector-jdbc/pom.xml 2009-03-12 23:03:44 UTC (rev 554) @@ -12,30 +12,92 @@ <name>JDBC Connector</name> <description>This project contains connectors for a JDBC source. Currently this is an aggregator for all the JDBC connectors relational databases.</description> - <!-- bundles all its dependencies in a single zip file --> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-2</version> - <configuration> - <descriptors> - <descriptor>src/assembly/bundle.xml</descriptor> - </descriptors> - <outputDirectory>target/distribution</outputDirectory> - <workDirectory>target/assembly/work</workDirectory> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>attached</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-connector-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <!-- This build portion is identical for all the connectors that are deployed; so when making changes make sure + it applies to all the connectors. This below block computes the classpath, writes to classpath.properties; it replaces + classpath in the xml file, then bundles current project and its dependencies and xml file in a zip for deployment--> + <build> + <plugins> + <!-- build class path --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>build-classpath</id> + <phase>generate-sources</phase> + <goals> + <goal>build-classpath</goal> + </goals> + <configuration> + <fileSeparator>:</fileSeparator> + <pathSeparator>;</pathSeparator> + <prefix>extension</prefix> + <excludeTransitive>false</excludeTransitive> + <includeScope>runtime</includeScope> + <excludeTypes>pom</excludeTypes> + <outputFile>target/classpath.properties</outputFile> + <regenerateFile>true</regenerateFile> + <outputFilterFile>true</outputFilterFile> + </configuration> + </execution> + </executions> + </plugin> + + <!-- bundles all its dependencies in a single zip file --> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-2</version> + <configuration> + <descriptors> + <descriptor>src/assembly/bundle.xml</descriptor> + </descriptors> + <outputDirectory>target/distribution</outputDirectory> + <workDirectory>target/assembly/work</workDirectory> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>attached</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + <!-- replaces the classpath tokens in the xml file --> + <filters> + <filter>target/classpath.properties</filter> + </filters> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + </excludes> + </resource> + </resources> + </build> </project> \ No newline at end of file Modified: trunk/connectors/connector-jdbc/src/assembly/bundle.xml =================================================================== --- trunk/connectors/connector-jdbc/src/assembly/bundle.xml 2009-03-12 22:21:46 UTC (rev 553) +++ trunk/connectors/connector-jdbc/src/assembly/bundle.xml 2009-03-12 23:03:44 UTC (rev 554) @@ -11,7 +11,7 @@ <fileSets> <fileSet> - <directory>src/main/resources</directory> + <directory>target/classes</directory> <includes><include>${project.artifactId}.xml</include></includes> <outputDirectory>/</outputDirectory> </fileSet> Modified: trunk/connectors/connector-jdbc/src/main/resources/connector-jdbc.xml =================================================================== --- trunk/connectors/connector-jdbc/src/main/resources/connector-jdbc.xml 2009-03-12 22:21:46 UTC (rev 553) +++ trunk/connectors/connector-jdbc/src/main/resources/connector-jdbc.xml 2009-03-12 23:03:44 UTC (rev 554) @@ -1,5 +1,5 @@ <ComponentType Name="JDBC Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.952-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.952-06:00"> - <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:connector_patch.jar;extensionjar:jdbcconn.jar" Multiplicity="1" IsPreferred="true" /> + <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:connector_patch.jar;extensionjar:${project.artifactId}.${project.version}.jar;${classpath}" Multiplicity="1" IsPreferred="true" /> <PropertyDefinition Name="UseBindVariables" DisplayName="Use prepared statements and bind variables" ShortDescription="" DefaultValue="false" PropertyType="Boolean" IsExpert="true" /> <PropertyDefinition Name="Standard" DisplayName="Standard Type" ShortDescription="Standard Built-in Connector Type" DefaultValue="true" PropertyType="Boolean" IsExpert="true" IsModifiable="false" /> <PropertyDefinition Name="ExtensionCapabilityClass" DisplayName="Extension Capability Class" ShortDescription="" IsExpert="true" /> Modified: trunk/connectors/connector-ldap/pom.xml =================================================================== --- trunk/connectors/connector-ldap/pom.xml 2009-03-12 22:21:46 UTC (rev 553) +++ trunk/connectors/connector-ldap/pom.xml 2009-03-12 23:03:44 UTC (rev 554) @@ -8,30 +8,93 @@ <artifactId>connector-ldap</artifactId> <name>LDAP Connector</name> <description>LDAP Connector</description> - - <!-- bundles all its dependencies in a single zip file --> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-2</version> - <configuration> - <descriptors> - <descriptor>src/assembly/bundle.xml</descriptor> - </descriptors> - <outputDirectory>target/distribution</outputDirectory> - <workDirectory>target/assembly/work</workDirectory> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>attached</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-connector-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <!-- This build portion is identical for all the connectors that are deployed; so when making changes make sure + it applies to all the connectors. This below block computes the classpath, writes to classpath.properties; it replaces + classpath in the xml file, then bundles current project and its dependencies and xml file in a zip for deployment--> + <build> + <plugins> + <!-- build class path --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>build-classpath</id> + <phase>generate-sources</phase> + <goals> + <goal>build-classpath</goal> + </goals> + <configuration> + <fileSeparator>:</fileSeparator> + <pathSeparator>;</pathSeparator> + <prefix>extension</prefix> + <excludeTransitive>false</excludeTransitive> + <includeScope>runtime</includeScope> + <excludeTypes>pom</excludeTypes> + <outputFile>target/classpath.properties</outputFile> + <regenerateFile>true</regenerateFile> + <outputFilterFile>true</outputFilterFile> + </configuration> + </execution> + </executions> + </plugin> + + <!-- bundles all its dependencies in a single zip file --> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-2</version> + <configuration> + <descriptors> + <descriptor>src/assembly/bundle.xml</descriptor> + </descriptors> + <outputDirectory>target/distribution</outputDirectory> + <workDirectory>target/assembly/work</workDirectory> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>attached</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + <!-- replaces the classpath tokens in the xml file --> + <filters> + <filter>target/classpath.properties</filter> + </filters> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + </excludes> + </resource> + </resources> + + </build> </project> \ No newline at end of file Modified: trunk/connectors/connector-ldap/src/assembly/bundle.xml =================================================================== --- trunk/connectors/connector-ldap/src/assembly/bundle.xml 2009-03-12 22:21:46 UTC (rev 553) +++ trunk/connectors/connector-ldap/src/assembly/bundle.xml 2009-03-12 23:03:44 UTC (rev 554) @@ -11,7 +11,7 @@ <fileSets> <fileSet> - <directory>src/main/resources</directory> + <directory>target/classes</directory> <includes><include>${project.artifactId}.xml</include></includes> <outputDirectory>/</outputDirectory> </fileSet> Modified: trunk/connectors/connector-ldap/src/main/resources/connector-ldap.xml =================================================================== --- trunk/connectors/connector-ldap/src/main/resources/connector-ldap.xml 2009-03-12 22:21:46 UTC (rev 553) +++ trunk/connectors/connector-ldap/src/main/resources/connector-ldap.xml 2009-03-12 23:03:44 UTC (rev 554) @@ -1,5 +1,5 @@ <ComponentType Name="LDAP Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.946-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.946-06:00"> - <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:connector_patch.jar;extensionjar:ldapconn.jar" Multiplicity="1" /> + <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:connector_patch.jar;extensionjar:${project.artifactId}.${project.version}.jar;${classpath}" Multiplicity="1" /> <PropertyDefinition Name="SearchDefaultBaseDN" DisplayName="Default Search Base DN" ShortDescription="Default Base DN for LDAP Searches" IsExpert="true" /> <PropertyDefinition Name="com.metamatrix.data.pool.cleaning_interval" DisplayName="Pool cleaning Interval (seconds)" ShortDescription="Set the interval to cleaning the pool" DefaultValue="300" PropertyType="Integer" IsExpert="true" /> <PropertyDefinition Name="LdapAdminUserDN" DisplayName="Ldap Admin User DN" ShortDescription="User DN for the LDAP admin account." DefaultValue="cn=&lt;&gt;,ou=&lt;&gt;,dc=&lt;&gt;" Multiplicity="1" IsPreferred="true" /> Modified: trunk/connectors/connector-loopback/pom.xml =================================================================== --- trunk/connectors/connector-loopback/pom.xml 2009-03-12 22:21:46 UTC (rev 553) +++ trunk/connectors/connector-loopback/pom.xml 2009-03-12 23:03:44 UTC (rev 554) @@ -11,31 +11,93 @@ <artifactId>connector-loopback</artifactId> <name>Loopback Connector</name> <description>Loopback Connector</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-connector-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> - <!-- bundles all its dependencies in a single zip file --> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-2</version> - <configuration> - <descriptors> - <descriptor>src/assembly/bundle.xml</descriptor> - </descriptors> - <outputDirectory>target/distribution</outputDirectory> - <workDirectory>target/assembly/work</workDirectory> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>attached</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + + <!-- This build portion is identical for all the connectors that are deployed; so when making changes make sure + it applies to all the connectors. This below block computes the classpath, writes to classpath.properties; it replaces + classpath in the xml file, then bundles current project and its dependencies and xml file in a zip for deployment--> + <build> + <plugins> + <!-- build class path --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>build-classpath</id> + <phase>generate-sources</phase> + <goals> + <goal>build-classpath</goal> + </goals> + <configuration> + <fileSeparator>:</fileSeparator> + <pathSeparator>;</pathSeparator> + <prefix>extension</prefix> + <excludeTransitive>false</excludeTransitive> + <includeScope>runtime</includeScope> + <excludeTypes>pom</excludeTypes> + <outputFile>target/classpath.properties</outputFile> + <regenerateFile>true</regenerateFile> + <outputFilterFile>true</outputFilterFile> + </configuration> + </execution> + </executions> + </plugin> + + <!-- bundles all its dependencies in a single zip file --> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-2</version> + <configuration> + <descriptors> + <descriptor>src/assembly/bundle.xml</descriptor> + </descriptors> + <outputDirectory>target/distribution</outputDirectory> + <workDirectory>target/assembly/work</workDirectory> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>attached</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + <!-- replaces the classpath tokens in the xml file --> + <filters> + <filter>target/classpath.properties</filter> + </filters> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + </excludes> + </resource> + </resources> + </build> </project> \ No newline at end of file Modified: trunk/connectors/connector-loopback/src/assembly/bundle.xml =================================================================== --- trunk/connectors/connector-loopback/src/assembly/bundle.xml 2009-03-12 22:21:46 UTC (rev 553) +++ trunk/connectors/connector-loopback/src/assembly/bundle.xml 2009-03-12 23:03:44 UTC (rev 554) @@ -11,7 +11,7 @@ <fileSets> <fileSet> - <directory>src/main/resources</directory> + <directory>target/classes</directory> <includes><include>${project.artifactId}.xml</include></includes> <outputDirectory>/</outputDirectory> </fileSet> Modified: trunk/connectors/connector-loopback/src/main/resources/connector-loopback.xml =================================================================== --- trunk/connectors/connector-loopback/src/main/resources/connector-loopback.xml 2009-03-12 22:21:46 UTC (rev 553) +++ trunk/connectors/connector-loopback/src/main/resources/connector-loopback.xml 2009-03-12 23:03:44 UTC (rev 554) @@ -1,5 +1,5 @@ <ComponentType Name="Loopback Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.945-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.945-06:00"> - <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:connector_patch.jar;extensionjar:loopbackconn.jar;extensionjar:jdbcconn.jar" Multiplicity="1" /> + <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:connector_patch.jar;extensionjar:${project.artifactId}.${project.version}.jar;${classpath}" Multiplicity="1" /> <PropertyDefinition Name="CapabilitiesClass" DisplayName="Capabilities Class" ShortDescription="" DefaultValue="com.metamatrix.connector.loopback.LoopbackCapabilities" Multiplicity="1" IsExpert="true" /> <PropertyDefinition Name="WaitTime" DisplayName="Max Random Wait Time" ShortDescription="" DefaultValue="0" Multiplicity="1" IsExpert="true" /> <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.loopback.LoopbackConnector" Multiplicity="1" IsExpert="true" /> Modified: trunk/connectors/connector-salesforce/pom.xml =================================================================== --- trunk/connectors/connector-salesforce/pom.xml 2009-03-12 22:21:46 UTC (rev 553) +++ trunk/connectors/connector-salesforce/pom.xml 2009-03-12 23:03:44 UTC (rev 554) @@ -12,6 +12,16 @@ <name>Salesforce Connector</name> <description>Integrates the query engine with Salesforce.com.</description> <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-connector-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.jboss.teiid.connectors</groupId> <artifactId>connector-xml-common</artifactId> @@ -25,29 +35,78 @@ </dependency> </dependencies> - <!-- bundles all its dependencies in a single zip file --> + <!-- This build portion is identical for all the connectors that are deployed; so when making changes make sure + it applies to all the connectors. This below block computes the classpath, writes to classpath.properties; it replaces + classpath in the xml file, then bundles current project and its dependencies and xml file in a zip for deployment--> <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-2</version> - <configuration> - <descriptors> - <descriptor>src/assembly/bundle.xml</descriptor> - </descriptors> - <outputDirectory>target/distribution</outputDirectory> - <workDirectory>target/assembly/work</workDirectory> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>attached</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <plugins> + <!-- build class path --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>build-classpath</id> + <phase>generate-sources</phase> + <goals> + <goal>build-classpath</goal> + </goals> + <configuration> + <fileSeparator>:</fileSeparator> + <pathSeparator>;</pathSeparator> + <prefix>extension</prefix> + <excludeTransitive>false</excludeTransitive> + <includeScope>runtime</includeScope> + <excludeTypes>pom</excludeTypes> + <outputFile>target/classpath.properties</outputFile> + <regenerateFile>true</regenerateFile> + <outputFilterFile>true</outputFilterFile> + </configuration> + </execution> + </executions> + </plugin> + + <!-- bundles all its dependencies in a single zip file --> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-2</version> + <configuration> + <descriptors> + <descriptor>src/assembly/bundle.xml</descriptor> + </descriptors> + <outputDirectory>target/distribution</outputDirectory> + <workDirectory>target/assembly/work</workDirectory> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>attached</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + <!-- replaces the classpath tokens in the xml file --> + <filters> + <filter>target/classpath.properties</filter> + </filters> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + </excludes> + </resource> + </resources> + </build> </project> \ No newline at end of file Modified: trunk/connectors/connector-salesforce/src/assembly/bundle.xml =================================================================== --- trunk/connectors/connector-salesforce/src/assembly/bundle.xml 2009-03-12 22:21:46 UTC (rev 553) +++ trunk/connectors/connector-salesforce/src/assembly/bundle.xml 2009-03-12 23:03:44 UTC (rev 554) @@ -11,7 +11,7 @@ <fileSets> <fileSet> - <directory>src/main/resources</directory> + <directory>target/classes</directory> <includes><include>${project.artifactId}.xml</include></includes> <outputDirectory>/</outputDirectory> </fileSet> Modified: trunk/connectors/connector-salesforce/src/main/resources/connector-salesforce.xml =================================================================== --- trunk/connectors/connector-salesforce/src/main/resources/connector-salesforce.xml 2009-03-12 22:21:46 UTC (rev 553) +++ trunk/connectors/connector-salesforce/src/main/resources/connector-salesforce.xml 2009-03-12 23:03:44 UTC (rev 554) @@ -1,5 +1,5 @@ <ComponentType Name="Salesforce Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.916-06:00" CreationDate="2008-10-31T10:26:19.916-06:00"> - <PropertyDefinition Name="ConnectorClassPath" DisplayName="ClassPath" ShortDescription="" DefaultValue="extensionjar:connector_patch.jar;extensionjar:commons-codec-1.2.jar;extensionjar:commons-httpclient-3.0.1.jar;extensionjar:axis.jar;extensionjar:salesforce.jar;extensionjar:salesforceconn.jar" Multiplicity="1" IsExpert="true" /> + <PropertyDefinition Name="ConnectorClassPath" DisplayName="ClassPath" ShortDescription="" DefaultValue="extensionjar:connector_patch.jar;extensionjar:${project.artifactId}.${project.version}.jar;${classpath}" Multiplicity="1" IsExpert="true" /> <PropertyDefinition Name="username" DisplayName="User Name" ShortDescription="Name value for Salesforce authentication" DefaultValue="" Multiplicity="1" IsPreferred="true" /> <PropertyDefinition Name="ConnectorStateClass" DisplayName="Connector State Class" ShortDescription="" DefaultValue="com.metamatrix.connector.salesforce.ConnectorState" Multiplicity="1" IsExpert="true" /> <PropertyDefinition Name="Standard" DisplayName="Standard Type" ShortDescription="Standard Built-in Connector Type" DefaultValue="true" PropertyType="Boolean" IsExpert="true" IsModifiable="false" /> Modified: trunk/connectors/connector-text/pom.xml =================================================================== --- trunk/connectors/connector-text/pom.xml 2009-03-12 22:21:46 UTC (rev 553) +++ trunk/connectors/connector-text/pom.xml 2009-03-12 23:03:44 UTC (rev 554) @@ -9,30 +9,98 @@ <artifactId>connector-text</artifactId> <name>Text Connector</name> <description>This connector reads data from text files.</description> - - <!-- bundles all its dependencies in a single zip file --> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-2</version> - <configuration> - <descriptors> - <descriptor>src/assembly/bundle.xml</descriptor> - </descriptors> - <outputDirectory>target/distribution</outputDirectory> - <workDirectory>target/assembly/work</workDirectory> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>attached</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-connector-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <!-- This build portion is identical for all the connectors that are deployed; so when making changes make sure + it applies to all the connectors. This below block computes the classpath, writes to classpath.properties; it replaces + classpath in the xml file, then bundles current project and its dependencies and xml file in a zip for deployment--> + <build> + <plugins> + <!-- build class path --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>build-classpath</id> + <phase>generate-sources</phase> + <goals> + <goal>build-classpath</goal> + </goals> + <configuration> + <fileSeparator>:</fileSeparator> + <pathSeparator>;</pathSeparator> + <prefix>extension</prefix> + <excludeTransitive>false</excludeTransitive> + <includeScope>runtime</includeScope> + <excludeTypes>pom</excludeTypes> + <outputFile>target/classpath.properties</outputFile> + <regenerateFile>true</regenerateFile> + <outputFilterFile>true</outputFilterFile> + </configuration> + </execution> + </executions> + </plugin> + + <!-- bundles all its dependencies in a single zip file --> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-2</version> + <configuration> + <descriptors> + <descriptor>src/assembly/bundle.xml</descriptor> + </descriptors> + <outputDirectory>target/distribution</outputDirectory> + <workDirectory>target/assembly/work</workDirectory> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>attached</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + <!-- replaces the classpath tokens in the xml file --> + <filters> + <filter>target/classpath.properties</filter> + </filters> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + </excludes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + </excludes> + </resource> + </resources> + + </build> </project> \ No newline at end of file Modified: trunk/connectors/connector-text/src/assembly/bundle.xml =================================================================== --- trunk/connectors/connector-text/src/assembly/bundle.xml 2009-03-12 22:21:46 UTC (rev 553) +++ trunk/connectors/connector-text/src/assembly/bundle.xml 2009-03-12 23:03:44 UTC (rev 554) @@ -11,7 +11,7 @@ <fileSets> <fileSet> - <directory>src/main/resources</directory> + <directory>target/classes</directory> <includes><include>${project.artifactId}.xml</include></includes> <outputDirectory>/</outputDirectory> </fileSet> Modified: trunk/connectors/connector-text/src/main/resources/connector-text.xml =================================================================== --- trunk/connectors/connector-text/src/main/resources/connector-text.xml 2009-03-12 22:21:46 UTC (rev 553) +++ trunk/connectors/connector-text/src/main/resources/connector-text.xml 2009-03-12 23:03:44 UTC (rev 554) @@ -1,5 +1,5 @@ <ComponentType Name="Text File Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.945-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.945-06:00"> - <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:connector_patch.jar;extensionjar:textconn.jar" Multiplicity="1" /> + <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:connector_patch.jar;extensionjar:${project.artifactId}.${project.version}.jar;${classpath}" Multiplicity="1" /> <PropertyDefinition Name="PartialStartupAllowed" DisplayName="Partial Startup Allowed" ShortDescription="" DefaultValue="true" Multiplicity="1" PropertyType="Boolean" IsExpert="true" IsPreferred="true" /> <PropertyDefinition Name="Standard" DisplayName="Standard Type" ShortDescription="Standard Built-in Connector Type" DefaultValue="true" PropertyType="Boolean" IsExpert="true" IsModifiable="false" /> <PropertyDefinition Name="DescriptorFile" DisplayName="Text File Descriptor" ShortDescription="" Multiplicity="1" IsPreferred="true" /> Modified: trunk/connectors/connector-xml/pom.xml =================================================================== --- trunk/connectors/connector-xml/pom.xml 2009-03-12 22:21:46 UTC (rev 553) +++ trunk/connectors/connector-xml/pom.xml 2009-03-12 23:03:44 UTC (rev 554) @@ -13,6 +13,16 @@ <description>This connector produces the XML documents from Web service and transforms the document into a relational structure.</description> <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-connector-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.jboss.teiid.connectors</groupId> <artifactId>connector-xml-common</artifactId> @@ -25,32 +35,80 @@ <scope>compile</scope> </dependency> </dependencies> - - - <!-- bundles all its dependencies in a single zip file --> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-2</version> - <configuration> - <descriptors> - <descriptor>src/assembly/bundle.xml</descriptor> - </descriptors> - <outputDirectory>target/distribution</outputDirectory> - <workDirectory>target/assembly/work</workDirectory> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>attached</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <!-- This build portion is identical for all the connectors that are deployed; so when making changes make sure + it applies to all the connectors. This below block computes the classpath, writes to classpath.properties; it replaces + classpath in the xml file, then bundles current project and its dependencies and xml file in a zip for deployment--> + <build> + <plugins> + <!-- build class path --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>build-classpath</id> + <phase>generate-sources</phase> + <goals> + <goal>build-classpath</goal> + </goals> + <configuration> + <fileSeparator>:</fileSeparator> + <pathSeparator>;</pathSeparator> + <prefix>extension</prefix> + <excludeTransitive>false</excludeTransitive> + <includeScope>runtime</includeScope> + <excludeTypes>pom</excludeTypes> + <outputFile>target/classpath.properties</outputFile> + <regenerateFile>true</regenerateFile> + <outputFilterFile>true</outputFilterFile> + </configuration> + </execution> + </executions> + </plugin> + + <!-- bundles all its dependencies in a single zip file --> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-2</version> + <configuration> + <descriptors> + <descriptor>src/assembly/bundle.xml</descriptor> + </descriptors> + <outputDirectory>target/distribution</outputDirectory> + <workDirectory>target/assembly/work</workDirectory> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>attached</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + <!-- replaces the classpath tokens in the xml file --> + <filters> + <filter>target/classpath.properties</filter> + </filters> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + </excludes> + </resource> + </resources> + </build> + </project> \ No newline at end of file Modified: trunk/connectors/connector-xml/src/assembly/bundle.xml =================================================================== --- trunk/connectors/connector-xml/src/assembly/bundle.xml 2009-03-12 22:21:46 UTC (rev 553) +++ trunk/connectors/connector-xml/src/assembly/bundle.xml 2009-03-12 23:03:44 UTC (rev 554) @@ -11,7 +11,7 @@ <fileSets> <fileSet> - <directory>src/main/resources</directory> + <directory>target/classes</directory> <includes><include>${project.artifactId}.xml</include></includes> <outputDirectory>/</outputDirectory> </fileSet> Modified: trunk/connectors/connector-xml/src/main/resources/connector-xml.xml =================================================================== --- trunk/connectors/connector-xml/src/main/resources/connector-xml.xml 2009-03-12 22:21:46 UTC (rev 553) +++ trunk/connectors/connector-xml/src/main/resources/connector-xml.xml 2009-03-12 23:03:44 UTC (rev 554) @@ -1,13 +1,16 @@ - <ComponentType Name="XML File Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.917-06:00" CreationDate="2008-10-31T10:26:19.917-06:00"> - <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:connector_patch.jar;extensionjar:XMLConnectorFramework.jar" Multiplicity="1" /> + <ComponentType Name="XML Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.917-06:00" CreationDate="2008-10-31T10:26:19.917-06:00"> + <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:connector_patch.jar;extensionjar:${project.artifactId}.${project.version}.jar;${classpath}" Multiplicity="1" /> + </ComponentType> + + + <ComponentType Name="XML File Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="XML Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.917-06:00" CreationDate="2008-10-31T10:26:19.917-06:00"> <PropertyDefinition Name="CharacterEncodingScheme" DisplayName="File Encoding Used" ShortDescription="A character-encoding scheme is a mapping between a coded character set and a set of octet (eight-bit byte) sequences. Some samples are UTF-8,ISO-8859-1,UTF-16)" DefaultValue="ISO-8859-1" /> <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.xmlsource.XMLSourceConnector" Multiplicity="1" IsExpert="true" /> <PropertyDefinition Name="ConnectionType" DisplayName="Type Of XML Connection" ShortDescription="Connection type used to get the XML data" DefaultValue="com.metamatrix.connector.xmlsource.file.FileConnection" Multiplicity="1" IsExpert="true" /> <PropertyDefinition Name="Standard" DisplayName="Standard Type" ShortDescription="Standard Built-in Connector Type" DefaultValue="true" PropertyType="Boolean" IsExpert="true" IsModifiable="false" /> <PropertyDefinition Name="DirectoryLocation" DisplayName="XML File(s) Directory Location" ShortDescription="" DefaultValue="" Multiplicity="1" IsPreferred="true" /> </ComponentType> - <ComponentType Name="XML SOAP Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.917-06:00" CreationDate="2008-10-31T10:26:19.917-06:00"> - <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:connector_patch.jar;extensionjar:XMLConnectorFramework.jar;extensionjar:axis.jar" Multiplicity="1" IsPreferred="true" /> + <ComponentType Name="XML SOAP Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="XML Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.917-06:00" CreationDate="2008-10-31T10:26:19.917-06:00"> <PropertyDefinition Name="AuthPassword" DisplayName="Authentication User Password" ShortDescription="Password value for authentication" DefaultValue="" IsExpert="true" IsMasked="true" IsPreferred="true" /> <PropertyDefinition Name="SAMLPropertyFile" DisplayName="SAML Property File (only required when SAML profile used)" ShortDescription="SAML Security property file (saml.properties)" DefaultValue="" IsExpert="true" IsPreferred="true" /> <PropertyDefinition Name="Standard" DisplayName="Standard Type" ShortDescription="Standard Built-in Connector Type" DefaultValue="true" PropertyType="Boolean" IsExpert="true" IsModifiable="false" /> @@ -23,10 +26,9 @@ <PropertyDefinition Name="EncryptPropertyFile" DisplayName="Encrypt crypto property file (only if Encrypt profile used)" ShortDescription="The file defines properties of cryptography for encryption of the message;(crypto.properties)" DefaultValue="" IsExpert="true" IsPreferred="true" /> <PropertyDefinition Name="TrustType" DisplayName="Trust Type:(DirectReference or IssuerSerial)" ShortDescription="Only required for Signature and Signed SAML; The issuer-serial method presumes that all trusted users of the service are known to the service and have pre-registered their certificate chains before using the service. The direct-reference method presumes that the service operator trusts all users with certificates issued by a trusted CA." DefaultValue="DirectReference" IsExpert="true" IsPreferred="true" /> </ComponentType> - <ComponentType Name="XML-Relational File Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.918-06:00" CreationDate="2008-10-31T10:26:19.918-06:00"> + <ComponentType Name="XML-Relational File Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="XML Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.918-06:00" CreationDate="2008-10-31T10:26:19.918-06:00"> <PropertyDefinition Name="TextExtractionThreshold" DisplayName="Text Extraction Threshold (in kb)" ShortDescription="extract text sections larger than this size to a file where more efficient access as a CLOB can be effected." DefaultValue="128" PropertyType="Integer" IsExpert="true" /> <PropertyDefinition Name="FilePath" DisplayName="File Path" ShortDescription="" Multiplicity="1" /> - <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:connector_patch.jar;extensionjar:XMLConnectorFramework.jar;extensionjar:ConnectorCommons.jar;extensionjar:jaxen-1.1.jar;extensionjar:jdom.jar;extensionjar:commons-logging.jar" Multiplicity="1" /> <PropertyDefinition Name="Standard" DisplayName="Standard Type" ShortDescription="Standard Built-in Connector Type" DefaultValue="true" PropertyType="Boolean" IsExpert="true" IsModifiable="false" /> <PropertyDefinition Name="FileCacheLocation" DisplayName="Location of the File Cache" ShortDescription="" DefaultValue="" /> <PropertyDefinition Name="CacheTimeout" DisplayName="Cache Timeout (in seconds)" ShortDescription="" DefaultValue="60" Multiplicity="1" PropertyType="Integer" /> @@ -41,7 +43,7 @@ <PropertyDefinition Name="QueryPreprocessorClass" DisplayName="Query Preprocessor Class" ShortDescription="The class to use to preprocess the IQuery" DefaultValue="com.metamatrix.connector.xml.base.NoQueryPreprocessing" IsConstrainedToAllowedValues="false" IsExpert="true" /> <PropertyDefinition Name="ConnectorCapabilities" DisplayName="Connector Capabilities Class" ShortDescription="The class to use to provide the Connector Capabilities" DefaultValue="com.metamatrix.connector.xml.base.XMLCapabilities" IsConstrainedToAllowedValues="false" IsExpert="true" /> </ComponentType> - <ComponentType Name="XML-Relational HTTP Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.920-06:00" CreationDate="2008-10-31T10:26:19.921-06:00"> + <ComponentType Name="XML-Relational HTTP Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="XML Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.920-06:00" CreationDate="2008-10-31T10:26:19.921-06:00"> <PropertyDefinition Name="TextExtractionThreshold" DisplayName="Text Extraction Threshold (in kb)" ShortDescription="Extract text sections larger than this size to a file where more efficient access as a CLOB can be effected." DefaultValue="128" PropertyType="Integer" IsExpert="true" /> <PropertyDefinition Name="FileCacheLocation" DisplayName="Location of the File Cache" ShortDescription="" DefaultValue="" /> <PropertyDefinition Name="CacheTimeout" DisplayName="Cache Timeout (in seconds)" ShortDescription="" DefaultValue="60" Multiplicity="1" PropertyType="Integer" /> @@ -59,7 +61,6 @@ <PropertyDefinition Name="ProxyUri" DisplayName="Proxy Server URI" ShortDescription="The URI of the proxy server" DefaultValue="" /> <PropertyDefinition Name="ExceptionOnIntraQueryCacheExpiration" DisplayName="Exception On Intra-Query Cache Expiration" ShortDescription="Throw an exception when a document expires from the cache between executing different parts of a single query (instead of requesting the document again)" DefaultValue="true" PropertyType="Boolean" IsExpert="true" /> <PropertyDefinition Name="ConnectorCapabilities" DisplayName="Connector Capabilities Class" ShortDescription="The class to use to provide the Connector Capabilities" DefaultValue="com.metamatrix.connector.xml.base.XMLCapabilities" IsConstrainedToAllowedValues="false" IsExpert="true" /> - <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:connector_patch.jar;extensionjar:commons-httpclient-3.0.1.jar;extensionjar:XMLConnectorFramework.jar;extensionjar:ConnectorCommons.jar;extensionjar:jaxen-1.1.jar;extensionjar:jdom.jar;extensionjar:commons-logging.jar;extensionjar:commons-codec-1.2.jar" Multiplicity="1" /> <PropertyDefinition Name="Standard" DisplayName="Standard Type" ShortDescription="Standard Built-in Connector Type" DefaultValue="true" PropertyType="Boolean" IsExpert="true" IsModifiable="false" /> <PropertyDefinition Name="HttpBasicAuthUserName" DisplayName="HTTP Basic Authentication Name" ShortDescription="Name value for HTTP basic authentication" DefaultValue="" IsExpert="true" /> <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.xml.base.XMLConnector" Multiplicity="1" IsExpert="true" /> @@ -78,7 +79,7 @@ <PropertyDefinition Name="HostnameVerifier" DisplayName="Hostname Verifier" ShortDescription="Class implementing javax.net.ssl.HostnameVerifier. Used to implement a hostname mismatch workaround." IsConstrainedToAllowedValues="false" IsExpert="true" /> <PropertyDefinition Name="QueryPreprocessorClass" DisplayName="Query Preprocessor Class" ShortDescription="The class to use to preprocess the IQuery" DefaultValue="com.metamatrix.connector.xml.base.NoQueryPreprocessing" IsConstrainedToAllowedValues="false" IsExpert="true" /> </ComponentType> - <ComponentType Name="XML-Relational SOAP Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.919-06:00" CreationDate="2008-10-31T10:26:19.919-06:00"> + <ComponentType Name="XML-Relational SOAP Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="XML Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.919-06:00" CreationDate="2008-10-31T10:26:19.919-06:00"> <PropertyDefinition Name="TextExtractionThreshold" DisplayName="Text Extraction Threshold (in kb)" ShortDescription="Extract text sections larger than this size to a file where more efficient access as a CLOB can be effected." DefaultValue="128" PropertyType="Integer" IsExpert="true" /> <PropertyDefinition Name="AuthPassword" DisplayName="Authentication User Password" ShortDescription="Password value for authentication" DefaultValue="" IsExpert="true" IsMasked="true" IsPreferred="true" /> <PropertyDefinition Name="FileCacheLocation" DisplayName="Location of the File Cache" ShortDescription="" DefaultValue="" /> @@ -102,7 +103,6 @@ <PropertyDefinition Name="EncryptPropertyFile" DisplayName="Encrypt crypto property file (only if Encrypt profile used)" ShortDescription="The file defines properties of cryptography for encryption of the message;(crypto.properties)" DefaultValue="" IsExpert="true" IsPreferred="true" /> <PropertyDefinition Name="ExceptionOnIntraQueryCacheExpiration" DisplayName="Exception On Intra-Query Cache Expiration" ShortDescription="Throw an exception when a document expires from the cache between executing different parts of a single query (instead of requesting the document again)" DefaultValue="true" PropertyType="Boolean" IsExpert="true" /> <PropertyDefinition Name="ConnectorCapabilities" DisplayName="Connector Capabilities Class" ShortDescription="The class to use to provide the Connector Capabilities" DefaultValue="com.metamatrix.connector.xml.base.XMLCapabilities" IsConstrainedToAllowedValues="false" IsExpert="true" /> - <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:connector_patch.jar;extensionjar:commons-httpclient-3.0.1.jar;extensionjar:XMLConnectorFramework.jar;extensionjar:jaxen-1.1.jar;extensionjar:jdom.jar;extensionjar:commons-logging.jar;extensionjar:commons-codec-1.2.jar;extensionjar:axis.jar;extensionjar:commons-discovery-0.2.jar;extensionjar:saaj.jar;extensionjar:jaxrpc.jar" Multiplicity="1" /> <PropertyDefinition Name="SAMLPropertyFile" DisplayName="SAML Property File (only required when SAML profile used)" ShortDescription="SAML Security property file (saml.properties)" DefaultValue="" IsExpert="true" IsPreferred="true" /> <PropertyDefinition Name="Standard" DisplayName="Standard Type" ShortDescription="Standard Built-in Connector Type" DefaultValue="true" PropertyType="Boolean" IsExpert="true" IsModifiable="false" /> <PropertyDefinition Name="EncodingStyle" DisplayName="Encoding Style (RPC - Encoded, RPC - Literal, Document - Literal, Document - Encoded)" ShortDescription="Encoding Style" DefaultValue="Document - Literal" Multiplicity="1"> Modified: trunk/connectors/pom.xml =================================================================== --- trunk/connectors/pom.xml 2009-03-12 22:21:46 UTC (rev 553) +++ trunk/connectors/pom.xml 2009-03-12 23:03:44 UTC (rev 554) @@ -11,36 +11,19 @@ <artifactId>teiid-connectors</artifactId> <packaging>pom</packaging> <name>Connectors</name> - <description>This project is aggregator for all the supported - connectors.</description> + <description>This project is aggregator for all the supported connectors.</description> <dependencies> - - <!-- Internal dependencies --> + + <!-- Internal Test Dependencies --> <dependency> <groupId>org.jboss.teiid</groupId> <artifactId>teiid-connector-api</artifactId> - <exclusions> - <exclusion> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-internal</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-connector-api</artifactId> <type>test-jar</type> - <exclusions> - <exclusion> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-internal</artifactId> - </exclusion> - </exclusions> + <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-connector-sdk</artifactId> - <scope>test</scope> + <artifactId>teiid-connector-sdk</artifactId> <exclusions> <exclusion> <groupId>org.jboss.teiid</groupId> @@ -54,7 +37,8 @@ <groupId>org.jboss.teiid</groupId> <artifactId>teiid-metadata</artifactId> </exclusion> - </exclusions> + </exclusions> + <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.teiid</groupId> @@ -74,41 +58,47 @@ <artifactId>teiid-metadata</artifactId> </exclusion> </exclusions> + <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> + <artifactId>teiid-engine</artifactId> <type>test-jar</type> + <scope>test</scope> </dependency> - <dependency> <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-internal</artifactId> - <scope>runtime</scope> + <artifactId>teiid-common-core</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> - <scope>runtime</scope> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.teiid</groupId> <artifactId>teiid-engine</artifactId> - <type>test-jar</type> - <scope>runtime</scope> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-internal</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.teiid</groupId> <artifactId>teiid-metadata</artifactId> - <scope>runtime</scope> + <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.teiid</groupId> <artifactId>teiid-metadata</artifactId> <type>test-jar</type> - <scope>runtime</scope> - </dependency> - + <scope>test</scope> + </dependency> + <!-- External dependencies --> </dependencies>