[teiid-commits] teiid SVN: r563 - in trunk: build/assembly/embedded and 2 other directories.

Author: rareddy Date: 2009-03-16 13:44:56 -0400 (Mon, 16 Mar 2009) New Revision: 563 Modified: trunk/build/assembly/embedded/embedded-connector-dependencies.xml trunk/build/assembly/embedded/embedded-dependencies.xml trunk/build/assembly/embedded/embedded-jar.xml trunk/connectors/connector-xml-common/pom.xml trunk/connectors/connector-xml-common/src/assembly/bundle.xml trunk/pom.xml Log: TEIID-413: Fixing the embedded's kit from the connector bundles created. Modified: trunk/build/assembly/embedded/embedded-connector-dependencies.xml =================================================================== --- trunk/build/assembly/embedded/embedded-connector-dependencies.xml 2009-03-14 19:42:40 UTC (rev 562) +++ trunk/build/assembly/embedded/embedded-connector-dependencies.xml 2009-03-16 17:44:56 UTC (rev 563) @@ -12,36 +12,21 @@ <moduleSets> <moduleSet> - <includeSubModules>true</includeSubModules> - <includes> <include>org.jboss.teiid.connectors:connector-jdbc</include> <include>org.jboss.teiid.connectors:connector-xml</include> + <include>org.jboss.teiid.connectors:connector-xml-common</include> <include>org.jboss.teiid.connectors:connector-loopback</include> <include>org.jboss.teiid.connectors:connector-text</include> <include>org.jboss.teiid.connectors:connector-ldap</include> <include>org.jboss.teiid.connectors:connector-salesforce</include> - <include>org.jboss.teiid.connectors:salesforce-api</include> </includes> - <binaries> - <includeDependencies>true</includeDependencies> + <binaries> + <includeDependencies>false</includeDependencies> + <attachmentClassifier>bundle</attachmentClassifier> <unpack>true</unpack> - - <dependencySets> - <dependencySet> - <useProjectArtifact>false</useProjectArtifact> - <unpack>false</unpack> - <useTransitiveDependencies>false</useTransitiveDependencies> - <useDefaultExcludes>true</useDefaultExcludes> - <excludes> - <exclude>teiid*</exclude> - </excludes> - </dependencySet> - </dependencySets> - </binaries> - </moduleSet> </moduleSets> Modified: trunk/build/assembly/embedded/embedded-dependencies.xml =================================================================== --- trunk/build/assembly/embedded/embedded-dependencies.xml 2009-03-14 19:42:40 UTC (rev 562) +++ trunk/build/assembly/embedded/embedded-dependencies.xml 2009-03-16 17:44:56 UTC (rev 563) @@ -41,12 +41,6 @@ <useDefaultExcludes>true</useDefaultExcludes> <excludes> <exclude>teiid*</exclude> - - <!-- these should have been excluded by module dependency structure, but until we fix those this will help--> - <exclude>antlr*</exclude> - <exclude>bsh*</exclude> - <exclude>netty*</exclude> - <exclude>stringtemplate*</exclude> </excludes> </dependencySet> </dependencySets> Modified: trunk/build/assembly/embedded/embedded-jar.xml =================================================================== --- trunk/build/assembly/embedded/embedded-jar.xml 2009-03-14 19:42:40 UTC (rev 562) +++ trunk/build/assembly/embedded/embedded-jar.xml 2009-03-16 17:44:56 UTC (rev 563) @@ -23,15 +23,7 @@ <include>org.jboss.teiid:teiid-embedded</include> <include>org.jboss.teiid:teiid-engine</include> <include>org.jboss.teiid:teiid-metadata</include> - <include>org.jboss.teiid:teiid-txn-jbossts</include> - - <include>org.jboss.teiid.connectors:connector-jdbc</include> - <include>org.jboss.teiid.connectors:connector-xml</include> - <include>org.jboss.teiid.connectors:connector-loopback</include> - <include>org.jboss.teiid.connectors:connector-text</include> - <include>org.jboss.teiid.connectors:connector-ldap</include> - <include>org.jboss.teiid.connectors:connector-salesforce</include> - <include>org.jboss.teiid.connectors:salesforce-api</include> + <include>org.jboss.teiid:teiid-txn-jbossts</include> </includes> <binaries> Modified: trunk/connectors/connector-xml-common/pom.xml =================================================================== --- trunk/connectors/connector-xml-common/pom.xml 2009-03-14 19:42:40 UTC (rev 562) +++ trunk/connectors/connector-xml-common/pom.xml 2009-03-16 17:44:56 UTC (rev 563) @@ -9,7 +9,6 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-xml-common</artifactId> - <packaging>pom</packaging> <name>XML Common Connector</name> <description>This project holds the common dependencies for the XML Connector</description> <dependencies> Modified: trunk/connectors/connector-xml-common/src/assembly/bundle.xml =================================================================== --- trunk/connectors/connector-xml-common/src/assembly/bundle.xml 2009-03-14 19:42:40 UTC (rev 562) +++ trunk/connectors/connector-xml-common/src/assembly/bundle.xml 2009-03-16 17:44:56 UTC (rev 563) @@ -11,7 +11,7 @@ <dependencySets> <dependencySet> - <useProjectArtifact>true</useProjectArtifact> + <useProjectArtifact>false</useProjectArtifact> <useTransitiveDependencies>false</useTransitiveDependencies> <useTransitiveFiltering>false</useTransitiveFiltering> <useDefaultExcludes>true</useDefaultExcludes> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-03-14 19:42:40 UTC (rev 562) +++ trunk/pom.xml 2009-03-16 17:44:56 UTC (rev 563) @@ -125,15 +125,19 @@ <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>