Index: trunk/src/test/java/omq/test/calculator/CalculatorTest.java
===================================================================
--- trunk/src/test/java/omq/test/calculator/CalculatorTest.java	(revision 75)
+++ trunk/src/test/java/omq/test/calculator/CalculatorTest.java	(revision 77)
@@ -31,9 +31,9 @@
 
 		// Set host info of rabbimq (where it is)
-		env.setProperty(ParameterQueue.SERVER_HOST, "127.0.0.1");
-		env.setProperty(ParameterQueue.SERVER_PORT, "5672");
+		env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
+		env.setProperty(ParameterQueue.RABBIT_PORT, "5672");
 		env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-		env.setProperty(ParameterQueue.SERIALIZER_NAME, type);
-		env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
+		env.setProperty(ParameterQueue.PROXY_SERIALIZER, type);
+		env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false");
 
 		// Set info about where the message will be sent
@@ -62,8 +62,8 @@
 
 		// Get host info of rabbimq (where it is)
-		env.setProperty(ParameterQueue.SERVER_HOST, "127.0.0.1");
-		env.setProperty(ParameterQueue.SERVER_PORT, "5672");
+		env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
+		env.setProperty(ParameterQueue.RABBIT_PORT, "5672");
 		env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-		env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
+		env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false");
 
 		// Set info about where the message will be sent
Index: trunk/src/test/java/omq/test/event/MessageTest.java
===================================================================
--- trunk/src/test/java/omq/test/event/MessageTest.java	(revision 75)
+++ trunk/src/test/java/omq/test/event/MessageTest.java	(revision 77)
@@ -33,9 +33,9 @@
 
 		// Set host info of rabbimq (where it is)
-		env.setProperty(ParameterQueue.SERVER_HOST, "127.0.0.1");
-		env.setProperty(ParameterQueue.SERVER_PORT, "5672");
+		env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
+		env.setProperty(ParameterQueue.RABBIT_PORT, "5672");
 		env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-		env.setProperty(ParameterQueue.SERIALIZER_NAME, type);
-		env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
+		env.setProperty(ParameterQueue.PROXY_SERIALIZER, type);
+		env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false");
 
 		// Set info about where the message will be sent
@@ -63,8 +63,8 @@
 
 		// Get host info of rabbimq (where it is)
-		env.setProperty(ParameterQueue.SERVER_HOST, "127.0.0.1");
-		env.setProperty(ParameterQueue.SERVER_PORT, "5672");
+		env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
+		env.setProperty(ParameterQueue.RABBIT_PORT, "5672");
 		env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-		env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
+		env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false");
 
 		// Set info about where the message will be sent
