Author: shawkins Date: 2009-03-23 16:26:22 -0400 (Mon, 23 Mar 2009) New Revision: 621 Modified: trunk/connectors/connector-jdbc/pom.xml trunk/connectors/connector-ldap/pom.xml trunk/connectors/connector-loopback/pom.xml trunk/connectors/connector-salesforce/pom.xml trunk/connectors/connector-text/pom.xml trunk/connectors/connector-xml-common/pom.xml trunk/connectors/connector-xml/pom.xml trunk/connectors/pom.xml trunk/connectors/salesforce-api/pom.xml trunk/connectors/sandbox/connector-exec/pom.xml trunk/connectors/sandbox/connector-object/pom.xml trunk/connectors/sandbox/connector-oracle-spatial/pom.xml trunk/connectors/sandbox/connector-yahoo/pom.xml trunk/connectors/sandbox/pom.xml trunk/documentation/pom.xml trunk/pom.xml Log: correcting connector group names Modified: trunk/connectors/connector-jdbc/pom.xml =================================================================== --- trunk/connectors/connector-jdbc/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/connector-jdbc/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -3,12 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>teiid-connectors</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-jdbc</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> <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> Modified: trunk/connectors/connector-ldap/pom.xml =================================================================== --- trunk/connectors/connector-ldap/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/connector-ldap/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -1,11 +1,12 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>teiid-connectors</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ldap</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> <name>LDAP Connector</name> <description>LDAP Connector</description> Modified: trunk/connectors/connector-loopback/pom.xml =================================================================== --- trunk/connectors/connector-loopback/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/connector-loopback/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -3,12 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>teiid-connectors</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-loopback</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> <name>Loopback Connector</name> <description>Loopback Connector</description> <dependencies> Modified: trunk/connectors/connector-salesforce/pom.xml =================================================================== --- trunk/connectors/connector-salesforce/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/connector-salesforce/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -3,12 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <parent> - <artifactId>teiid-connectors</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-salesforce</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> <name>Salesforce Connector</name> <description>Integrates the query engine with Salesforce.com.</description> <dependencies> Modified: trunk/connectors/connector-text/pom.xml =================================================================== --- trunk/connectors/connector-text/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/connector-text/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <parent> - <artifactId>teiid-connectors</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-text</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> <name>Text Connector</name> <description>This connector reads data from text files.</description> <dependencies> Modified: trunk/connectors/connector-xml/pom.xml =================================================================== --- trunk/connectors/connector-xml/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/connector-xml/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -3,12 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <parent> - <artifactId>teiid-connectors</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-xml</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> <name>XML Connector</name> <description>This connector produces the XML documents from Web service and transforms the document into a relational structure.</description> Modified: trunk/connectors/connector-xml-common/pom.xml =================================================================== --- trunk/connectors/connector-xml-common/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/connector-xml-common/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -3,12 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <parent> - <artifactId>teiid-connectors</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-xml-common</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> <name>XML Common Connector</name> <description>This project holds the common dependencies for the XML Connector</description> <dependencies> Modified: trunk/connectors/pom.xml =================================================================== --- trunk/connectors/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -7,8 +7,8 @@ <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>teiid-connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <artifactId>connectors</artifactId> <packaging>pom</packaging> <name>Connectors</name> <description>This project is aggregator for all the supported connectors.</description> Modified: trunk/connectors/salesforce-api/pom.xml =================================================================== --- trunk/connectors/salesforce-api/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/salesforce-api/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -1,11 +1,12 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>teiid-connectors</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>salesforce-api</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> <name>Salesforce API</name> <description>The java API for the Salesforce.com partner web service API</description> <dependencies> Modified: trunk/connectors/sandbox/connector-exec/pom.xml =================================================================== --- trunk/connectors/sandbox/connector-exec/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/sandbox/connector-exec/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -2,11 +2,12 @@ <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <parent> <artifactId>sandbox</artifactId> - <groupId>org.jboss.teiid.connectors.sandbox</groupId> + <groupId>org.jboss.teiid.connectors</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-exec</artifactId> + <groupId>org.jboss.teiid.connectors.sandbox</groupId> <name>Exec Connector</name> <description>This connector executes Admin API calls and System.exec calls through the connector using SQL representation</description> <dependencies> Modified: trunk/connectors/sandbox/connector-object/pom.xml =================================================================== --- trunk/connectors/sandbox/connector-object/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/sandbox/connector-object/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -3,11 +3,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <artifactId>sandbox</artifactId> - <groupId>org.jboss.teiid.connectors.sandbox</groupId> + <groupId>org.jboss.teiid.connectors</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-object</artifactId> + <groupId>org.jboss.teiid.connectors.sandbox</groupId> <name>Object Connector</name> <description>This is generic connector that can be used to wrap any JAVA API, and turn it into connector</description> Modified: trunk/connectors/sandbox/connector-oracle-spatial/pom.xml =================================================================== --- trunk/connectors/sandbox/connector-oracle-spatial/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/sandbox/connector-oracle-spatial/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -2,11 +2,12 @@ <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <parent> <artifactId>sandbox</artifactId> - <groupId>org.jboss.teiid.connectors.sandbox</groupId> + <groupId>org.jboss.teiid.connectors</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-oracle-spatial</artifactId> + <groupId>org.jboss.teiid.connectors.sandbox</groupId> <name>Oracle Spatial Connector</name> <description>Oracle Spatial Connector</description> <dependencies> Modified: trunk/connectors/sandbox/connector-yahoo/pom.xml =================================================================== --- trunk/connectors/sandbox/connector-yahoo/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/sandbox/connector-yahoo/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -2,11 +2,12 @@ <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <parent> <artifactId>sandbox</artifactId> - <groupId>org.jboss.teiid.connectors.sandbox</groupId> + <groupId>org.jboss.teiid.connectors</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-yahoo</artifactId> + <groupId>org.jboss.teiid.connectors.sandbox</groupId> <name>Yahoo Connector</name> <description>Test connector used to query ticker symbols from Yahoo website</description> Modified: trunk/connectors/sandbox/pom.xml =================================================================== --- trunk/connectors/sandbox/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/connectors/sandbox/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <parent> - <artifactId>teiid-connectors</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.teiid.connectors.sandbox</groupId> + <groupId>org.jboss.teiid.connectors</groupId> <artifactId>sandbox</artifactId> <packaging>pom</packaging> <name>Sandbox</name> Modified: trunk/documentation/pom.xml =================================================================== --- trunk/documentation/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/documentation/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -45,19 +45,4 @@ <url>http://snapshots.jboss.org/maven2</url> </pluginRepository> </pluginRepositories> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-2</version> - <configuration> - <descriptors> - <descriptor>assembly/docs.xml</descriptor> - </descriptors> - <outputDirectory>target/distribution</outputDirectory> - <workDirectory>target/assembly/work</workDirectory> - </configuration> - </plugin> - </plugins> - </build> </project> \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-03-23 19:06:58 UTC (rev 620) +++ trunk/pom.xml 2009-03-23 20:26:22 UTC (rev 621) @@ -42,7 +42,62 @@ </roles> <timezone>-6</timezone> </developer> + <developer> + <name>Van Halbert</name> + <id>van</id> + <email&gt;vhalbert(a)redhat.com&lt;/email&gt; + <organization>Red Hat</organization> + <roles> + <role>Developer</role> + </roles> + <timezone>-6</timezone> + </developer> + <developer> + <name>Ted Jones</name> + <id>ted</id> + <email&gt;tejones(a)redhat.com&lt;/email&gt; + <organization>Red Hat</organization> + <roles> + <role>Developer</role> + </roles> + <timezone>-6</timezone> + </developer> </developers> + <profiles> + <profile> + <!-- + This profile is activated manually, as in "mvn ... -P release ..." + --> + <id>release</id> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-2</version> + <configuration> + <descriptors> + <descriptor>build/assembly/src.xml</descriptor> + <!-- <descriptor>build/assembly/bin.xml</descriptor>--> + <descriptor>build/assembly/embedded/embedded-client-jar.xml</descriptor> + <descriptor>build/assembly/embedded/embedded-dependencies.xml</descriptor> + <descriptor>build/assembly/embedded/embedded-connector-dependencies.xml</descriptor> + <descriptor>build/assembly/embedded/embedded-jar.xml</descriptor> + <descriptor>build/assembly/embedded/embedded-dist.xml</descriptor> + <descriptor>build/assembly/cdk/cdk-dependencies.xml</descriptor> + <descriptor>build/assembly/cdk/cdk-dist.xml</descriptor> + <descriptor>documentation/assembly/docs.xml</descriptor> + </descriptors> + <outputDirectory>target/distribution</outputDirectory> + <workDirectory>target/assembly/work</workDirectory> + </configuration> + </plugin> + </plugins> + </build> + <modules> + <module>documentation</module> + </modules> + </profile> + </profiles> <build> <!-- This section defines the default plugin settings inherited by child projects. --> <pluginManagement> @@ -119,25 +174,6 @@ </configuration> </plugin> <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-2</version> - <configuration> - <descriptors> - <descriptor>build/assembly/src.xml</descriptor> - <descriptor>build/assembly/bin.xml</descriptor> - <descriptor>build/assembly/embedded/embedded-client-jar.xml</descriptor> - <descriptor>build/assembly/embedded/embedded-dependencies.xml</descriptor> - <descriptor>build/assembly/embedded/embedded-connector-dependencies.xml</descriptor> - <descriptor>build/assembly/embedded/embedded-jar.xml</descriptor> - <descriptor>build/assembly/embedded/embedded-dist.xml</descriptor> - <descriptor>build/assembly/cdk/cdk-dependencies.xml</descriptor> - <descriptor>build/assembly/cdk/cdk-dist.xml</descriptor> - </descriptors> - <outputDirectory>target/distribution</outputDirectory> - <workDirectory>target/assembly/work</workDirectory> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <version>2.5</version>