Author: rareddy Date: 2009-07-22 11:53:40 -0400 (Wed, 22 Jul 2009) New Revision: 1170 Added: trunk/build/assembly/runtime/ trunk/build/assembly/runtime/dependencies.xml trunk/build/assembly/runtime/dist.xml trunk/build/kit-runtime/ Removed: trunk/build/assembly/embedded/ trunk/build/assembly/runtime/embedded-dependencies.xml trunk/build/assembly/runtime/embedded-dist.xml trunk/build/kit-embedded/ Modified: trunk/build/assembly/runtime/build-configuration.xml trunk/build/pom.xml Log: TEIID-732: renaming the embedded --> runtime, and kit to teiid Copied: trunk/build/assembly/runtime (from rev 1167, trunk/build/assembly/embedded) Modified: trunk/build/assembly/runtime/build-configuration.xml =================================================================== --- trunk/build/assembly/embedded/build-configuration.xml 2009-07-22 02:53:09 UTC (rev 1167) +++ trunk/build/assembly/runtime/build-configuration.xml 2009-07-22 15:53:40 UTC (rev 1170) @@ -1,13 +1,13 @@ <project default="main" name="teiid-configuration-build" basedir="."> - <property name="kit.dir" value="${basedir}/target/kit-embedded"/> + <property name="kit.dir" value="${basedir}/target/kit-runtime"/> <property name="extensions.dir" value="${basedir}/target/dependency"/> <target name="main" > <copy todir="${kit.dir}"> - <fileset dir="${basedir}/kit-embedded"/> + <fileset dir="${basedir}/kit-runtime"/> </copy> <!-- unzip the connector zip files in to directory and move the jar files into extensions directory --> Added: trunk/build/assembly/runtime/dependencies.xml =================================================================== --- trunk/build/assembly/runtime/dependencies.xml (rev 0) +++ trunk/build/assembly/runtime/dependencies.xml 2009-07-22 15:53:40 UTC (rev 1170) @@ -0,0 +1,59 @@ +<!--This script builds a JAR for the Embedded Server Installation --> +<assembly> + + <id>runtime-dependencies</id> + + <formats> + <format>dir</format> + </formats> + + <includeBaseDirectory>false</includeBaseDirectory> + <baseDirectory>teiid</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-runtime</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>true</includeDependencies> + <unpack>false</unpack> + + <dependencySets> + <dependencySet> + <useProjectArtifact>true</useProjectArtifact> + <unpack>false</unpack> + <useTransitiveDependencies>true</useTransitiveDependencies> + <useDefaultExcludes>true</useDefaultExcludes> + <excludes> + <exclude>teiid*</exclude> + </excludes> + </dependencySet> + </dependencySets> + + </binaries> + + </moduleSet> + <moduleSet> + <includes> + <include>org.jboss.teiid:teiid-hibernate-dialect</include> + </includes> + <binaries> + <includeDependencies>false</includeDependencies> + <unpack>false</unpack> + </binaries> + </moduleSet> + </moduleSets> + +</assembly> \ No newline at end of file Added: trunk/build/assembly/runtime/dist.xml =================================================================== --- trunk/build/assembly/runtime/dist.xml (rev 0) +++ trunk/build/assembly/runtime/dist.xml 2009-07-22 15:53:40 UTC (rev 1170) @@ -0,0 +1,70 @@ +<!--This script builds a JAR for the Embedded Server Installation --> +<assembly> + + <id>dist</id> + + <formats> + <format>zip</format> + </formats> + + <includeBaseDirectory>true</includeBaseDirectory> + <baseDirectory>teiid-${version}</baseDirectory> + + <fileSets> + + <fileSet> + <directory>target/distribution</directory> + <includes> + <include>teiid-${version}-client.jar</include> + </includes> + <outputDirectory>client</outputDirectory> + </fileSet> + + <fileSet> + <directory>target/distribution/teiid-${version}-runtime-dependencies.dir</directory> + <includes> + <include>*.jar</include> + </includes> + <excludes> + <exclude>teiid-txn-jbossts-${version}.jar</exclude> + <exclude>teiid-hibernate-dialect-${version}.jar</exclude> + </excludes> + <outputDirectory>lib</outputDirectory> + </fileSet> + + <fileSet> + <directory>target/distribution/teiid-${version}-runtime-dependencies.dir</directory> + <includes> + <include>teiid-hibernate-dialect-${version}.jar</include> + </includes> + <outputDirectory>client</outputDirectory> + </fileSet> + + <fileSet> + <directory>target/distribution/teiid-${version}-runtime-dependencies.dir</directory> + <includes> + <include>teiid-txn-jbossts-${version}.jar</include> + </includes> + <outputDirectory>lib/patches</outputDirectory> + </fileSet> + + <fileSet> + <directory>build/target/kit-runtime</directory> + <outputDirectory>/</outputDirectory> + <excludes> + <exclude>**/run.*</exclude> + </excludes> + </fileSet> + + <fileSet> + <directory>build/target/kit-runtime</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>**/run.*</include> + </includes> + <filtered>true</filtered> + </fileSet> + + </fileSets> + +</assembly> \ No newline at end of file Deleted: trunk/build/assembly/runtime/embedded-dependencies.xml =================================================================== --- trunk/build/assembly/embedded/embedded-dependencies.xml 2009-07-22 02:53:09 UTC (rev 1167) +++ trunk/build/assembly/runtime/embedded-dependencies.xml 2009-07-22 15:53:40 UTC (rev 1170) @@ -1,59 +0,0 @@ -<!--This script builds a JAR for the Embedded Server Installation --> -<assembly> - - <id>embedded-dependencies</id> - - <formats> - <format>dir</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>true</includeDependencies> - <unpack>false</unpack> - - <dependencySets> - <dependencySet> - <useProjectArtifact>true</useProjectArtifact> - <unpack>false</unpack> - <useTransitiveDependencies>true</useTransitiveDependencies> - <useDefaultExcludes>true</useDefaultExcludes> - <excludes> - <exclude>teiid*</exclude> - </excludes> - </dependencySet> - </dependencySets> - - </binaries> - - </moduleSet> - <moduleSet> - <includes> - <include>org.jboss.teiid:teiid-hibernate-dialect</include> - </includes> - <binaries> - <includeDependencies>false</includeDependencies> - <unpack>false</unpack> - </binaries> - </moduleSet> - </moduleSets> - -</assembly> \ No newline at end of file Deleted: trunk/build/assembly/runtime/embedded-dist.xml =================================================================== --- trunk/build/assembly/embedded/embedded-dist.xml 2009-07-22 02:53:09 UTC (rev 1167) +++ trunk/build/assembly/runtime/embedded-dist.xml 2009-07-22 15:53:40 UTC (rev 1170) @@ -1,70 +0,0 @@ -<!--This script builds a JAR for the Embedded Server Installation --> -<assembly> - - <id>embedded-dist</id> - - <formats> - <format>zip</format> - </formats> - - <includeBaseDirectory>true</includeBaseDirectory> - <baseDirectory>teiid-embedded-${version}</baseDirectory> - - <fileSets> - - <fileSet> - <directory>target/distribution</directory> - <includes> - <include>teiid-${version}-client.jar</include> - </includes> - <outputDirectory>client</outputDirectory> - </fileSet> - - <fileSet> - <directory>target/distribution/teiid-${version}-embedded-dependencies.dir</directory> - <includes> - <include>*.jar</include> - </includes> - <excludes> - <exclude>teiid-txn-jbossts-${version}.jar</exclude> - <exclude>teiid-hibernate-dialect-${version}.jar</exclude> - </excludes> - <outputDirectory>lib</outputDirectory> - </fileSet> - - <fileSet> - <directory>target/distribution/teiid-${version}-embedded-dependencies.dir</directory> - <includes> - <include>teiid-hibernate-dialect-${version}.jar</include> - </includes> - <outputDirectory>client</outputDirectory> - </fileSet> - - <fileSet> - <directory>target/distribution/teiid-${version}-embedded-dependencies.dir</directory> - <includes> - <include>teiid-txn-jbossts-${version}.jar</include> - </includes> - <outputDirectory>lib/patches</outputDirectory> - </fileSet> - - <fileSet> - <directory>build/target/kit-embedded</directory> - <outputDirectory>/</outputDirectory> - <excludes> - <exclude>**/run.*</exclude> - </excludes> - </fileSet> - - <fileSet> - <directory>build/target/kit-embedded</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>**/run.*</include> - </includes> - <filtered>true</filtered> - </fileSet> - - </fileSets> - -</assembly> \ No newline at end of file Copied: trunk/build/kit-runtime (from rev 1169, trunk/build/kit-embedded) Modified: trunk/build/pom.xml =================================================================== --- trunk/build/pom.xml 2009-07-22 14:05:52 UTC (rev 1169) +++ trunk/build/pom.xml 2009-07-22 15:53:40 UTC (rev 1170) @@ -104,7 +104,7 @@ <phase>package</phase> <configuration> <tasks> - <ant antfile="assembly/embedded/build-configuration.xml" /> + <ant antfile="assembly/runtime/build-configuration.xml" /> </tasks> </configuration> <goals>