Index: /trunk/.settings/org.eclipse.m2e.core.prefs
===================================================================
--- /trunk/.settings/org.eclipse.m2e.core.prefs	(revision 61)
+++ /trunk/.settings/org.eclipse.m2e.core.prefs	(revision 62)
Index: /trunk/pom.xml
===================================================================
--- /trunk/pom.xml	(revision 61)
+++ /trunk/pom.xml	(revision 62)
@@ -4,5 +4,5 @@
 	<groupId>objectmq</groupId>
 	<artifactId>objectmq</artifactId>
-	<version>0.5.1</version>
+	<version>0.5.3</version>
 	<name>objectmq</name>
 	<description>Middleware based on AMQP</description>
@@ -108,7 +108,6 @@
 						<manifest>
 							<addClasspath>true</addClasspath>
-							<classpathPrefix>lib/</classpathPrefix>
 						</manifest>
-					</archive>
+					</archive>					
 				</configuration>
 			</plugin>
Index: /trunk/src/main/java/omq/client/proxy/Proxymq.java
===================================================================
--- /trunk/src/main/java/omq/client/proxy/Proxymq.java	(revision 61)
+++ /trunk/src/main/java/omq/client/proxy/Proxymq.java	(revision 62)
@@ -98,5 +98,5 @@
 
 		// set the serializer type
-		serializerType = env.getProperty(ParameterQueue.SERIALIZER_NAME, Serializer.java);
+		serializerType = env.getProperty(ParameterQueue.SERIALIZER_NAME, Serializer.JAVA);
 
 		listeners = new HashMap<String, EventListener<?>>();
Index: /trunk/src/main/java/omq/common/util/Serializer.java
===================================================================
--- /trunk/src/main/java/omq/common/util/Serializer.java	(revision 61)
+++ /trunk/src/main/java/omq/common/util/Serializer.java	(revision 62)
@@ -22,7 +22,7 @@
 	// private static final Logger logger =
 	// Logger.getLogger(Serializer.class.getName());
-	public static final String kryo = "kryo";
-	public static final String java = "java";
-	public static final String gson = "gson";
+	public static final String KRYO = "kryo";
+	public static final String JAVA = "java";
+	public static final String GSON = "gson";
 
 	// Client serializer
