[teiid-commits] teiid SVN: r794 - in trunk/client/src/main/java: org and 6 other directories.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2009-04-17 15:59:03 -0400 (Fri, 17 Apr 2009)
New Revision: 794

Added:
   trunk/client/src/main/java/org/teiid/
   trunk/client/src/main/java/org/teiid/netty/
   trunk/client/src/main/java/org/teiid/netty/handler/
   trunk/client/src/main/java/org/teiid/netty/handler/codec/
   trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/
Removed:
   trunk/client/src/main/java/org/jboss/netty/handler/codec/serialization/
Modified:
   trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/OioOjbectChannelFactory.java
   trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/CompactObjectInputStream.java
   trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/CompactObjectOutputStream.java
   trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/ObjectDecoderInputStream.java
   trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/ObjectEncoderOutputStream.java
Log:
TEIID-292 repackaging the client classes to avoid conflict if a netty jar is present

Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/OioOjbectChannelFactory.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/OioOjbectChannelFactory.java	2009-04-17 16:16:06 UTC (rev 793)
+++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/OioOjbectChannelFactory.java	2009-04-17 19:59:03 UTC (rev 794)
@@ -37,8 +37,8 @@
 import java.util.concurrent.Future;
 import java.util.logging.Logger;
 
-import org.jboss.netty.handler.codec.serialization.ObjectDecoderInputStream;
-import org.jboss.netty.handler.codec.serialization.ObjectEncoderOutputStream;
+import org.teiid.netty.handler.codec.serialization.ObjectDecoderInputStream;
+import org.teiid.netty.handler.codec.serialization.ObjectEncoderOutputStream;
 
 import com.metamatrix.common.comm.exception.CommunicationException;
 import com.metamatrix.common.comm.platform.socket.ObjectChannel;

Copied: trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization (from rev 790, trunk/client/src/main/java/org/jboss/netty/handler/codec/serialization)


Property changes on: trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/CompactObjectInputStream.java
===================================================================
--- trunk/client/src/main/java/org/jboss/netty/handler/codec/serialization/CompactObjectInputStream.java	2009-04-16 22:53:44 UTC (rev 790)
+++ trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/CompactObjectInputStream.java	2009-04-17 19:59:03 UTC (rev 794)
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.handler.codec.serialization;
+package org.teiid.netty.handler.codec.serialization;
 
 import java.io.EOFException;
 import java.io.IOException;

Modified: trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/CompactObjectOutputStream.java
===================================================================
--- trunk/client/src/main/java/org/jboss/netty/handler/codec/serialization/CompactObjectOutputStream.java	2009-04-16 22:53:44 UTC (rev 790)
+++ trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/CompactObjectOutputStream.java	2009-04-17 19:59:03 UTC (rev 794)
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.handler.codec.serialization;
+package org.teiid.netty.handler.codec.serialization;
 
 import java.io.IOException;
 import java.io.ObjectOutputStream;

Modified: trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/ObjectDecoderInputStream.java
===================================================================
--- trunk/client/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectDecoderInputStream.java	2009-04-16 22:53:44 UTC (rev 790)
+++ trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/ObjectDecoderInputStream.java	2009-04-17 19:59:03 UTC (rev 794)
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.handler.codec.serialization;
+package org.teiid.netty.handler.codec.serialization;
 
 import java.io.DataInputStream;
 import java.io.IOException;

Modified: trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/ObjectEncoderOutputStream.java
===================================================================
--- trunk/client/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectEncoderOutputStream.java	2009-04-16 22:53:44 UTC (rev 790)
+++ trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/ObjectEncoderOutputStream.java	2009-04-17 19:59:03 UTC (rev 794)
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.handler.codec.serialization;
+package org.teiid.netty.handler.codec.serialization;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;