@@ -89,5 +89,4 @@
 	public void test() throws Exception {
 		String expected = "Hello";
-
 		serverProxy.setMessage(expected);
 		Thread.sleep(200);
Index: trunk/src/test/java/omq/test/exception/ExceptionTest.java
===================================================================
--- trunk/src/test/java/omq/test/exception/ExceptionTest.java	(revision 75)
+++ trunk/src/test/java/omq/test/exception/ExceptionTest.java	(revision 77)
@@ -30,9 +30,9 @@
 
 		// Set host info of rabbimq (where it is)
-		env.setProperty(ParameterQueue.SERVER_HOST, "127.0.0.1");
-		env.setProperty(ParameterQueue.SERVER_PORT, "5672");
+		env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
+		env.setProperty(ParameterQueue.RABBIT_PORT, "5672");
 		env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-		env.setProperty(ParameterQueue.SERIALIZER_NAME, type);
-		env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
+		env.setProperty(ParameterQueue.PROXY_SERIALIZER, type);
+		env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false");
 
 		// Set info about where the message will be sent
@@ -60,8 +60,8 @@
 
 		// Get host info of rabbimq (where it is)
-		env.setProperty(ParameterQueue.SERVER_HOST, "127.0.0.1");
-		env.setProperty(ParameterQueue.SERVER_PORT, "5672");
+		env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
+		env.setProperty(ParameterQueue.RABBIT_PORT, "5672");
 		env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-		env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
+		env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false");
 
 		// Set info about where the message will be sent
Index: trunk/src/test/java/omq/test/exception/ServerTest.java
===================================================================
--- trunk/src/test/java/omq/test/exception/ServerTest.java	(revision 75)
+++ 	(revision )
@@ -1,36 +1,0 @@
-package omq.test.exception;
-
-import java.util.Properties;
-
-import omq.common.broker.Broker;
-import omq.common.util.ParameterQueue;
-
-import org.junit.Test;
-
-public class ServerTest {
-
-	@Test
-	public void test() throws Exception {
-		Properties env = new Properties();
-		env.setProperty(ParameterQueue.USER_NAME, "guest");
-		env.setProperty(ParameterQueue.USER_PASS, "guest");
-
-		// Get host info of rabbimq (where it is)
-		env.setProperty(ParameterQueue.SERVER_HOST, "127.0.0.1");
-		env.setProperty(ParameterQueue.SERVER_PORT, "5672");
-		env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-		env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
-
-		// Set info about where the message will be sent
-		env.setProperty(ParameterQueue.RPC_EXCHANGE, "rpc_exchange");
-		env.setProperty(ParameterQueue.RETRY_TIME_CONNECTION, "2000");
-
-		OmqServerImpl server = new OmqServerImpl();
-
-		Broker broker = new Broker(env);
-		broker.bind("server", server);
-
-		Thread.sleep(60 * 60 * 1000);
-	}
-}
-;
Index: trunk/src/test/java/omq/test/faultTolerance/FaultToleranceTest.java
===================================================================
--- trunk/src/test/java/omq/test/faultTolerance/FaultToleranceTest.java	(revision 75)
+++ trunk/src/test/java/omq/test/faultTolerance/FaultToleranceTest.java	(revision 77)
@@ -31,9 +31,9 @@
 
 		// Set host info of rabbimq (where it is)
-		env.setProperty(ParameterQueue.SERVER_HOST, "127.0.0.1");
-		env.setProperty(ParameterQueue.SERVER_PORT, "5672");
+		env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
+		env.setProperty(ParameterQueue.RABBIT_PORT, "5672");
 		env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-		env.setProperty(ParameterQueue.SERIALIZER_NAME, type);
-		env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
+		env.setProperty(ParameterQueue.PROXY_SERIALIZER, type);
+		env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false");
 
 		// Set info about where the message will be sent
@@ -68,8 +68,8 @@
 
 		// Get host info of rabbimq (where it is)
-		env.setProperty(ParameterQueue.SERVER_HOST, "127.0.0.1");
-		env.setProperty(ParameterQueue.SERVER_PORT, "5672");
+		env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
+		env.setProperty(ParameterQueue.RABBIT_PORT, "5672");
 		env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-		env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
+		env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false");
 
 		// Set info about where the message will be sent
Index: trunk/src/test/java/omq/test/multiProcess/MultiProcessTest.java
===================================================================
--- trunk/src/test/java/omq/test/multiProcess/MultiProcessTest.java	(revision 75)
+++ trunk/src/test/java/omq/test/multiProcess/MultiProcessTest.java	(revision 77)
@@ -29,9 +29,9 @@
 
 		// Set host info of rabbimq (where it is)
-		env.setProperty(ParameterQueue.SERVER_HOST, "127.0.0.1");
-		env.setProperty(ParameterQueue.SERVER_PORT, "5672");
+		env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
+		env.setProperty(ParameterQueue.RABBIT_PORT, "5672");
 		env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-		env.setProperty(ParameterQueue.SERIALIZER_NAME, type);
-		env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
+		env.setProperty(ParameterQueue.PROXY_SERIALIZER, type);
+		env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false");
 
 		// Set info about where the message will be sent
@@ -59,8 +59,8 @@
 
 		// Get host info of rabbimq (where it is)
-		env.setProperty(ParameterQueue.SERVER_HOST, "127.0.0.1");
-		env.setProperty(ParameterQueue.SERVER_PORT, "5672");
+		env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
+		env.setProperty(ParameterQueue.RABBIT_PORT, "5672");
 		env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-		env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
+		env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false");
 
 		// Set info about where the message will be sent
Index: trunk/src/test/java/omq/test/observer/ObserverTest.java
===================================================================
--- trunk/src/test/java/omq/test/observer/ObserverTest.java	(revision 75)
+++ trunk/src/test/java/omq/test/observer/ObserverTest.java	(revision 77)
@@ -32,9 +32,9 @@
 
 		// Set host info of rabbimq (where it is)
-		env.setProperty(ParameterQueue.SERVER_HOST, "127.0.0.1");
-		env.setProperty(ParameterQueue.SERVER_PORT, "5672");
+		env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
+		env.setProperty(ParameterQueue.RABBIT_PORT, "5672");
 		env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-		env.setProperty(ParameterQueue.SERIALIZER_NAME, type);
-		env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
+		env.setProperty(ParameterQueue.PROXY_SERIALIZER, type);
+		env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false");
 
 		// Set info about where the message will be sent
@@ -62,8 +62,8 @@
 
 		// Get host info of rabbimq (where it is)
-		env.setProperty(ParameterQueue.SERVER_HOST, "127.0.0.1");
-		env.setProperty(ParameterQueue.SERVER_PORT, "5672");
+		env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
+		env.setProperty(ParameterQueue.RABBIT_PORT, "5672");
 		env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-		env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
+		env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false");
 
 		// Set info about where the message will be sent
Index: trunk/src/test/java/omq/test/serializer/CalculatorTest.java
===================================================================
--- trunk/src/test/java/omq/test/serializer/CalculatorTest.java	(revision 75)
+++ trunk/src/test/java/omq/test/serializer/CalculatorTest.java	(revision 77)
@@ -24,8 +24,8 @@
 
 		// Set host info of rabbimq (where it is)
-		env.setProperty(ParameterQueue.SERVER_HOST, "127.0.0.1");
-		env.setProperty(ParameterQueue.SERVER_PORT, "5672");
+		env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
+		env.setProperty(ParameterQueue.RABBIT_PORT, "5672");
 		env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-		env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
+		env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false");
 
 		// Set info about where the message will be sent
@@ -48,8 +48,8 @@
 
 		// Get host info of rabbimq (where it is)
-		env.setProperty(ParameterQueue.SERVER_HOST, "127.0.0.1");
-		env.setProperty(ParameterQueue.SERVER_PORT, "5672");
+		env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
+		env.setProperty(ParameterQueue.RABBIT_PORT, "5672");
 		env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-		env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
+		env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false");
 
 		// Set info about where the message will be sent
Index: trunk/src/test/java/omq/test/stopBroker/StopBrokerTest.java
===================================================================
--- trunk/src/test/java/omq/test/stopBroker/StopBrokerTest.java	(revision 75)
+++ trunk/src/test/java/omq/test/stopBroker/StopBrokerTest.java	(revision 77)
@@ -28,9 +28,9 @@
 
 		// Set host info of rabbimq (where it is)
-		env.setProperty(ParameterQueue.SERVER_HOST, "127.0.0.1");
-		env.setProperty(ParameterQueue.SERVER_PORT, "5672");
+		env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
+		env.setProperty(ParameterQueue.RABBIT_PORT, "5672");
 		env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-		env.setProperty(ParameterQueue.SERIALIZER_NAME, type);
-		env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
+		env.setProperty(ParameterQueue.PROXY_SERIALIZER, type);
+		env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false");
 
 		// Set info about where the message will be sent
@@ -60,8 +60,8 @@
 
 		// Get host info of rabbimq (where it is)
-		env.setProperty(ParameterQueue.SERVER_HOST, "127.0.0.1");
-		env.setProperty(ParameterQueue.SERVER_PORT, "5672");
+		env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
+		env.setProperty(ParameterQueue.RABBIT_PORT, "5672");
 		env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-		env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
+		env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false");
 
 		// Set info about where the message will be sent
Index: trunk/src/test/java/omq/test/stopBroker/UnbindTest.java
===================================================================
--- trunk/src/test/java/omq/test/stopBroker/UnbindTest.java	(revision 75)
+++ trunk/src/test/java/omq/test/stopBroker/UnbindTest.java	(revision 77)
@@ -18,8 +18,8 @@
 
 		// Get host info of rabbimq (where it is)
-		env.setProperty(ParameterQueue.SERVER_HOST, "127.0.0.1");
-		env.setProperty(ParameterQueue.SERVER_PORT, "5672");
+		env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
+		env.setProperty(ParameterQueue.RABBIT_PORT, "5672");
 		env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-		env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
+		env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false");
 
 		// Set info about where the message will be sent
Index: trunk/src/test/java/omq/test/temporal/ProvaTest.java
===================================================================
--- trunk/src/test/java/omq/test/temporal/ProvaTest.java	(revision 75)
+++ trunk/src/test/java/omq/test/temporal/ProvaTest.java	(revision 77)
@@ -30,8 +30,8 @@
 
 		// Get host info of rabbimq (where it is)
-		env.setProperty(ParameterQueue.SERVER_HOST, "127.0.0.1");
-		env.setProperty(ParameterQueue.SERVER_PORT, "5672");
+		env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
+		env.setProperty(ParameterQueue.RABBIT_PORT, "5672");
 		env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-		env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
+		env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false");
 
 		// Set info about where the message will be sent
@@ -56,9 +56,9 @@
 
 		// Set host info of rabbimq (where it is)
-		env.setProperty(ParameterQueue.SERVER_HOST, "127.0.0.1");
-		env.setProperty(ParameterQueue.SERVER_PORT, "5672");
+		env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
+		env.setProperty(ParameterQueue.RABBIT_PORT, "5672");
 		env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-		env.setProperty(ParameterQueue.SERIALIZER_NAME, type);
-		env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
+		env.setProperty(ParameterQueue.PROXY_SERIALIZER, type);
+		env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false");
 
 		// Set info about where the message will be sent
Index: trunk/src/test/java/omq/test/workspace/WorkspaceTest.java
===================================================================
--- trunk/src/test/java/omq/test/workspace/WorkspaceTest.java	(revision 75)
+++ trunk/src/test/java/omq/test/workspace/WorkspaceTest.java	(revision 77)
@@ -39,9 +39,9 @@
 
 		// Set host info of rabbimq (where it is)
-		env.setProperty(ParameterQueue.SERVER_HOST, "127.0.0.1");
-		env.setProperty(ParameterQueue.SERVER_PORT, "5672");
+		env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
+		env.setProperty(ParameterQueue.RABBIT_PORT, "5672");
 		env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-		env.setProperty(ParameterQueue.SERIALIZER_NAME, type);
-		env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
+		env.setProperty(ParameterQueue.PROXY_SERIALIZER, type);
+		env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false");
 
 		// Set info about where the message will be sent
@@ -69,8 +69,8 @@
 
 		// Get host info of rabbimq (where it is)
-		env.setProperty(ParameterQueue.SERVER_HOST, "127.0.0.1");
-		env.setProperty(ParameterQueue.SERVER_PORT, "5672");
+		env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
+		env.setProperty(ParameterQueue.RABBIT_PORT, "5672");
 		env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-		env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
+		env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false");
 
 		// Set info about where the message will be sent