Merge pull request #161 from caelum/ot-optional-serialization

XStream and Gson will scanned only if present
caelum · Oct 3, 2013 · a2dd51e · a2dd51e
2 parents 158c83e + d63ee84
commit a2dd51e
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/vraptor-core/src/main/resources/META-INF/beans.xml b/vraptor-core/src/main/resources/META-INF/beans.xml
@@ -34,6 +34,22 @@
 		<exclude name="br.com.caelum.vraptor.interceptor.multipart.NullMultipartInterceptor">
 			<if-class-available name="javax.servlet.http.Part"/>
 		</exclude>
+
+		<exclude name="br.com.caelum.vraptor.serialization.xstream.*">
+			<if-class-not-available name="com.thoughtworks.xstream.XStream"/>
+		</exclude>
+
+		<exclude name="br.com.caelum.vraptor.deserialization.xstream.*">
+			<if-class-not-available name="com.thoughtworks.xstream.XStream"/>
+		</exclude>
+
+		<exclude name="br.com.caelum.vraptor.serialization.gson.*">
+			<if-class-not-available name="com.google.gson.Gson"/>
+		</exclude>
+
+		<exclude name="br.com.caelum.vraptor.deserialization.gson.*">
+			<if-class-not-available name="com.google.gson.Gson"/>
+		</exclude>
 	</scan>
 
-</beans>
+</beans>