Author: shawkins Date: 2010-03-04 12:57:09 -0500 (Thu, 04 Mar 2010) New Revision: 1901 Added: trunk/build/assembly/jboss-container/ trunk/build/kit-jboss-container/ Modified: trunk/build/assembly/adminshell/adminshell-dependencies.xml trunk/build/kit-adminshell/connection.properties trunk/build/pom.xml Log: TEIID-833 committing merge Modified: trunk/build/assembly/adminshell/adminshell-dependencies.xml =================================================================== --- trunk/build/assembly/adminshell/adminshell-dependencies.xml 2010-03-04 15:18:19 UTC (rev 1900) +++ trunk/build/assembly/adminshell/adminshell-dependencies.xml 2010-03-04 17:57:09 UTC (rev 1901) @@ -28,11 +28,6 @@ <unpack>false</unpack> <useTransitiveDependencies>true</useTransitiveDependencies> <useDefaultExcludes>true</useDefaultExcludes> - <excludes> - <exclude>org.jboss.teiid:teiid-client</exclude> - <exclude>org.jboss.teiid:teiid-client-jdbc</exclude> - <exclude>org.jboss.teiid:teiid-common-core</exclude> - </excludes> </dependencySet> </dependencySets> Copied: trunk/build/assembly/jboss-container (from rev 1900, branches/JCA/build/assembly/jboss-container) Modified: trunk/build/kit-adminshell/connection.properties =================================================================== --- trunk/build/kit-adminshell/connection.properties 2010-03-04 15:18:19 UTC (rev 1900) +++ trunk/build/kit-adminshell/connection.properties 2010-03-04 17:57:09 UTC (rev 1901) @@ -1,4 +1,7 @@ -user=admin -password=teiid +jdbc.user=admin +jdbc.password=teiid jdbc.url=jdbc:teiid:admin@mm://localhost:31000; -admin.url=mm://localhost:31000 \ No newline at end of file + +admin.url=mm://localhost:31443 +admin.user=admin +admin.password=admin Copied: trunk/build/kit-jboss-container (from rev 1900, branches/JCA/build/kit-jboss-container) Modified: trunk/build/pom.xml =================================================================== --- trunk/build/pom.xml 2010-03-04 15:18:19 UTC (rev 1900) +++ trunk/build/pom.xml 2010-03-04 17:57:09 UTC (rev 1901) @@ -7,112 +7,25 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>build</artifactId> - <packaging>pom</packaging> <name>Build</name> <description>Teiid Build</description> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>package</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <!-- addition of a new connector goes here as an bundle --> - <artifactItem> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-connector-api</artifactId> - <version>${pom.version}</version> - <classifier>bundle</classifier> - <type>zip</type> - <overWrite>true</overWrite> - </artifactItem> - <artifactItem> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>connector-xml</artifactId> - <version>${pom.version}</version> - <classifier>bundle</classifier> - <type>zip</type> - <overWrite>true</overWrite> - </artifactItem> - <artifactItem> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>connector-xml-common</artifactId> - <version>${pom.version}</version> - <classifier>bundle</classifier> - <type>zip</type> - <overWrite>true</overWrite> - </artifactItem> - <artifactItem> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>connector-jdbc</artifactId> - <version>${pom.version}</version> - <classifier>bundle</classifier> - <type>zip</type> - <overWrite>true</overWrite> - </artifactItem> - <artifactItem> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>connector-text</artifactId> - <version>${pom.version}</version> - <classifier>bundle</classifier> - <type>zip</type> - <overWrite>true</overWrite> - </artifactItem> - <artifactItem> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>connector-ldap</artifactId> - <version>${pom.version}</version> - <classifier>bundle</classifier> - <type>zip</type> - <overWrite>true</overWrite> - </artifactItem> - <artifactItem> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>connector-loopback</artifactId> - <version>${pom.version}</version> - <classifier>bundle</classifier> - <type>zip</type> - <overWrite>true</overWrite> - </artifactItem> - <artifactItem> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>connector-salesforce</artifactId> - <version>${pom.version}</version> - <classifier>bundle</classifier> - <type>zip</type> - <overWrite>true</overWrite> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>assemble-artifacts</id> - <phase>package</phase> - <configuration> - <tasks> - <ant antfile="assembly/runtime/build-configuration.xml" /> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> + <outputDirectory>target/kit-jboss-container</outputDirectory> + <resources> + <resource> + <directory>kit-jboss-container</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + </includes> + </resource> + <resource> + <directory>kit-jboss-container</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + </excludes> + </resource> + </resources> </build> </project> \ No newline at end of file