[teiid-commits] teiid SVN: r919 - in trunk: build/assembly/embedded and 1 other directory.

Author: rareddy Date: 2009-05-12 18:13:24 -0400 (Tue, 12 May 2009) New Revision: 919 Removed: trunk/build/assembly/embedded/embedded-connector-dependencies.xml trunk/build/assembly/embedded/embedded-jar.xml Modified: trunk/build/assembly/embedded/embedded-dependencies.xml trunk/pom.xml Log: TEIID-581 Deleted: trunk/build/assembly/embedded/embedded-connector-dependencies.xml =================================================================== --- trunk/build/assembly/embedded/embedded-connector-dependencies.xml 2009-05-12 19:48:13 UTC (rev 918) +++ trunk/build/assembly/embedded/embedded-connector-dependencies.xml 2009-05-12 22:13:24 UTC (rev 919) @@ -1,33 +0,0 @@ -<!--This script builds a JAR for the Embedded Server Installation --> -<assembly> - - <id>connector-dependencies</id> - - <formats> - <format>dir</format> - </formats> - - <includeBaseDirectory>false</includeBaseDirectory> - <baseDirectory>teiid-embedded</baseDirectory> - - <moduleSets> - <moduleSet> - <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> - </includes> - - <binaries> - <includeDependencies>false</includeDependencies> - <attachmentClassifier>bundle</attachmentClassifier> - <unpack>true</unpack> - </binaries> - </moduleSet> - </moduleSets> - -</assembly> \ No newline at end of file Modified: trunk/build/assembly/embedded/embedded-dependencies.xml =================================================================== --- trunk/build/assembly/embedded/embedded-dependencies.xml 2009-05-12 19:48:13 UTC (rev 918) +++ trunk/build/assembly/embedded/embedded-dependencies.xml 2009-05-12 22:13:24 UTC (rev 919) @@ -16,9 +16,6 @@ <includes> <include>org.jboss.teiid:teiid-cache-jbosscache</include> - <include>org.jboss.teiid:teiid-client</include> - <include>org.jboss.teiid:teiid-client-jdbc</include> - <include>org.jboss.teiid:teiid-common-core</include> <include>org.jboss.teiid:teiid-common-internal</include> <include>org.jboss.teiid:teiid-connector-api</include> @@ -31,11 +28,11 @@ <binaries> <includeDependencies>true</includeDependencies> - <unpack>true</unpack> + <unpack>false</unpack> <dependencySets> <dependencySet> - <useProjectArtifact>false</useProjectArtifact> + <useProjectArtifact>true</useProjectArtifact> <unpack>false</unpack> <useTransitiveDependencies>true</useTransitiveDependencies> <useDefaultExcludes>true</useDefaultExcludes> Deleted: trunk/build/assembly/embedded/embedded-jar.xml =================================================================== --- trunk/build/assembly/embedded/embedded-jar.xml 2009-05-12 19:48:13 UTC (rev 918) +++ trunk/build/assembly/embedded/embedded-jar.xml 2009-05-12 22:13:24 UTC (rev 919) @@ -1,41 +0,0 @@ -<!--This script builds a JAR for the Embedded Server Installation --> -<assembly> - - <id>embedded</id> - - <formats> - <format>jar</format> - </formats> - - <includeBaseDirectory>false</includeBaseDirectory> - <baseDirectory>teiid-embedded</baseDirectory> - - <moduleSets> - <moduleSet> - <includeSubModules>true</includeSubModules> - - <includes> - <include>org.jboss.teiid:teiid-cache-jbosscache</include> - <include>org.jboss.teiid:teiid-common-internal</include> - - <include>org.jboss.teiid:teiid-connector-api</include> - <include>org.jboss.teiid:teiid-connector-metadata</include> - <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> - </includes> - - <binaries> - <includeDependencies>false</includeDependencies> - <unpack>true</unpack> - <outputDirectory></outputDirectory> - <includes> - <include>:jar:*</include> - </includes> - </binaries> - - </moduleSet> - </moduleSets> - -</assembly> \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-05-12 19:48:13 UTC (rev 918) +++ trunk/pom.xml 2009-05-12 22:13:24 UTC (rev 919) @@ -83,7 +83,6 @@ <!-- <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-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>