@@ -47,10 +47,10 @@
 		if (serializer == null) {
 			try {
-				String className = env.getProperty(ParameterQueue.SERIALIZER_NAME, Serializer.java);
-
+				String className = env.getProperty(ParameterQueue.SERIALIZER_NAME, Serializer.JAVA);
+				
 				if (className == null || className.isEmpty()) {
 					throw new ClassNotFoundException("Class name is null or empty.");
 				}
-
+				
 				serializer = getInstance(className);
 			} catch (Exception ex) {
@@ -62,16 +62,16 @@
 	}
 
-	public ISerializer getInstance(String type) throws SerializerException {
-		if (kryo.equals(type)) {
+	public ISerializer getInstance(String type) throws SerializerException {				
+		if (KRYO.equals(type)) {
 			if (kryoSerializer == null) {
 				kryoSerializer = new KryoImp();
 			}
 			return kryoSerializer;
-		} else if (gson.endsWith(type)) {
+		} else if (GSON.equals(type)) {
 			if (gsonSerializer == null) {
 				gsonSerializer = new GsonImp();
 			}
 			return gsonSerializer;
-		} else {
+		} else if (JAVA.equals(type)) {
 			if (javaSerializer == null) {
 				javaSerializer = new JavaImp();
@@ -79,4 +79,6 @@
 			return javaSerializer;
 		}
+		
+		throw new SerializerException("Serializer not found.");
 	}
 
Index: /trunk/src/main/java/omq/exception/SerializerException.java
===================================================================
--- /trunk/src/main/java/omq/exception/SerializerException.java	(revision 61)
+++ /trunk/src/main/java/omq/exception/SerializerException.java	(revision 62)
@@ -8,4 +8,8 @@
 	private static final long serialVersionUID = 1L;
 
+	public SerializerException(String message) {
+		super(message);
+	}	
+	
 	public SerializerException(String message, Throwable cause) {
 		super(message, cause);
Index: /trunk/src/test/java/omq/test/calculator/CalculatorTest.java
===================================================================
--- /trunk/src/test/java/omq/test/calculator/CalculatorTest.java	(revision 61)
+++ /trunk/src/test/java/omq/test/calculator/CalculatorTest.java	(revision 62)
@@ -53,5 +53,5 @@
 	@Parameters
 	public static Collection<Object[]> data() {
-		Object[][] data = new Object[][] { { Serializer.java }, { Serializer.gson }, { Serializer.kryo } };
+		Object[][] data = new Object[][] { { Serializer.JAVA }, { Serializer.GSON }, { Serializer.KRYO } };
 		return Arrays.asList(data);
 	}
Index: /trunk/src/test/java/omq/test/exception/ExceptionTest.java
===================================================================
--- /trunk/src/test/java/omq/test/exception/ExceptionTest.java	(revision 61)
+++ /trunk/src/test/java/omq/test/exception/ExceptionTest.java	(revision 62)
@@ -50,5 +50,5 @@
 	@Parameters
 	public static Collection<Object[]> data() {
-		Object[][] data = new Object[][] { { Serializer.java }, { Serializer.gson }, { Serializer.kryo } };
+		Object[][] data = new Object[][] { { Serializer.JAVA }, { Serializer.GSON }, { Serializer.KRYO } };
 		return Arrays.asList(data);
 	}
Index: /trunk/src/test/java/omq/test/faultTolerance/FaultToleranceTest.java
===================================================================
--- /trunk/src/test/java/omq/test/faultTolerance/FaultToleranceTest.java	(revision 61)
+++ /trunk/src/test/java/omq/test/faultTolerance/FaultToleranceTest.java	(revision 62)
@@ -53,5 +53,5 @@
 	@Parameters
 	public static Collection<Object[]> data() {
-		Object[][] data = new Object[][] { { Serializer.java }, { Serializer.gson }, { Serializer.kryo } };
+		Object[][] data = new Object[][] { { Serializer.JAVA }, { Serializer.GSON }, { Serializer.KRYO } };
 		return Arrays.asList(data);
 	}
Index: /trunk/src/test/java/omq/test/multiProcess/MultiProcessTest.java
===================================================================
--- /trunk/src/test/java/omq/test/multiProcess/MultiProcessTest.java	(revision 61)
+++ /trunk/src/test/java/omq/test/multiProcess/MultiProcessTest.java	(revision 62)
@@ -49,5 +49,5 @@
 	@Parameters
 	public static Collection<Object[]> data() {
-		Object[][] data = new Object[][] { { Serializer.java }, { Serializer.gson }, { Serializer.kryo } };
+		Object[][] data = new Object[][] { { Serializer.JAVA }, { Serializer.GSON }, { Serializer.KRYO } };
 		return Arrays.asList(data);
 	}
Index: /trunk/src/test/java/omq/test/stopBroker/StopBrokerTest.java
===================================================================
--- /trunk/src/test/java/omq/test/stopBroker/StopBrokerTest.java	(revision 61)
+++ /trunk/src/test/java/omq/test/stopBroker/StopBrokerTest.java	(revision 62)
@@ -50,5 +50,5 @@
 	@Parameters
 	public static Collection<Object[]> data() {
-		Object[][] data = new Object[][] { { Serializer.java }, { Serializer.gson }, { Serializer.kryo } };
+		Object[][] data = new Object[][] { { Serializer.JAVA }, { Serializer.GSON }, { Serializer.KRYO } };
 		return Arrays.asList(data);
 	}
Index: /trunk/src/test/java/omq/test/temporal/ProvaTest.java
===================================================================
--- /trunk/src/test/java/omq/test/temporal/ProvaTest.java	(revision 61)
+++ /trunk/src/test/java/omq/test/temporal/ProvaTest.java	(revision 62)
@@ -77,5 +77,5 @@
 	@Parameters
 	public static Collection<Object[]> data() {
-		Object[][] data = new Object[][] { { Serializer.java } /*
+		Object[][] data = new Object[][] { { Serializer.JAVA } /*
 																 * , {
 																 * Serializer