From 5d986abfb6ce010b80129cd687b134ff4a464384 Mon Sep 17 00:00:00 2001
From: Assistenza GS <assistenza@galeso-software.it>
Date: Mon, 7 Oct 2019 10:23:43 +0200
Subject: [PATCH 1/2] Upgrade spring-flex-core to Java 8 version (remove
 JdkVersion class on check about Java version and alignment about method
 signature)

---
 spring-flex-core/pom.xml                      |  33 +--
 .../flex/config/FlexConfigurationManager.java |   7 +-
 .../flex/http/AmfHttpMessageConverter.java    |   7 +
 .../flex/security3/AntPathRequestMatcher.java |   2 +-
 .../flex/security3/EndpointInterceptor.java   |   5 +-
 .../EndpointSecurityMetadataSource.java       |   2 +-
 .../SecurityConfigurationPostProcessor.java   |   9 +-
 .../security3/EndpointInterceptorTests.java   |   6 +-
 .../EndpointSecurityIntegrationTests.java     |  14 +-
 .../EndpointSecurityMetadataSourceTests.java  |   2 +-
 .../LoginMessageInterceptorTests.java         |   4 +-
 .../SpringSecurityLoginCommandTests.java      |  24 +-
 .../test/resources/custom-services-config.xml |  51 ++--
 .../flex/config/security-context.xml          |   4 +-
 .../flex/config/services-config.xml           | 180 +++++++-------
 .../flex/core/services-config-4.6.xml         |  22 ++
 .../flex/core/services-config.xml             | 192 ++++++++-------
 .../test/resources/custom-services-config.xml |  15 ++
 .../hibernate3/config/services-config.xml     | 158 +++++++------
 .../hibernate3/core/services-config-4.6.xml   |  22 ++
 .../flex/hibernate3/core/services-config.xml  |  22 ++
 .../test/resources/custom-services-config.xml |  37 ++-
 .../hibernate4/config/services-config.xml     |  22 ++
 .../hibernate4/core/services-config-4.6.xml   |  22 ++
 .../flex/hibernate4/core/services-config.xml  |  22 ++
 .../webapp/WEB-INF/flex/services-config.xml   |  31 +++
 spring-flex-parent/pom.xml                    |  51 ++--
 .../webapp/WEB-INF/flex/services-config.xml   | 219 ++++++++++--------
 28 files changed, 758 insertions(+), 427 deletions(-)

diff --git a/spring-flex-core/pom.xml b/spring-flex-core/pom.xml
index 6206a0d6..57d3f13b 100644
--- a/spring-flex-core/pom.xml
+++ b/spring-flex-core/pom.xml
@@ -53,6 +53,7 @@
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
+			<version>3.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.annotation</groupId>
@@ -94,22 +95,22 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.adobe.blazeds</groupId>
-			<artifactId>blazeds-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.adobe.blazeds</groupId>
-			<artifactId>blazeds-common</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.adobe.blazeds</groupId>
-			<artifactId>blazeds-proxy</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.adobe.blazeds</groupId>
-			<artifactId>blazeds-remoting</artifactId>
-		</dependency>
+ 		<dependency>
+            <groupId>org.apache.flex.blazeds</groupId>
+            <artifactId>flex-messaging-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flex.blazeds</groupId>
+            <artifactId>flex-messaging-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flex.blazeds</groupId>
+            <artifactId>flex-messaging-proxy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flex.blazeds</groupId>
+            <artifactId>flex-messaging-remoting</artifactId>
+        </dependency>
 		<dependency>
 			<groupId>javax.jms</groupId>
 			<artifactId>jms-api</artifactId>
