[teiid-commits] teiid SVN: r1816 - in branches/JCA: connectors and 13 other directories.

Author: rareddy Date: 2010-02-10 15:15:55 -0500 (Wed, 10 Feb 2010) New Revision: 1816 Removed: branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/ branches/JCA/connectors/connector-xml/src/test/java/com/imacination/webservices/distance/ branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/connector/xmlsource/soap/ branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/test/servlet/ branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/www/ branches/JCA/connectors/connector-xml/src/test/java/metamatrix/com/ Modified: branches/JCA/connectors/connector-salesforce/pom.xml branches/JCA/connectors/connector-xml-http/pom.xml branches/JCA/connectors/connector-xml-soap/pom.xml branches/JCA/connectors/connector-xml/pom.xml branches/JCA/connectors/connector-xmlsource-soap/pom.xml branches/JCA/connectors/pom.xml branches/JCA/connectors/salesforce-api/pom.xml branches/JCA/jboss-integration/pom.xml branches/JCA/pom.xml Log: TEIID-861: updating the dependencies away from xml-common into respective projects Modified: branches/JCA/connectors/connector-salesforce/pom.xml =================================================================== --- branches/JCA/connectors/connector-salesforce/pom.xml 2010-02-10 19:58:12 UTC (rev 1815) +++ branches/JCA/connectors/connector-salesforce/pom.xml 2010-02-10 20:15:55 UTC (rev 1816) @@ -41,12 +41,6 @@ </dependency> <dependency> <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>connector-xml-common</artifactId> - <version>${project.version}</version> - <type>pom</type> - </dependency> - <dependency> - <groupId>org.jboss.teiid.connectors</groupId> <artifactId>salesforce-api</artifactId> <version>${project.version}</version> </dependency> Modified: branches/JCA/connectors/connector-xml/pom.xml =================================================================== --- branches/JCA/connectors/connector-xml/pom.xml 2010-02-10 19:58:12 UTC (rev 1815) +++ branches/JCA/connectors/connector-xml/pom.xml 2010-02-10 20:15:55 UTC (rev 1816) @@ -39,17 +39,22 @@ <artifactId>commons-logging</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>connector-xml-common</artifactId> - <version>${project.version}</version> - <type>pom</type> - </dependency> <dependency> <groupId>javax.resource</groupId> <artifactId>connector-api</artifactId> <scope>provided</scope> - </dependency> + </dependency> + + <dependency> + <groupId>xom</groupId> + <artifactId>xom</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>nux</groupId> + <artifactId>nux</artifactId> + <version>1.6</version> + </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/JCA/connectors/connector-xml-http/pom.xml =================================================================== --- branches/JCA/connectors/connector-xml-http/pom.xml 2010-02-10 19:58:12 UTC (rev 1815) +++ branches/JCA/connectors/connector-xml-http/pom.xml 2010-02-10 20:15:55 UTC (rev 1816) @@ -32,8 +32,12 @@ <groupId>org.jboss.teiid.connectors</groupId> <artifactId>connector-xml</artifactId> <version>${project.version}</version> - </dependency> + </dependency> <dependency> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + </dependency> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <scope>provided</scope> @@ -42,7 +46,18 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>provided</scope> - </dependency> + </dependency> + <dependency> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.0.1</version> + </dependency> + <dependency> + <groupId>apache-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.2</version> + <scope>runtime</scope> + </dependency> </dependencies> <build> Modified: branches/JCA/connectors/connector-xml-soap/pom.xml =================================================================== --- branches/JCA/connectors/connector-xml-soap/pom.xml 2010-02-10 19:58:12 UTC (rev 1815) +++ branches/JCA/connectors/connector-xml-soap/pom.xml 2010-02-10 20:15:55 UTC (rev 1816) @@ -29,6 +29,10 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + </dependency> + <dependency> <groupId>org.jboss.teiid.connectors</groupId> <artifactId>connector-xml</artifactId> <version>${project.version}</version> Modified: branches/JCA/connectors/connector-xmlsource-soap/pom.xml =================================================================== --- branches/JCA/connectors/connector-xmlsource-soap/pom.xml 2010-02-10 19:58:12 UTC (rev 1815) +++ branches/JCA/connectors/connector-xmlsource-soap/pom.xml 2010-02-10 20:15:55 UTC (rev 1816) @@ -10,8 +10,8 @@ <name>connector-xmlsource-soap</name> <description>SOAP based XML Source Connector</description> <packaging>rar</packaging> - - <dependencies> + + <dependencies> <dependency> <groupId>org.jboss.teiid</groupId> <artifactId>teiid-connector-api</artifactId> @@ -27,23 +27,57 @@ <artifactId>connector-api</artifactId> <scope>provided</scope> </dependency> + <dependency> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>connector-xml-common</artifactId> - <version>${project.version}</version> - <type>pom</type> - </dependency> - + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>provided</scope> + </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>provided</scope> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <scope>provided</scope> </dependency> + <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <scope>provided</scope> - </dependency> + <groupId>axis</groupId> + <artifactId>axis</artifactId> + <version>1.3</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>wss4j</groupId> + <artifactId>wss4j</artifactId> + <version>1.5.0</version> + </dependency> + <dependency> + <groupId>axis</groupId> + <artifactId>axis-saaj</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>axis</groupId> + <artifactId>axis-schema</artifactId> + <version>1.3</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>opensaml</groupId> + <artifactId>opensaml</artifactId> + <version>1.1b</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>apache-xmlsec</groupId> + <artifactId>xmlsec</artifactId> + <version>1.3.0</version> + <scope>runtime</scope> + </dependency> </dependencies> <build> Modified: branches/JCA/connectors/pom.xml =================================================================== --- branches/JCA/connectors/pom.xml 2010-02-10 19:58:12 UTC (rev 1815) +++ branches/JCA/connectors/pom.xml 2010-02-10 20:15:55 UTC (rev 1816) @@ -87,7 +87,6 @@ <module>connector-ldap</module> <module>connector-salesforce</module> <module>salesforce-api</module> - <module>connector-xml-common</module> <module>sandbox</module> <module>connector-xml</module> <module>connector-xmlsource-file</module> Modified: branches/JCA/connectors/salesforce-api/pom.xml =================================================================== --- branches/JCA/connectors/salesforce-api/pom.xml 2010-02-10 19:58:12 UTC (rev 1815) +++ branches/JCA/connectors/salesforce-api/pom.xml 2010-02-10 20:15:55 UTC (rev 1816) @@ -10,11 +10,16 @@ <name>Salesforce API</name> <description>The java API for the Salesforce.com partner web service API</description> <dependencies> - <dependency> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>connector-xml-common</artifactId> - <version>${project.version}</version> - <type>pom</type> - </dependency> + <dependency> + <groupId>axis</groupId> + <artifactId>axis</artifactId> + <version>1.3</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/JCA/jboss-integration/pom.xml =================================================================== --- branches/JCA/jboss-integration/pom.xml 2010-02-10 19:58:12 UTC (rev 1815) +++ branches/JCA/jboss-integration/pom.xml 2010-02-10 20:15:55 UTC (rev 1816) @@ -58,6 +58,24 @@ </dependency> <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-reflect</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>org.jboss.man</groupId> <artifactId>jboss-managed</artifactId> <scope>provided</scope> Modified: branches/JCA/pom.xml =================================================================== --- branches/JCA/pom.xml 2010-02-10 19:58:12 UTC (rev 1815) +++ branches/JCA/pom.xml 2010-02-10 20:15:55 UTC (rev 1816) @@ -468,6 +468,11 @@ <version>5.1.0.GA</version> </dependency> <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-reflect</artifactId> + <version>2.0.2.GA</version> + </dependency> + <dependency> <groupId>org.jboss.remoting</groupId> <artifactId>jboss-remoting</artifactId> <version>2.5.1</version>