[teiid-commits] teiid SVN: r2257 - in branches/7.0.x: documentation/admin-guide and 3 other directories.

Author: shawkins Date: 2010-06-18 15:31:35 -0400 (Fri, 18 Jun 2010) New Revision: 2257 Modified: branches/7.0.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java branches/7.0.x/documentation/admin-guide/pom.xml branches/7.0.x/documentation/client-developers-guide/pom.xml branches/7.0.x/documentation/developer-guide/pom.xml branches/7.0.x/documentation/reference/pom.xml Log: correcting poms and updating the client to not do the version check Modified: branches/7.0.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java =================================================================== --- branches/7.0.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java 2010-06-18 19:26:55 UTC (rev 2256) +++ branches/7.0.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java 2010-06-18 19:31:35 UTC (rev 2257) @@ -144,9 +144,9 @@ } try { - if (!getVersionInfo().equals(handshake.getVersion())) { + /*if (!getVersionInfo().equals(handshake.getVersion())) { throw new CommunicationException(NetPlugin.Util.getString("SocketServerInstanceImpl.version_mismatch", getVersionInfo(), handshake.getVersion())); //$NON-NLS-1$ - } + }*/ handshake.setVersion(getVersionInfo()); Modified: branches/7.0.x/documentation/admin-guide/pom.xml =================================================================== --- branches/7.0.x/documentation/admin-guide/pom.xml 2010-06-18 19:26:55 UTC (rev 2256) +++ branches/7.0.x/documentation/admin-guide/pom.xml 2010-06-18 19:31:35 UTC (rev 2257) @@ -1,12 +1,13 @@ <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/xsd/maven-4.0.0.xsd"> <parent> - <groupId>org.jboss.teiid.documentation</groupId> + <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>admin-guide</artifactId> + <groupId>org.jboss.teiid.documentation</groupId> <packaging>jdocbook</packaging> <name>Admin Guide</name> <description>The Teiid Admin manual</description> Modified: branches/7.0.x/documentation/client-developers-guide/pom.xml =================================================================== --- branches/7.0.x/documentation/client-developers-guide/pom.xml 2010-06-18 19:26:55 UTC (rev 2256) +++ branches/7.0.x/documentation/client-developers-guide/pom.xml 2010-06-18 19:31:35 UTC (rev 2257) @@ -1,12 +1,13 @@ <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/xsd/maven-4.0.0.xsd"> <parent> - <groupId>org.jboss.teiid.documentation</groupId> + <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>client-developers-guide</artifactId> + <groupId>org.jboss.teiid.documentation</groupId> <packaging>jdocbook</packaging> <name>Teiid Client Developers Guide</name> <description>The Client Developers Guide</description> Modified: branches/7.0.x/documentation/developer-guide/pom.xml =================================================================== --- branches/7.0.x/documentation/developer-guide/pom.xml 2010-06-18 19:26:55 UTC (rev 2256) +++ branches/7.0.x/documentation/developer-guide/pom.xml 2010-06-18 19:31:35 UTC (rev 2257) @@ -1,12 +1,13 @@ <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/xsd/maven-4.0.0.xsd"> <parent> - <groupId>org.jboss.teiid.documentation</groupId> + <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>developer-guide</artifactId> + <groupId>org.jboss.teiid.documentation</groupId> <packaging>jdocbook</packaging> <name>Developer's Guide</name> <description>The Teiid Developer's Guide</description> Modified: branches/7.0.x/documentation/reference/pom.xml =================================================================== --- branches/7.0.x/documentation/reference/pom.xml 2010-06-18 19:26:55 UTC (rev 2256) +++ branches/7.0.x/documentation/reference/pom.xml 2010-06-18 19:31:35 UTC (rev 2257) @@ -1,12 +1,13 @@ <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/xsd/maven-4.0.0.xsd"> <parent> - <groupId>org.jboss.teiid.documentation</groupId> + <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>reference</artifactId> + <groupId>org.jboss.teiid.documentation</groupId> <packaging>jdocbook</packaging> <name>Teiid Reference</name> <description>The Teiid reference manual</description>