diff --git a/spring-flex-core/src/main/java/org/springframework/flex/config/FlexConfigurationManager.java b/spring-flex-core/src/main/java/org/springframework/flex/config/FlexConfigurationManager.java
index 59ebe2e6..20067be9 100755
--- a/spring-flex-core/src/main/java/org/springframework/flex/config/FlexConfigurationManager.java
+++ b/spring-flex-core/src/main/java/org/springframework/flex/config/FlexConfigurationManager.java
@@ -36,7 +36,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.context.ResourceLoaderAware;
-import org.springframework.core.JdkVersion;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.io.support.ResourcePatternResolver;
@@ -98,7 +97,11 @@ public FlexConfigurationManager(ResourceLoader resourceLoader, String configurat
      */
     @SuppressWarnings("unchecked")
     public MessagingConfiguration getMessagingConfiguration(ServletConfig servletConfig) {
-        Assert.isTrue(JdkVersion.getMajorJavaVersion() >= JdkVersion.JAVA_15, "Spring BlazeDS Integration requires a minimum of Java 1.5");
+    	String[] javaVersionElements = System.getProperty("java.version").split("\\.");
+		int major = Integer.parseInt(javaVersionElements[1]);
+		
+        Assert.isTrue(major >= 5, "Spring BlazeDS Integration requires a minimum of Java 1.5");
+
         Assert.notNull(servletConfig, "FlexConfigurationManager requires a non-null ServletConfig - "
             + "Is it being used outside a WebApplicationContext?");
 
diff --git a/spring-flex-core/src/main/java/org/springframework/flex/http/AmfHttpMessageConverter.java b/spring-flex-core/src/main/java/org/springframework/flex/http/AmfHttpMessageConverter.java
index 0016c3e6..3770ad5f 100644
--- a/spring-flex-core/src/main/java/org/springframework/flex/http/AmfHttpMessageConverter.java
+++ b/spring-flex-core/src/main/java/org/springframework/flex/http/AmfHttpMessageConverter.java
@@ -41,6 +41,7 @@
 import flex.messaging.io.amf.AmfMessageDeserializer;
 import flex.messaging.io.amf.AmfMessageSerializer;
 import flex.messaging.io.amf.AmfTrace;
+import flex.messaging.validators.DeserializationValidator;
 
 /**
  * Implementation of {@link org.springframework.http.converter.HttpMessageConverter HttpMessageConverter}
@@ -59,10 +60,16 @@ public class AmfHttpMessageConverter extends AbstractHttpMessageConverter<Object
 	private static final String ACTION_MSG_ERROR = "Could not read input message body as "+ActionMessage.class.getName();
 	private static final Log log = LogFactory.getLog(AmfHttpMessageConverter.class);
     
+	private DeserializationValidator deserializationValidator;
+	
     public AmfHttpMessageConverter() {
         super(MediaType.parseMediaType(MessageIOConstants.AMF_CONTENT_TYPE));
     }
 
+	public void setDeserializationValidator(DeserializationValidator deserializationValidator) {
+		this.deserializationValidator = deserializationValidator;
+	}
+	
     /**
      * {@inheritDoc}
      */
diff --git a/spring-flex-core/src/main/java/org/springframework/flex/security3/AntPathRequestMatcher.java b/spring-flex-core/src/main/java/org/springframework/flex/security3/AntPathRequestMatcher.java
index 62d98e57..94f19be5 100644
--- a/spring-flex-core/src/main/java/org/springframework/flex/security3/AntPathRequestMatcher.java
+++ b/spring-flex-core/src/main/java/org/springframework/flex/security3/AntPathRequestMatcher.java
@@ -20,7 +20,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.security.web.util.RequestMatcher;
+import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.util.Assert;
 
diff --git a/spring-flex-core/src/main/java/org/springframework/flex/security3/EndpointInterceptor.java b/spring-flex-core/src/main/java/org/springframework/flex/security3/EndpointInterceptor.java
index c0acb55a..11e2b903 100644
--- a/spring-flex-core/src/main/java/org/springframework/flex/security3/EndpointInterceptor.java
+++ b/spring-flex-core/src/main/java/org/springframework/flex/security3/EndpointInterceptor.java
@@ -110,11 +110,10 @@ public void setObjectDefinitionSource(EndpointSecurityMetadataSource newSource)
     }
 
 	private void configureDefaultAccessDecisionManager() {
-        AffirmativeBased adm = new AffirmativeBased();
-        List<AccessDecisionVoter> voters = new ArrayList<AccessDecisionVoter>();
+		List<AccessDecisionVoter<? extends Object>> voters = new ArrayList<AccessDecisionVoter<? extends Object>>();
         voters.add(new RoleVoter());
         voters.add(new AuthenticatedVoter());
-        adm.setDecisionVoters(voters);
+        AffirmativeBased adm = new AffirmativeBased(voters);
         setAccessDecisionManager(adm);
     }
     
diff --git a/spring-flex-core/src/main/java/org/springframework/flex/security3/EndpointSecurityMetadataSource.java b/spring-flex-core/src/main/java/org/springframework/flex/security3/EndpointSecurityMetadataSource.java
index fe44d02d..593f7dc0 100644
--- a/spring-flex-core/src/main/java/org/springframework/flex/security3/EndpointSecurityMetadataSource.java
+++ b/spring-flex-core/src/main/java/org/springframework/flex/security3/EndpointSecurityMetadataSource.java
@@ -29,7 +29,7 @@
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityMetadataSource;
 import org.springframework.security.web.access.intercept.DefaultFilterInvocationSecurityMetadataSource;
-import org.springframework.security.web.util.RequestMatcher;
+import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.util.Assert;
 
 import flex.messaging.FlexContext;
diff --git a/spring-flex-core/src/main/java/org/springframework/flex/security3/SecurityConfigurationPostProcessor.java b/spring-flex-core/src/main/java/org/springframework/flex/security3/SecurityConfigurationPostProcessor.java
index f989029c..1caf13a9 100644
--- a/spring-flex-core/src/main/java/org/springframework/flex/security3/SecurityConfigurationPostProcessor.java
+++ b/spring-flex-core/src/main/java/org/springframework/flex/security3/SecurityConfigurationPostProcessor.java
@@ -38,6 +38,7 @@
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.flex.core.ExceptionTranslator;
 import org.springframework.security.web.FilterChainProxy;
+import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.RememberMeServices;
 import org.springframework.security.web.authentication.logout.LogoutHandler;
 import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
@@ -157,9 +158,11 @@ private static final class FilterChainAccessor {
     	public FilterChainAccessor(FilterChainProxy proxy) {    		
     		this.filters = new LinkedHashSet<Filter>();
 
-            for (List<Filter> filters : proxy.getFilterChainMap().values()) {
-                this.filters.addAll(filters);
-            }
+    		List<SecurityFilterChain> mappings = proxy.getFilterChains();
+    		for(SecurityFilterChain entry : mappings) {
+    			List<Filter> filters = entry.getFilters();
+    			this.filters.addAll(filters);
+    		}
     	}
     	
     	public Set<Filter> getFilters() {
diff --git a/spring-flex-core/src/test/java/org/springframework/flex/security3/EndpointInterceptorTests.java b/spring-flex-core/src/test/java/org/springframework/flex/security3/EndpointInterceptorTests.java
index 64be05d1..feadf5ce 100644
--- a/spring-flex-core/src/test/java/org/springframework/flex/security3/EndpointInterceptorTests.java
+++ b/spring-flex-core/src/test/java/org/springframework/flex/security3/EndpointInterceptorTests.java
@@ -44,9 +44,9 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.web.util.RequestMatcher;
+import org.springframework.security.web.util.matcher.RequestMatcher;
 
 import flex.messaging.FlexContext;
 import flex.messaging.endpoints.AbstractEndpoint;
@@ -124,7 +124,7 @@ public void serviceAuthorized() throws Exception {
         when(this.endpoint.serviceMessage(this.inMessage)).thenReturn(this.outMessage);
 
         List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
-        authorities.add(new GrantedAuthorityImpl("ROLE_USER"));
+        authorities.add(new SimpleGrantedAuthority("ROLE_USER"));
         Authentication auth = new UsernamePasswordAuthenticationToken("foo", "bar", authorities);
         SecurityContextHolder.getContext().setAuthentication(auth);
 
diff --git a/spring-flex-core/src/test/java/org/springframework/flex/security3/EndpointSecurityIntegrationTests.java b/spring-flex-core/src/test/java/org/springframework/flex/security3/EndpointSecurityIntegrationTests.java
index 2cdb3a76..4b271941 100644
--- a/spring-flex-core/src/test/java/org/springframework/flex/security3/EndpointSecurityIntegrationTests.java
+++ b/spring-flex-core/src/test/java/org/springframework/flex/security3/EndpointSecurityIntegrationTests.java
@@ -48,9 +48,9 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.web.util.RequestMatcher;
+import org.springframework.security.web.util.matcher.RequestMatcher;
 
 import flex.messaging.FlexContext;
 import flex.messaging.MessageBroker;
@@ -65,7 +65,7 @@ public class EndpointSecurityIntegrationTests extends AbstractMessageBrokerTests
 
     private EndpointSecurityMetadataSource source;
 
-    private final AccessDecisionManager adm = new AffirmativeBased();
+    private AccessDecisionManager adm;
 
     @Mock
     private AuthenticationManager mgr;
@@ -85,10 +85,10 @@ public void setUp() throws Exception {
         requestMap.put(new AntPathRequestMatcher("/messagebroker/**"), attrs);
         this.source = new EndpointSecurityMetadataSource(requestMap);
 
-        List<AccessDecisionVoter> voters = new ArrayList<AccessDecisionVoter>();
+        List<AccessDecisionVoter<? extends Object>> voters = new ArrayList<AccessDecisionVoter<? extends Object>>();
         voters.add(new RoleVoter());
-        ((AffirmativeBased) this.adm).setDecisionVoters(voters);
-
+        this.adm = new AffirmativeBased(voters);
+        
         initializeInterceptors();
         
         this.request = new MockHttpServletRequest();
@@ -103,7 +103,7 @@ public void tearDown() {
     @Test
     public void serviceAuthorized() throws Exception {
         List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
-        authorities.add(new GrantedAuthorityImpl("ROLE_USER"));
+        authorities.add(new SimpleGrantedAuthority("ROLE_USER"));
         Authentication auth = new UsernamePasswordAuthenticationToken("foo", "bar", authorities);
         SecurityContextHolder.getContext().setAuthentication(auth);
 
diff --git a/spring-flex-core/src/test/java/org/springframework/flex/security3/EndpointSecurityMetadataSourceTests.java b/spring-flex-core/src/test/java/org/springframework/flex/security3/EndpointSecurityMetadataSourceTests.java
index df3a2fb7..ca4741f5 100644
--- a/spring-flex-core/src/test/java/org/springframework/flex/security3/EndpointSecurityMetadataSourceTests.java
+++ b/spring-flex-core/src/test/java/org/springframework/flex/security3/EndpointSecurityMetadataSourceTests.java
@@ -33,7 +33,7 @@
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityConfig;
-import org.springframework.security.web.util.RequestMatcher;
+import org.springframework.security.web.util.matcher.RequestMatcher;
 
 import flex.messaging.FlexContext;
 import flex.messaging.endpoints.AMFEndpoint;
diff --git a/spring-flex-core/src/test/java/org/springframework/flex/security3/LoginMessageInterceptorTests.java b/spring-flex-core/src/test/java/org/springframework/flex/security3/LoginMessageInterceptorTests.java
index 41823771..52356d06 100644
--- a/spring-flex-core/src/test/java/org/springframework/flex/security3/LoginMessageInterceptorTests.java
+++ b/spring-flex-core/src/test/java/org/springframework/flex/security3/LoginMessageInterceptorTests.java
@@ -29,7 +29,7 @@
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 import flex.messaging.messages.AcknowledgeMessage;
@@ -62,7 +62,7 @@ public void postProcessPassThrough() {
     @SuppressWarnings("rawtypes")
     public void postProcessSuccessfulLogin() {
         List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
-        authorities.add(new GrantedAuthorityImpl("ROLE_USER"));
+        authorities.add(new SimpleGrantedAuthority("ROLE_USER"));
         Authentication auth = new UsernamePasswordAuthenticationToken("foo", "bar", authorities);
         SecurityContextHolder.getContext().setAuthentication(auth);
 
diff --git a/spring-flex-core/src/test/java/org/springframework/flex/security3/SpringSecurityLoginCommandTests.java b/spring-flex-core/src/test/java/org/springframework/flex/security3/SpringSecurityLoginCommandTests.java
index ddf099c3..f8cec838 100644
--- a/spring-flex-core/src/test/java/org/springframework/flex/security3/SpringSecurityLoginCommandTests.java
+++ b/spring-flex-core/src/test/java/org/springframework/flex/security3/SpringSecurityLoginCommandTests.java
@@ -16,10 +16,13 @@
 
 package org.springframework.flex.security3;
 
-import org.junit.After;
-import static org.junit.Assert.*;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -28,6 +31,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.springframework.flex.core.AbstractMessageBrokerTests;
@@ -40,7 +46,7 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
@@ -127,8 +133,8 @@ public void validLogin() throws Exception {
     @Test
     public void matchingAuthority() throws Exception {
         List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
-        authorities.add(new GrantedAuthorityImpl("ROLE_USER"));
-        authorities.add(new GrantedAuthorityImpl("ROLE_ABUSER"));
+        authorities.add(new SimpleGrantedAuthority("ROLE_USER"));
+        authorities.add(new SimpleGrantedAuthority("ROLE_ABUSER"));
         Principal principal = new UsernamePasswordAuthenticationToken("foo", "bar", authorities);
 
         List<String> roles = new ArrayList<String>();
@@ -140,8 +146,8 @@ public void matchingAuthority() throws Exception {
     @Test
     public void noMatchingAuthority() throws Exception {
         List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
-        authorities.add(new GrantedAuthorityImpl("ROLE_USER"));
-        authorities.add(new GrantedAuthorityImpl("ROLE_ABUSER"));
+        authorities.add(new SimpleGrantedAuthority("ROLE_USER"));
+        authorities.add(new SimpleGrantedAuthority("ROLE_ABUSER"));
         Principal principal = new UsernamePasswordAuthenticationToken("foo", "bar", authorities);
 
         List<String> roles = new ArrayList<String>();
diff --git a/spring-flex-core/src/test/resources/custom-services-config.xml b/spring-flex-core/src/test/resources/custom-services-config.xml
index 4143a274..7112ce75 100755
--- a/spring-flex-core/src/test/resources/custom-services-config.xml
+++ b/spring-flex-core/src/test/resources/custom-services-config.xml
@@ -1,16 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<services-config>
-
-    <services>
-        <service-include file-path="custom-remoting-config.xml" />      
-    </services> 
-
-    <channels>
-
-        <channel-definition id="my-custom-path-channel" class="mx.messaging.channels.AMFChannel">
-            <endpoint url="http://{server.name}:{server.port}/{context.root}/messagebroker/amf" class="flex.messaging.endpoints.AMFEndpoint"/>
-        </channel-definition>
-
-     </channels>
-
-</services-config>
+<?xml version="1.0" encoding="UTF-8"?>
+<services-config>
+
+    <services>
+        <service-include file-path="custom-remoting-config.xml" />      
+    </services> 
+
+	<channels>
+
+		<channel-definition id="my-custom-path-channel"
+			class="mx.messaging.channels.AMFChannel">
+			<endpoint
+				url="http://{server.name}:{server.port}/{context.root}/messagebroker/amf"
+				class="flex.messaging.endpoints.AMFEndpoint" />
+			<properties>
+				<serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+			</properties>
+		</channel-definition>
+
+	</channels>
+	
+	<validators>
+		<validator
+			class="flex.messaging.validators.ClassDeserializationValidator">
+			<properties>
+				<allow-classes>
+					<class name="org.*" />
+				</allow-classes>
+			</properties>
+		</validator>
+	</validators>
+
+</services-config>
diff --git a/spring-flex-core/src/test/resources/org/springframework/flex/config/security-context.xml b/spring-flex-core/src/test/resources/org/springframework/flex/config/security-context.xml
index ac097b00..f346000d 100644
--- a/spring-flex-core/src/test/resources/org/springframework/flex/config/security-context.xml
+++ b/spring-flex-core/src/test/resources/org/springframework/flex/config/security-context.xml
@@ -2,9 +2,9 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:security="http://www.springframework.org/schema/security"
   xsi:schemaLocation="http://www.springframework.org/schema/beans 
-  			  http://www.springframework.org/schema/beans/spring-beans.xsd
+  			  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
   			  http://www.springframework.org/schema/security
-              http://www.springframework.org/schema/security/spring-security-3.2.xsd">
+              http://www.springframework.org/schema/security/spring-security.xsd">
 
 	<security:http entry-point-ref="testEntryPoint">
 		<security:form-login/>
diff --git a/spring-flex-core/src/test/resources/org/springframework/flex/config/services-config.xml b/spring-flex-core/src/test/resources/org/springframework/flex/config/services-config.xml
index 752ac9da..4c0d5426 100755
--- a/spring-flex-core/src/test/resources/org/springframework/flex/config/services-config.xml
+++ b/spring-flex-core/src/test/resources/org/springframework/flex/config/services-config.xml
@@ -1,82 +1,98 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<services-config>
-
-	<channels>
-
-		<channel-definition id="my-amf"
-			class="mx.messaging.channels.AMFChannel">
-			<endpoint
-				url="http://{server.name}:{server.port}/{context.root}/messagebroker/amf"
-				class="flex.messaging.endpoints.AMFEndpoint" />
-		</channel-definition>
-
-		<channel-definition id="my-secure-amf"
-			class="mx.messaging.channels.SecureAMFChannel">
-			<endpoint
-				url="https://{server.name}:{server.port}/{context.root}/messagebroker/amfsecure"
-				class="flex.messaging.endpoints.SecureAMFEndpoint" />
-			<properties>
-				<add-no-cache-headers>false</add-no-cache-headers>
-			</properties>
-		</channel-definition>
-
-		<channel-definition id="my-polling-amf"
-			class="mx.messaging.channels.AMFChannel">
-			<endpoint
-				url="http://{server.name}:{server.port}/{context.root}/messagebroker/amfpolling"
-				class="flex.messaging.endpoints.AMFEndpoint" />
-			<properties>
-				<polling-enabled>true</polling-enabled>
-				<polling-interval-seconds>4</polling-interval-seconds>
-			</properties>
-		</channel-definition>
-
-		<!--
-			<channel-definition id="my-http"
-			class="mx.messaging.channels.HTTPChannel"> <endpoint
-			url="http://{server.name}:{server.port}/{context.root}/messagebroker/http"
-			class="flex.messaging.endpoints.HTTPEndpoint"/> </channel-definition>
-
-			<channel-definition id="my-secure-http"
-			class="mx.messaging.channels.SecureHTTPChannel"> <endpoint
-			url="https://{server.name}:{server.port}/{context.root}/messagebroker/httpsecure"
-			class="flex.messaging.endpoints.SecureHTTPEndpoint"/> <properties>
-			<add-no-cache-headers>false</add-no-cache-headers> </properties>
-			</channel-definition>
-		-->
-	</channels>
-
-	<logging>
-		<target class="flex.messaging.log.ConsoleTarget" level="Error">
-			<properties>
-				<prefix>[BlazeDS] </prefix>
-				<includeDate>false</includeDate>
-				<includeTime>false</includeTime>
-				<includeLevel>false</includeLevel>
-				<includeCategory>false</includeCategory>
-			</properties>
-			<filters>
-				<pattern>Endpoint.*</pattern>
-				<pattern>Service.*</pattern>
-				<pattern>Configuration</pattern>
-			</filters>
-		</target>
-	</logging>
-
-	<security>
-		<security-constraint id="fooConstraint">
-			<roles>
-				<role>guests</role>
-				<role>accountants</role>
-				<role>employees</role>
-				<role>managers</role>
-			</roles>
-		</security-constraint>
-		<security-constraint id="barConstraint">
-			<roles>
-				<role>sampleusers</role>
-			</roles>
-		</security-constraint>
-	</security>
-
-</services-config>
+<?xml version="1.0" encoding="UTF-8"?>
+<services-config>
+
+	<channels>
+
+		<channel-definition id="my-amf"
+			class="mx.messaging.channels.AMFChannel">
+			<endpoint
+				url="http://{server.name}:{server.port}/{context.root}/messagebroker/amf"
+				class="flex.messaging.endpoints.AMFEndpoint" />
+			<properties>
+				<serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+			</properties>
+		</channel-definition>
+
+		<channel-definition id="my-secure-amf"
+			class="mx.messaging.channels.SecureAMFChannel">
+			<endpoint
+				url="https://{server.name}:{server.port}/{context.root}/messagebroker/amfsecure"
+				class="flex.messaging.endpoints.SecureAMFEndpoint" />
+			<properties>
+				<add-no-cache-headers>false</add-no-cache-headers>
+				<serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+			</properties>
+		</channel-definition>
+
+		<channel-definition id="my-polling-amf"
+			class="mx.messaging.channels.AMFChannel">
+			<endpoint
+				url="http://{server.name}:{server.port}/{context.root}/messagebroker/amfpolling"
+				class="flex.messaging.endpoints.AMFEndpoint" />
+			<properties>
+				<polling-enabled>true</polling-enabled>
+				<polling-interval-seconds>4</polling-interval-seconds>
+				<serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+			</properties>
+		</channel-definition>
+
+		<!-- <channel-definition id="my-http" class="mx.messaging.channels.HTTPChannel"> 
+			<endpoint url="http://{server.name}:{server.port}/{context.root}/messagebroker/http" 
+			class="flex.messaging.endpoints.HTTPEndpoint"/> </channel-definition> <channel-definition 
+			id="my-secure-http" class="mx.messaging.channels.SecureHTTPChannel"> <endpoint 
+			url="https://{server.name}:{server.port}/{context.root}/messagebroker/httpsecure" 
+			class="flex.messaging.endpoints.SecureHTTPEndpoint"/> <properties> <add-no-cache-headers>false</add-no-cache-headers> 
+			</properties> </channel-definition> -->
+	</channels>
+
+	<logging>
+		<target class="flex.messaging.log.ConsoleTarget" level="Error">
+			<properties>
+				<prefix>[BlazeDS] </prefix>
+				<includeDate>false</includeDate>
+				<includeTime>false</includeTime>
+				<includeLevel>false</includeLevel>
+				<includeCategory>false</includeCategory>
+			</properties>
+			<filters>
+				<pattern>Endpoint.*</pattern>
+				<pattern>Service.*</pattern>
+				<pattern>Configuration</pattern>
+			</filters>
+		</target>
+	</logging>
+
+	<validators>
+		<validator
+			class="flex.messaging.validators.ClassDeserializationValidator">
+			<properties>
+				<allow-classes>
+					<class name="org.*" />
+				</allow-classes>
+			</properties>
+		</validator>
+	</validators>
+	
+	<security>
+		<security-constraint id="fooConstraint">
+			<roles>
+				<role>guests</role>
+				<role>accountants</role>
+				<role>employees</role>
+				<role>managers</role>
+			</roles>
+		</security-constraint>
+		<security-constraint id="barConstraint">
+			<roles>
+				<role>sampleusers</role>
+			</roles>
+		</security-constraint>
+	</security>
+
+</services-config>
diff --git a/spring-flex-core/src/test/resources/org/springframework/flex/core/services-config-4.6.xml b/spring-flex-core/src/test/resources/org/springframework/flex/core/services-config-4.6.xml
index 92385da5..11adb7ec 100644
--- a/spring-flex-core/src/test/resources/org/springframework/flex/core/services-config-4.6.xml
+++ b/spring-flex-core/src/test/resources/org/springframework/flex/core/services-config-4.6.xml
@@ -19,12 +19,20 @@
 
         <channel-definition id="my-amf" class="mx.messaging.channels.AMFChannel">
             <endpoint url="http://{server.name}:{server.port}/{context.root}/messagebroker/amf" class="flex.messaging.endpoints.AMFEndpoint"/>
+            <properties>
+				<serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+			</properties>
         </channel-definition>
 
         <channel-definition id="my-secure-amf" class="mx.messaging.channels.SecureAMFChannel">
             <endpoint url="https://{server.name}:{server.port}/{context.root}/messagebroker/amfsecure" class="flex.messaging.endpoints.SecureAMFEndpoint"/>
             <properties>
                 <add-no-cache-headers>false</add-no-cache-headers>
+                <serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
             </properties>
         </channel-definition>
 
@@ -33,6 +41,9 @@
             <properties>
                 <polling-enabled>true</polling-enabled>
                 <polling-interval-seconds>4</polling-interval-seconds>
+                <serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
             </properties>
         </channel-definition>
         
@@ -58,6 +69,17 @@
         </target>
     </logging>
 
+	<validators>
+		<validator
+			class="flex.messaging.validators.ClassDeserializationValidator">
+			<properties>
+				<allow-classes>
+					<class name="org.*" />
+				</allow-classes>
+			</properties>
+		</validator>
+	</validators>
+	
     <system>
         <redeploy>
             <enabled>false</enabled>
diff --git a/spring-flex-core/src/test/resources/org/springframework/flex/core/services-config.xml b/spring-flex-core/src/test/resources/org/springframework/flex/core/services-config.xml
index be048178..ce27b355 100755
--- a/spring-flex-core/src/test/resources/org/springframework/flex/core/services-config.xml
+++ b/spring-flex-core/src/test/resources/org/springframework/flex/core/services-config.xml
@@ -1,85 +1,107 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<services-config>
-
-    <services>
-        <service-include file-path="remoting-config.xml" />
-        <service-include file-path="proxy-config.xml" />
-        <service-include file-path="messaging-config.xml" />      
-    </services> 
-    
-    <security>
-	    <security-constraint id="spring-security-users">
-	        <roles>
-	            <role>ROLE_USER</role>
-	        </roles>
-	    </security-constraint>
-	</security>
-
-    <channels>
-
-        <channel-definition id="my-amf" class="mx.messaging.channels.AMFChannel">
-            <endpoint url="http://{server.name}:{server.port}/{context.root}/messagebroker/amf" class="flex.messaging.endpoints.AMFEndpoint"/>
-        </channel-definition>
-
-        <channel-definition id="my-secure-amf" class="mx.messaging.channels.SecureAMFChannel">
-            <endpoint url="https://{server.name}:{server.port}/{context.root}/messagebroker/amfsecure" class="flex.messaging.endpoints.SecureAMFEndpoint"/>
-            <properties>
-                <add-no-cache-headers>false</add-no-cache-headers>
-            </properties>
-        </channel-definition>
-
-        <channel-definition id="my-polling-amf" class="mx.messaging.channels.AMFChannel">
-            <endpoint url="http://{server.name}:{server.port}/{context.root}/messagebroker/amfpolling" class="flex.messaging.endpoints.AMFEndpoint"/>
-            <properties>
-                <polling-enabled>true</polling-enabled>
-                <polling-interval-seconds>4</polling-interval-seconds>
-            </properties>
-        </channel-definition>
-
-        <!--
-        <channel-definition id="my-http" class="mx.messaging.channels.HTTPChannel">
-            <endpoint url="http://{server.name}:{server.port}/{context.root}/messagebroker/http" class="flex.messaging.endpoints.HTTPEndpoint"/>
-        </channel-definition>
-
-        <channel-definition id="my-secure-http" class="mx.messaging.channels.SecureHTTPChannel">
-            <endpoint url="https://{server.name}:{server.port}/{context.root}/messagebroker/httpsecure" class="flex.messaging.endpoints.SecureHTTPEndpoint"/>
-            <properties>
-                <add-no-cache-headers>false</add-no-cache-headers>
-            </properties>
-        </channel-definition>
-        -->
-    </channels>
-
-    <logging>
-        <target class="flex.messaging.log.ConsoleTarget" level="Error">
-            <properties>
-                <prefix>[BlazeDS] </prefix>
-                <includeDate>false</includeDate>
-                <includeTime>false</includeTime>
-                <includeLevel>false</includeLevel>
-                <includeCategory>false</includeCategory>
-            </properties>
-            <filters>
-                <pattern>Endpoint.*</pattern>
-                <pattern>Service.*</pattern>
-                <pattern>Configuration</pattern>
-            </filters>
-        </target>
-    </logging>
-
-    <system>
-        <redeploy>
-            <enabled>false</enabled>
-            <!-- 
-            <watch-interval>20</watch-interval>
-            <watch-file>{context.root}/WEB-INF/flex/services-config.xml</watch-file>
-            <watch-file>{context.root}/WEB-INF/flex/proxy-config.xml</watch-file>
-            <watch-file>{context.root}/WEB-INF/flex/remoting-config.xml</watch-file>
-            <watch-file>{context.root}/WEB-INF/flex/messaging-config.xml</watch-file>
-            <watch-file>{context.root}/WEB-INF/flex/data-management-config.xml</watch-file>
-            <touch-file>{context.root}/WEB-INF/web.xml</touch-file>
-             -->
-        </redeploy>
-    </system>
-
-</services-config>
+<?xml version="1.0" encoding="UTF-8"?>
+<services-config>
+
+    <services>
+        <service-include file-path="remoting-config.xml" />
+        <service-include file-path="proxy-config.xml" />
+        <service-include file-path="messaging-config.xml" />      
+    </services> 
+    
+    <security>
+	    <security-constraint id="spring-security-users">
+	        <roles>
+	            <role>ROLE_USER</role>
+	        </roles>
+	    </security-constraint>
+	</security>
+
+    <channels>
+
+        <channel-definition id="my-amf" class="mx.messaging.channels.AMFChannel">
+            <endpoint url="http://{server.name}:{server.port}/{context.root}/messagebroker/amf" class="flex.messaging.endpoints.AMFEndpoint"/>
+            <properties>
+				<serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+			</properties>
+        </channel-definition>
+
+        <channel-definition id="my-secure-amf" class="mx.messaging.channels.SecureAMFChannel">
+            <endpoint url="https://{server.name}:{server.port}/{context.root}/messagebroker/amfsecure" class="flex.messaging.endpoints.SecureAMFEndpoint"/>
+            <properties>
+                <add-no-cache-headers>false</add-no-cache-headers>
+                <serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+            </properties>
+        </channel-definition>
+
+        <channel-definition id="my-polling-amf" class="mx.messaging.channels.AMFChannel">
+            <endpoint url="http://{server.name}:{server.port}/{context.root}/messagebroker/amfpolling" class="flex.messaging.endpoints.AMFEndpoint"/>
+            <properties>
+                <polling-enabled>true</polling-enabled>
+                <polling-interval-seconds>4</polling-interval-seconds>
+                <serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+            </properties>
+        </channel-definition>
+
+        <!--
+        <channel-definition id="my-http" class="mx.messaging.channels.HTTPChannel">
+            <endpoint url="http://{server.name}:{server.port}/{context.root}/messagebroker/http" class="flex.messaging.endpoints.HTTPEndpoint"/>
+        </channel-definition>
+
+        <channel-definition id="my-secure-http" class="mx.messaging.channels.SecureHTTPChannel">
+            <endpoint url="https://{server.name}:{server.port}/{context.root}/messagebroker/httpsecure" class="flex.messaging.endpoints.SecureHTTPEndpoint"/>
+            <properties>
+                <add-no-cache-headers>false</add-no-cache-headers>
+            </properties>
+        </channel-definition>
+        -->
+    </channels>
+
+    <logging>
+        <target class="flex.messaging.log.ConsoleTarget" level="Error">
+            <properties>
+                <prefix>[BlazeDS] </prefix>
+                <includeDate>false</includeDate>
+                <includeTime>false</includeTime>
+                <includeLevel>false</includeLevel>
+                <includeCategory>false</includeCategory>
+            </properties>
+            <filters>
+                <pattern>Endpoint.*</pattern>
+                <pattern>Service.*</pattern>
+                <pattern>Configuration</pattern>
+            </filters>
+        </target>
+    </logging>
+
+	<validators>
+		<validator
+			class="flex.messaging.validators.ClassDeserializationValidator">
+			<properties>
+				<allow-classes>
+					<class name="org.*" />
+				</allow-classes>
+			</properties>
+		</validator>
+	</validators>
+	
+    <system>
+        <redeploy>
+            <enabled>false</enabled>
+            <!-- 
+            <watch-interval>20</watch-interval>
+            <watch-file>{context.root}/WEB-INF/flex/services-config.xml</watch-file>
+            <watch-file>{context.root}/WEB-INF/flex/proxy-config.xml</watch-file>
+            <watch-file>{context.root}/WEB-INF/flex/remoting-config.xml</watch-file>
+            <watch-file>{context.root}/WEB-INF/flex/messaging-config.xml</watch-file>
+            <watch-file>{context.root}/WEB-INF/flex/data-management-config.xml</watch-file>
+            <touch-file>{context.root}/WEB-INF/web.xml</touch-file>
+             -->
+        </redeploy>
+    </system>
+
+</services-config>
diff --git a/spring-flex-hibernate3/src/test/resources/custom-services-config.xml b/spring-flex-hibernate3/src/test/resources/custom-services-config.xml
index d8ea04f4..1eaf9c96 100755
--- a/spring-flex-hibernate3/src/test/resources/custom-services-config.xml
+++ b/spring-flex-hibernate3/src/test/resources/custom-services-config.xml
@@ -9,8 +9,23 @@
 
         <channel-definition id="my-custom-path-channel" class="mx.messaging.channels.AMFChannel">
             <endpoint url="http://{server.name}:{server.port}/{context.root}/messagebroker/amf" class="flex.messaging.endpoints.AMFEndpoint"/>
+            <properties>
+				<serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+			</properties>
         </channel-definition>
 
      </channels>
 
+	<validators>
+		<validator
+			class="flex.messaging.validators.ClassDeserializationValidator">
+			<properties>
+				<allow-classes>
+					<class name="org.*" />
+				</allow-classes>
+			</properties>
+		</validator>
+	</validators>
 </services-config>
diff --git a/spring-flex-hibernate3/src/test/resources/org/springframework/flex/hibernate3/config/services-config.xml b/spring-flex-hibernate3/src/test/resources/org/springframework/flex/hibernate3/config/services-config.xml
index db67a283..4c0d5426 100755
--- a/spring-flex-hibernate3/src/test/resources/org/springframework/flex/hibernate3/config/services-config.xml
+++ b/spring-flex-hibernate3/src/test/resources/org/springframework/flex/hibernate3/config/services-config.xml
@@ -1,82 +1,98 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <services-config>
 
-    <channels>
+	<channels>
 
-        <channel-definition id="my-amf"
-            class="mx.messaging.channels.AMFChannel">
-            <endpoint
-                url="http://{server.name}:{server.port}/{context.root}/messagebroker/amf"
-                class="flex.messaging.endpoints.AMFEndpoint" />
-        </channel-definition>
+		<channel-definition id="my-amf"
+			class="mx.messaging.channels.AMFChannel">
+			<endpoint
+				url="http://{server.name}:{server.port}/{context.root}/messagebroker/amf"
+				class="flex.messaging.endpoints.AMFEndpoint" />
+			<properties>
+				<serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+			</properties>
+		</channel-definition>
 
-        <channel-definition id="my-secure-amf"
-            class="mx.messaging.channels.SecureAMFChannel">
-            <endpoint
-                url="https://{server.name}:{server.port}/{context.root}/messagebroker/amfsecure"
-                class="flex.messaging.endpoints.SecureAMFEndpoint" />
-            <properties>
-                <add-no-cache-headers>false</add-no-cache-headers>
-            </properties>
-        </channel-definition>
+		<channel-definition id="my-secure-amf"
+			class="mx.messaging.channels.SecureAMFChannel">
+			<endpoint
+				url="https://{server.name}:{server.port}/{context.root}/messagebroker/amfsecure"
+				class="flex.messaging.endpoints.SecureAMFEndpoint" />
+			<properties>
+				<add-no-cache-headers>false</add-no-cache-headers>
+				<serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+			</properties>
+		</channel-definition>
 
-        <channel-definition id="my-polling-amf"
-            class="mx.messaging.channels.AMFChannel">
-            <endpoint
-                url="http://{server.name}:{server.port}/{context.root}/messagebroker/amfpolling"
-                class="flex.messaging.endpoints.AMFEndpoint" />
-            <properties>
-                <polling-enabled>true</polling-enabled>
-                <polling-interval-seconds>4</polling-interval-seconds>
-            </properties>
-        </channel-definition>
+		<channel-definition id="my-polling-amf"
+			class="mx.messaging.channels.AMFChannel">
+			<endpoint
+				url="http://{server.name}:{server.port}/{context.root}/messagebroker/amfpolling"
+				class="flex.messaging.endpoints.AMFEndpoint" />
+			<properties>
+				<polling-enabled>true</polling-enabled>
+				<polling-interval-seconds>4</polling-interval-seconds>
+				<serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+			</properties>
+		</channel-definition>
 
-        <!--
-            <channel-definition id="my-http"
-            class="mx.messaging.channels.HTTPChannel"> <endpoint
-            url="http://{server.name}:{server.port}/{context.root}/messagebroker/http"
-            class="flex.messaging.endpoints.HTTPEndpoint"/> </channel-definition>
+		<!-- <channel-definition id="my-http" class="mx.messaging.channels.HTTPChannel"> 
+			<endpoint url="http://{server.name}:{server.port}/{context.root}/messagebroker/http" 
+			class="flex.messaging.endpoints.HTTPEndpoint"/> </channel-definition> <channel-definition 
+			id="my-secure-http" class="mx.messaging.channels.SecureHTTPChannel"> <endpoint 
+			url="https://{server.name}:{server.port}/{context.root}/messagebroker/httpsecure" 
+			class="flex.messaging.endpoints.SecureHTTPEndpoint"/> <properties> <add-no-cache-headers>false</add-no-cache-headers> 
+			</properties> </channel-definition> -->
+	</channels>
 
-            <channel-definition id="my-secure-http"
-            class="mx.messaging.channels.SecureHTTPChannel"> <endpoint
-            url="https://{server.name}:{server.port}/{context.root}/messagebroker/httpsecure"
-            class="flex.messaging.endpoints.SecureHTTPEndpoint"/> <properties>
-            <add-no-cache-headers>false</add-no-cache-headers> </properties>
-            </channel-definition>
-        -->
-    </channels>
+	<logging>
+		<target class="flex.messaging.log.ConsoleTarget" level="Error">
+			<properties>
+				<prefix>[BlazeDS] </prefix>
+				<includeDate>false</includeDate>
+				<includeTime>false</includeTime>
+				<includeLevel>false</includeLevel>
+				<includeCategory>false</includeCategory>
+			</properties>
+			<filters>
+				<pattern>Endpoint.*</pattern>
+				<pattern>Service.*</pattern>
+				<pattern>Configuration</pattern>
+			</filters>
+		</target>
+	</logging>
 
-    <logging>
-        <target class="flex.messaging.log.ConsoleTarget" level="Error">
-            <properties>
-                <prefix>[BlazeDS] </prefix>
-                <includeDate>false</includeDate>
-                <includeTime>false</includeTime>
-                <includeLevel>false</includeLevel>
-                <includeCategory>false</includeCategory>
-            </properties>
-            <filters>
-                <pattern>Endpoint.*</pattern>
-                <pattern>Service.*</pattern>
-                <pattern>Configuration</pattern>
-            </filters>
-        </target>
-    </logging>
-
-    <security>
-        <security-constraint id="fooConstraint">
-            <roles>
-                <role>guests</role>
-                <role>accountants</role>
-                <role>employees</role>
-                <role>managers</role>
-            </roles>
-        </security-constraint>
-        <security-constraint id="barConstraint">
-            <roles>
-                <role>sampleusers</role>
-            </roles>
-        </security-constraint>
-    </security>
+	<validators>
+		<validator
+			class="flex.messaging.validators.ClassDeserializationValidator">
+			<properties>
+				<allow-classes>
+					<class name="org.*" />
+				</allow-classes>
+			</properties>
+		</validator>
+	</validators>
+	
+	<security>
+		<security-constraint id="fooConstraint">
+			<roles>
+				<role>guests</role>
+				<role>accountants</role>
+				<role>employees</role>
+				<role>managers</role>
+			</roles>
+		</security-constraint>
+		<security-constraint id="barConstraint">
+			<roles>
+				<role>sampleusers</role>
+			</roles>
+		</security-constraint>
+	</security>
 
 </services-config>
diff --git a/spring-flex-hibernate3/src/test/resources/org/springframework/flex/hibernate3/core/services-config-4.6.xml b/spring-flex-hibernate3/src/test/resources/org/springframework/flex/hibernate3/core/services-config-4.6.xml
index 2d45d438..f207df75 100755
--- a/spring-flex-hibernate3/src/test/resources/org/springframework/flex/hibernate3/core/services-config-4.6.xml
+++ b/spring-flex-hibernate3/src/test/resources/org/springframework/flex/hibernate3/core/services-config-4.6.xml
@@ -19,12 +19,20 @@
 
         <channel-definition id="my-amf" class="mx.messaging.channels.AMFChannel">
             <endpoint url="http://{server.name}:{server.port}/{context.root}/messagebroker/amf" class="flex.messaging.endpoints.AMFEndpoint"/>
+            <properties>
+				<serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+			</properties>
         </channel-definition>
 
         <channel-definition id="my-secure-amf" class="mx.messaging.channels.SecureAMFChannel">
             <endpoint url="https://{server.name}:{server.port}/{context.root}/messagebroker/amfsecure" class="flex.messaging.endpoints.SecureAMFEndpoint"/>
             <properties>
                 <add-no-cache-headers>false</add-no-cache-headers>
+                <serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
             </properties>
         </channel-definition>
 
@@ -33,6 +41,9 @@
             <properties>
                 <polling-enabled>true</polling-enabled>
                 <polling-interval-seconds>4</polling-interval-seconds>
+                <serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
             </properties>
         </channel-definition>
         
@@ -58,6 +69,17 @@
         </target>
     </logging>
 
+	<validators>
+		<validator
+			class="flex.messaging.validators.ClassDeserializationValidator">
+			<properties>
+				<allow-classes>
+					<class name="org.*" />
+				</allow-classes>
+			</properties>
+		</validator>
+	</validators>
+	
     <system>
         <redeploy>
             <enabled>false</enabled>
diff --git a/spring-flex-hibernate3/src/test/resources/org/springframework/flex/hibernate3/core/services-config.xml b/spring-flex-hibernate3/src/test/resources/org/springframework/flex/hibernate3/core/services-config.xml
index 4627391f..8dbbf1e3 100755
--- a/spring-flex-hibernate3/src/test/resources/org/springframework/flex/hibernate3/core/services-config.xml
+++ b/spring-flex-hibernate3/src/test/resources/org/springframework/flex/hibernate3/core/services-config.xml
@@ -19,12 +19,20 @@
 
         <channel-definition id="my-amf" class="mx.messaging.channels.AMFChannel">
             <endpoint url="http://{server.name}:{server.port}/{context.root}/messagebroker/amf" class="flex.messaging.endpoints.AMFEndpoint"/>
+            <properties>
+				<serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+			</properties>
         </channel-definition>
 
         <channel-definition id="my-secure-amf" class="mx.messaging.channels.SecureAMFChannel">
             <endpoint url="https://{server.name}:{server.port}/{context.root}/messagebroker/amfsecure" class="flex.messaging.endpoints.SecureAMFEndpoint"/>
             <properties>
                 <add-no-cache-headers>false</add-no-cache-headers>
+                <serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
             </properties>
         </channel-definition>
 
@@ -33,6 +41,9 @@
             <properties>
                 <polling-enabled>true</polling-enabled>
                 <polling-interval-seconds>4</polling-interval-seconds>
+                <serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
             </properties>
         </channel-definition>
 
@@ -67,6 +78,17 @@
         </target>
     </logging>
 
+	<validators>
+		<validator
+			class="flex.messaging.validators.ClassDeserializationValidator">
+			<properties>
+				<allow-classes>
+					<class name="org.*" />
+				</allow-classes>
+			</properties>
+		</validator>
+	</validators>
+	
     <system>
         <redeploy>
             <enabled>false</enabled>
diff --git a/spring-flex-hibernate4/src/test/resources/custom-services-config.xml b/spring-flex-hibernate4/src/test/resources/custom-services-config.xml
index d8ea04f4..20e44504 100755
--- a/spring-flex-hibernate4/src/test/resources/custom-services-config.xml
+++ b/spring-flex-hibernate4/src/test/resources/custom-services-config.xml
@@ -1,16 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <services-config>
 
-    <services>
-        <service-include file-path="custom-remoting-config.xml" />      
-    </services> 
+	<services>
+		<service-include
+			file-path="custom-remoting-config.xml" />
+	</services>
 
-    <channels>
+	<channels>
 
-        <channel-definition id="my-custom-path-channel" class="mx.messaging.channels.AMFChannel">
-            <endpoint url="http://{server.name}:{server.port}/{context.root}/messagebroker/amf" class="flex.messaging.endpoints.AMFEndpoint"/>
-        </channel-definition>
+		<channel-definition id="my-custom-path-channel"
+			class="mx.messaging.channels.AMFChannel">
+			<endpoint
+				url="http://{server.name}:{server.port}/{context.root}/messagebroker/amf"
+				class="flex.messaging.endpoints.AMFEndpoint" />
+			<properties>
+				<serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+			</properties>
 
-     </channels>
+		</channel-definition>
 
+	</channels>
+
+	<validators>
+		<validator
+			class="flex.messaging.validators.ClassDeserializationValidator">
+			<properties>
+				<allow-classes>
+					<class name="org.*" />
+				</allow-classes>
+			</properties>
+		</validator>
+	</validators>
+	
 </services-config>
diff --git a/spring-flex-hibernate4/src/test/resources/org/springframework/flex/hibernate4/config/services-config.xml b/spring-flex-hibernate4/src/test/resources/org/springframework/flex/hibernate4/config/services-config.xml
index db67a283..abe8e850 100755
--- a/spring-flex-hibernate4/src/test/resources/org/springframework/flex/hibernate4/config/services-config.xml
+++ b/spring-flex-hibernate4/src/test/resources/org/springframework/flex/hibernate4/config/services-config.xml
@@ -8,6 +8,11 @@
             <endpoint
                 url="http://{server.name}:{server.port}/{context.root}/messagebroker/amf"
                 class="flex.messaging.endpoints.AMFEndpoint" />
+            <properties>
+				<serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+			</properties>
         </channel-definition>
 
         <channel-definition id="my-secure-amf"
@@ -17,6 +22,9 @@
                 class="flex.messaging.endpoints.SecureAMFEndpoint" />
             <properties>
                 <add-no-cache-headers>false</add-no-cache-headers>
+                <serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
             </properties>
         </channel-definition>
 
@@ -28,6 +36,9 @@
             <properties>
                 <polling-enabled>true</polling-enabled>
                 <polling-interval-seconds>4</polling-interval-seconds>
+                <serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
             </properties>
         </channel-definition>
 
@@ -63,6 +74,17 @@
         </target>
     </logging>
 
+	<validators>
+		<validator
+			class="flex.messaging.validators.ClassDeserializationValidator">
+			<properties>
+				<allow-classes>
+					<class name="org.*" />
+				</allow-classes>
+			</properties>
+		</validator>
+	</validators>
+	
     <security>
         <security-constraint id="fooConstraint">
             <roles>
diff --git a/spring-flex-hibernate4/src/test/resources/org/springframework/flex/hibernate4/core/services-config-4.6.xml b/spring-flex-hibernate4/src/test/resources/org/springframework/flex/hibernate4/core/services-config-4.6.xml
index 2d45d438..f207df75 100755
--- a/spring-flex-hibernate4/src/test/resources/org/springframework/flex/hibernate4/core/services-config-4.6.xml
+++ b/spring-flex-hibernate4/src/test/resources/org/springframework/flex/hibernate4/core/services-config-4.6.xml
@@ -19,12 +19,20 @@
 
         <channel-definition id="my-amf" class="mx.messaging.channels.AMFChannel">
             <endpoint url="http://{server.name}:{server.port}/{context.root}/messagebroker/amf" class="flex.messaging.endpoints.AMFEndpoint"/>
+            <properties>
+				<serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+			</properties>
         </channel-definition>
 
         <channel-definition id="my-secure-amf" class="mx.messaging.channels.SecureAMFChannel">
             <endpoint url="https://{server.name}:{server.port}/{context.root}/messagebroker/amfsecure" class="flex.messaging.endpoints.SecureAMFEndpoint"/>
             <properties>
                 <add-no-cache-headers>false</add-no-cache-headers>
+                <serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
             </properties>
         </channel-definition>
 
@@ -33,6 +41,9 @@
             <properties>
                 <polling-enabled>true</polling-enabled>
                 <polling-interval-seconds>4</polling-interval-seconds>
+                <serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
             </properties>
         </channel-definition>
         
@@ -58,6 +69,17 @@
         </target>
     </logging>
 
+	<validators>
+		<validator
+			class="flex.messaging.validators.ClassDeserializationValidator">
+			<properties>
+				<allow-classes>
+					<class name="org.*" />
+				</allow-classes>
+			</properties>
+		</validator>
+	</validators>
+	
     <system>
         <redeploy>
             <enabled>false</enabled>
diff --git a/spring-flex-hibernate4/src/test/resources/org/springframework/flex/hibernate4/core/services-config.xml b/spring-flex-hibernate4/src/test/resources/org/springframework/flex/hibernate4/core/services-config.xml
index 4627391f..8dbbf1e3 100755
--- a/spring-flex-hibernate4/src/test/resources/org/springframework/flex/hibernate4/core/services-config.xml
+++ b/spring-flex-hibernate4/src/test/resources/org/springframework/flex/hibernate4/core/services-config.xml
@@ -19,12 +19,20 @@
 
         <channel-definition id="my-amf" class="mx.messaging.channels.AMFChannel">
             <endpoint url="http://{server.name}:{server.port}/{context.root}/messagebroker/amf" class="flex.messaging.endpoints.AMFEndpoint"/>
+            <properties>
+				<serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+			</properties>
         </channel-definition>
 
         <channel-definition id="my-secure-amf" class="mx.messaging.channels.SecureAMFChannel">
             <endpoint url="https://{server.name}:{server.port}/{context.root}/messagebroker/amfsecure" class="flex.messaging.endpoints.SecureAMFEndpoint"/>
             <properties>
                 <add-no-cache-headers>false</add-no-cache-headers>
+                <serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
             </properties>
         </channel-definition>
 
@@ -33,6 +41,9 @@
             <properties>
                 <polling-enabled>true</polling-enabled>
                 <polling-interval-seconds>4</polling-interval-seconds>
+                <serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
             </properties>
         </channel-definition>
 
@@ -67,6 +78,17 @@
         </target>
     </logging>
 
+	<validators>
+		<validator
+			class="flex.messaging.validators.ClassDeserializationValidator">
+			<properties>
+				<allow-classes>
+					<class name="org.*" />
+				</allow-classes>
+			</properties>
+		</validator>
+	</validators>
+	
     <system>
         <redeploy>
             <enabled>false</enabled>
diff --git a/spring-flex-integration/src/main/webapp/WEB-INF/flex/services-config.xml b/spring-flex-integration/src/main/webapp/WEB-INF/flex/services-config.xml
index 259d550a..b67e8a81 100644
--- a/spring-flex-integration/src/main/webapp/WEB-INF/flex/services-config.xml
+++ b/spring-flex-integration/src/main/webapp/WEB-INF/flex/services-config.xml
@@ -15,20 +15,38 @@
 
         <channel-definition id="my-amf" class="mx.messaging.channels.AMFChannel">
             <endpoint url="http://{server.name}:{server.port}/{context.root}/spring/messagebroker/amf" class="flex.messaging.endpoints.AMFEndpoint"/>
+            <properties>
+				<serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+			</properties>
         </channel-definition>
         
         <channel-definition id="my-protected-amf" class="mx.messaging.channels.AMFChannel">
             <endpoint url="http://{server.name}:{server.port}/{context.root}/spring/protected/messagebroker/amf" class="flex.messaging.endpoints.AMFEndpoint"/>
+            <properties>
+				<serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+			</properties>
         </channel-definition>
         
         <channel-definition id="my-protected-by-id-amf" class="mx.messaging.channels.AMFChannel">
             <endpoint url="http://{server.name}:{server.port}/{context.root}/spring/protected2/messagebroker/amf" class="flex.messaging.endpoints.AMFEndpoint"/>
+            <properties>
+				<serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+			</properties>
         </channel-definition>
 
         <channel-definition id="my-secure-amf" class="mx.messaging.channels.SecureAMFChannel">
             <endpoint url="https://{server.name}:{server.port}/{context.root}/messagebroker/amfsecure" class="flex.messaging.endpoints.SecureAMFEndpoint"/>
             <properties>
                 <add-no-cache-headers>false</add-no-cache-headers>
+                <serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
             </properties>
         </channel-definition>
 
@@ -37,6 +55,9 @@
             <properties>
                 <polling-enabled>true</polling-enabled>
                 <polling-interval-seconds>4</polling-interval-seconds>
+                <serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
             </properties>
         </channel-definition>
 
@@ -71,4 +92,14 @@
         </target>
     </logging>
 
+	<validators>
+		<validator
+			class="flex.messaging.validators.ClassDeserializationValidator">
+			<properties>
+				<allow-classes>
+					<class name="org.*" />
+				</allow-classes>
+			</properties>
+		</validator>
+	</validators>
 </services-config>
\ No newline at end of file
diff --git a/spring-flex-parent/pom.xml b/spring-flex-parent/pom.xml
index 139eecfb..fea3f80e 100644
--- a/spring-flex-parent/pom.xml
+++ b/spring-flex-parent/pom.xml
@@ -57,9 +57,9 @@
     </contributors>
 
     <properties>
-		<spring.version>4.1.1.RELEASE</spring.version>
+		<spring.version>5.1.2.RELEASE</spring.version>
 		<integration.version>2.2.6.RELEASE</integration.version>
-		<security.version>3.2.4.RELEASE</security.version>
+		<security.version>5.1.2.RELEASE</security.version>
 		<blazeds.version>4.0.0.14931</blazeds.version>
 		<!--<blazeds.version>4.6.0.23207</blazeds.version>-->
 		<slf4j.version>1.7.7</slf4j.version>
@@ -186,26 +186,31 @@
 				<artifactId>spring-flex-core</artifactId>
 				<version>1.6.0.RC1</version>
 			</dependency>
-			<dependency>
-				<groupId>com.adobe.blazeds</groupId>
-				<artifactId>blazeds-core</artifactId>
-				<version>${blazeds.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.adobe.blazeds</groupId>
-				<artifactId>blazeds-common</artifactId>
-				<version>${blazeds.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.adobe.blazeds</groupId>
-				<artifactId>blazeds-proxy</artifactId>
-				<version>${blazeds.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.adobe.blazeds</groupId>
-				<artifactId>blazeds-remoting</artifactId>
-				<version>${blazeds.version}</version>
-			</dependency>
+			
+			<!-- STARTS NEW LIBS -->
+			<!-- Add a reference to Apache Flex BlazeDS -->
+	        <dependency>
+	            <groupId>org.apache.flex.blazeds</groupId>
+	            <artifactId>flex-messaging-core</artifactId>
+	            <version>4.7.3</version>
+	        </dependency>
+	        <dependency>
+	            <groupId>org.apache.flex.blazeds</groupId>
+	            <artifactId>flex-messaging-common</artifactId>
+	            <version>4.7.3</version>
+	        </dependency>
+	        <dependency>
+	            <groupId>org.apache.flex.blazeds</groupId>
+	            <artifactId>flex-messaging-proxy</artifactId>
+	            <version>4.7.3</version>
+	        </dependency>
+	        <dependency>
+	            <groupId>org.apache.flex.blazeds</groupId>
+	            <artifactId>flex-messaging-remoting</artifactId>
+	            <version>4.7.3</version>
+	        </dependency>
+			<!--  END NEW LIBS -->
+	
 			<dependency>
 				<groupId>javax.jms</groupId>
 				<artifactId>jms-api</artifactId>
@@ -245,7 +250,7 @@
 			<dependency>
 				<groupId>junit</groupId>
 				<artifactId>junit</artifactId>
-				<version>4.9</version>
+				<version>4.12</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
diff --git a/spring-flex-samples/spring-flex-testdrive/testdrive/src/main/webapp/WEB-INF/flex/services-config.xml b/spring-flex-samples/spring-flex-testdrive/testdrive/src/main/webapp/WEB-INF/flex/services-config.xml
index 772cadaf..050f8bd8 100644
--- a/spring-flex-samples/spring-flex-testdrive/testdrive/src/main/webapp/WEB-INF/flex/services-config.xml
+++ b/spring-flex-samples/spring-flex-testdrive/testdrive/src/main/webapp/WEB-INF/flex/services-config.xml
@@ -1,92 +1,127 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<services-config>
-
-    <services>
-        <default-channels>
-           <channel ref="my-amf"/>
-        </default-channels>
-    </services>
-
-    <channels>
-
-        <channel-definition id="my-amf" class="mx.messaging.channels.AMFChannel">
-            <endpoint url="http://{server.name}:{server.port}/{context.root}/messagebroker/amf" class="flex.messaging.endpoints.AMFEndpoint"/>
-        </channel-definition>
-        
-        <channel-definition id="my-private-amf" class="mx.messaging.channels.AMFChannel">
-            <endpoint url="http://{server.name}:{server.port}/{context.root}/messagebroker/amfprivate" class="flex.messaging.endpoints.AMFEndpoint"/>
-        </channel-definition>
-
-        <channel-definition id="my-secure-amf" class="mx.messaging.channels.SecureAMFChannel">
-            <endpoint url="https://{server.name}:{server.port}/{context.root}/messagebroker/amfsecure" class="flex.messaging.endpoints.SecureAMFEndpoint"/>
-            <properties>
-                <add-no-cache-headers>false</add-no-cache-headers>
-            </properties>
-        </channel-definition>
-
-        <channel-definition id="my-polling-amf" class="mx.messaging.channels.AMFChannel">
-            <endpoint url="http://{server.name}:{server.port}/{context.root}/messagebroker/amfpolling" class="flex.messaging.endpoints.AMFEndpoint"/>
-            <properties>
-                <polling-enabled>true</polling-enabled>
-                <polling-interval-seconds>4</polling-interval-seconds>
-            </properties>
-        </channel-definition>
-        
-		<channel-definition id="my-longpolling-amf" class="mx.messaging.channels.AMFChannel">
-			<endpoint url="http://{server.name}:{server.port}/{context.root}/messagebroker/amflongpolling" class="flex.messaging.endpoints.AMFEndpoint"/>
-			<properties>
-				<polling-enabled>true</polling-enabled>
-				<polling-interval-seconds>5</polling-interval-seconds>
-				<wait-interval-millis>60000</wait-interval-millis>
-				<client-wait-interval-millis>1</client-wait-interval-millis>
-				<max-waiting-poll-requests>200</max-waiting-poll-requests>
-			</properties>
-		</channel-definition>        
-
-        <channel-definition id="my-streaming-amf" class="mx.messaging.channels.StreamingAMFChannel">
-            <endpoint url="http://{server.name}:{server.port}/{context.root}/messagebroker/streamingamf" class="flex.messaging.endpoints.StreamingAMFEndpoint"/>
-        </channel-definition>
-
-    </channels>
-    
-    <security>
-    	<security-constraint id="trusted">
-            <roles>
-                <role>ROLE_USER</role>
-                <role>ROLE_ADMIN</role>
-            </roles>
-        </security-constraint>
-    </security>
-
-    <logging>
-        <target class="flex.messaging.log.ConsoleTarget" level="Debug">
-            <properties>
-                <prefix>[BlazeDS] </prefix>
-                <includeDate>false</includeDate>
-                <includeTime>false</includeTime>
-                <includeLevel>false</includeLevel>
-                <includeCategory>false</includeCategory>
-            </properties>
-            <filters>
-                <pattern>Endpoint.*</pattern>
-                <pattern>Service.*</pattern>
-                <pattern>Configuration</pattern>
-            </filters>
-        </target>
-    </logging>
-    
-    <!--  <logging>
-      <target class="org.springframework.flex.core.CommonsLoggingTarget" level="All">
-      	<properties>
-      		<categoryPrefix>blazeds</categoryPrefix>
-      	</properties>
-      </target>
-  	</logging> -->
-
-    <system>
-        <redeploy>
-            <enabled>false</enabled>
-        </redeploy>
-    </system>
-
-</services-config>
+<?xml version="1.0" encoding="UTF-8"?>
+<services-config>
+
+    <services>
+        <default-channels>
+           <channel ref="my-amf"/>
+        </default-channels>
+    </services>
+
+    <channels>
+
+        <channel-definition id="my-amf" class="mx.messaging.channels.AMFChannel">
+            <endpoint url="http://{server.name}:{server.port}/{context.root}/messagebroker/amf" class="flex.messaging.endpoints.AMFEndpoint"/>
+            <properties>
+				<serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+			</properties>
+        </channel-definition>
+        
+        <channel-definition id="my-private-amf" class="mx.messaging.channels.AMFChannel">
+            <endpoint url="http://{server.name}:{server.port}/{context.root}/messagebroker/amfprivate" class="flex.messaging.endpoints.AMFEndpoint"/>
+            <properties>
+				<serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+			</properties>
+        </channel-definition>
+
+        <channel-definition id="my-secure-amf" class="mx.messaging.channels.SecureAMFChannel">
+            <endpoint url="https://{server.name}:{server.port}/{context.root}/messagebroker/amfsecure" class="flex.messaging.endpoints.SecureAMFEndpoint"/>
+            <properties>
+                <add-no-cache-headers>false</add-no-cache-headers>
+                <serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+            </properties>
+        </channel-definition>
+
+        <channel-definition id="my-polling-amf" class="mx.messaging.channels.AMFChannel">
+            <endpoint url="http://{server.name}:{server.port}/{context.root}/messagebroker/amfpolling" class="flex.messaging.endpoints.AMFEndpoint"/>
+            <properties>
+                <polling-enabled>true</polling-enabled>
+                <polling-interval-seconds>4</polling-interval-seconds>
+                <serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+            </properties>
+        </channel-definition>
+        
+		<channel-definition id="my-longpolling-amf" class="mx.messaging.channels.AMFChannel">
+			<endpoint url="http://{server.name}:{server.port}/{context.root}/messagebroker/amflongpolling" class="flex.messaging.endpoints.AMFEndpoint"/>
+			<properties>
+				<polling-enabled>true</polling-enabled>
+				<polling-interval-seconds>5</polling-interval-seconds>
+				<wait-interval-millis>60000</wait-interval-millis>
+				<client-wait-interval-millis>1</client-wait-interval-millis>
+				<max-waiting-poll-requests>200</max-waiting-poll-requests>
+				<serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+			</properties>
+		</channel-definition>        
+
+        <channel-definition id="my-streaming-amf" class="mx.messaging.channels.StreamingAMFChannel">
+            <endpoint url="http://{server.name}:{server.port}/{context.root}/messagebroker/streamingamf" class="flex.messaging.endpoints.StreamingAMFEndpoint"/>
+            <properties>
+				<serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+			</properties>
+        </channel-definition>
+
+    </channels>
+    
+    <security>
+    	<security-constraint id="trusted">
+            <roles>
+                <role>ROLE_USER</role>
+                <role>ROLE_ADMIN</role>
+            </roles>
+        </security-constraint>
+    </security>
+
+    <logging>
+        <target class="flex.messaging.log.ConsoleTarget" level="Debug">
+            <properties>
+                <prefix>[BlazeDS] </prefix>
+                <includeDate>false</includeDate>
+                <includeTime>false</includeTime>
+                <includeLevel>false</includeLevel>
+                <includeCategory>false</includeCategory>
+            </properties>
+            <filters>
+                <pattern>Endpoint.*</pattern>
+                <pattern>Service.*</pattern>
+                <pattern>Configuration</pattern>
+            </filters>
+        </target>
+    </logging>
+    
+    <validators>
+		<validator
+			class="flex.messaging.validators.ClassDeserializationValidator">
+			<properties>
+				<allow-classes>
+					<class name="org.*" />
+				</allow-classes>
+			</properties>
+		</validator>
+	</validators>
+	
+    <!--  <logging>
+      <target class="org.springframework.flex.core.CommonsLoggingTarget" level="All">
+      	<properties>
+      		<categoryPrefix>blazeds</categoryPrefix>
+      	</properties>
+      </target>
+  	</logging> -->
+
+    <system>
+        <redeploy>
+            <enabled>false</enabled>
+        </redeploy>
+    </system>
+
+</services-config>

From e2104cef33bdcce90f88342b23bd47bf5f02e6de Mon Sep 17 00:00:00 2001
From: Joe Taras <ruscianogiuseppe@gmail.com>
Date: Sat, 19 Nov 2022 20:36:26 +0100
Subject: [PATCH 2/2] Update FlexConfigurationManager.java

Check on Java version, compliance for JDK 10 or more
---
 .../flex/config/FlexConfigurationManager.java          | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/spring-flex-core/src/main/java/org/springframework/flex/config/FlexConfigurationManager.java b/spring-flex-core/src/main/java/org/springframework/flex/config/FlexConfigurationManager.java
index 20067be9..201df0de 100755
--- a/spring-flex-core/src/main/java/org/springframework/flex/config/FlexConfigurationManager.java
+++ b/spring-flex-core/src/main/java/org/springframework/flex/config/FlexConfigurationManager.java
@@ -98,7 +98,15 @@ public FlexConfigurationManager(ResourceLoader resourceLoader, String configurat
     @SuppressWarnings("unchecked")
     public MessagingConfiguration getMessagingConfiguration(ServletConfig servletConfig) {
     	String[] javaVersionElements = System.getProperty("java.version").split("\\.");
-		int major = Integer.parseInt(javaVersionElements[1]);
+	int major = 0;
+    	 // Check about Java version
+    	 // If Java version is greater or equals than 10 we get the first element (i.e. JDK 12.0.2 get 12)
+    	 // Else Java version lower then 10 get the second element (i.e. JDK 1.8.260 get 8)
+         if (javaVersionElements.length>0 && Integer.parseInt(javaVersionElements[0])>=10) {
+             major = Integer.parseInt(javaVersionElements[0]);
+         }else if (javaVersionElements.length>1){
+             major = Integer.parseInt(javaVersionElements[1]);
+         }
 		
         Assert.isTrue(major >= 5, "Spring BlazeDS Integration requires a minimum of Java 1.5");