You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2016/05/02 15:50:37 UTC
flex-blazeds git commit: - Updated the AutoConfiguration - Replaced
Tomcat with Jetty to avoid problems with Streaming-AMF connection
Repository: flex-blazeds
Updated Branches:
refs/heads/develop 4840cf351 -> a57a08f8d
- Updated the AutoConfiguration
- Replaced Tomcat with Jetty to avoid problems with Streaming-AMF connection
Project: http://git-wip-us.apache.org/repos/asf/flex-blazeds/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-blazeds/commit/a57a08f8
Tree: http://git-wip-us.apache.org/repos/asf/flex-blazeds/tree/a57a08f8
Diff: http://git-wip-us.apache.org/repos/asf/flex-blazeds/diff/a57a08f8
Branch: refs/heads/develop
Commit: a57a08f8da8ee514f36f3d2e09845087bf59d2dd
Parents: 4840cf3
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Mon May 2 15:50:29 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Mon May 2 15:50:29 2016 +0200
----------------------------------------------------------------------
opt/blazeds-spring-boot-starter/pom.xml | 11 +++++++++++
.../spring/BlazeDsAutoConfiguration.java | 20 ++------------------
2 files changed, 13 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/a57a08f8/opt/blazeds-spring-boot-starter/pom.xml
----------------------------------------------------------------------
diff --git a/opt/blazeds-spring-boot-starter/pom.xml b/opt/blazeds-spring-boot-starter/pom.xml
index eb93b3b..870d7f5 100644
--- a/opt/blazeds-spring-boot-starter/pom.xml
+++ b/opt/blazeds-spring-boot-starter/pom.xml
@@ -50,6 +50,17 @@ limitations under the License.
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>1.3.3.RELEASE</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-jetty</artifactId>
+ <version>1.3.3.RELEASE</version>
</dependency>
<!-- Add a reference to Apache Flex BlazeDS -->
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/a57a08f8/opt/blazeds-spring-boot-starter/src/main/java/org/apache/flex/blazeds/spring/BlazeDsAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/opt/blazeds-spring-boot-starter/src/main/java/org/apache/flex/blazeds/spring/BlazeDsAutoConfiguration.java b/opt/blazeds-spring-boot-starter/src/main/java/org/apache/flex/blazeds/spring/BlazeDsAutoConfiguration.java
index 140a457..b2587af 100644
--- a/opt/blazeds-spring-boot-starter/src/main/java/org/apache/flex/blazeds/spring/BlazeDsAutoConfiguration.java
+++ b/opt/blazeds-spring-boot-starter/src/main/java/org/apache/flex/blazeds/spring/BlazeDsAutoConfiguration.java
@@ -19,20 +19,16 @@
package org.apache.flex.blazeds.spring;
-import flex.messaging.MessageBroker;
-
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnResource;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.context.annotation.Bean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnResource;
import org.springframework.core.io.ResourceLoader;
import org.springframework.flex.config.RemotingAnnotationPostProcessor;
import org.springframework.flex.core.MessageBrokerFactoryBean;
import org.springframework.flex.servlet.MessageBrokerHandlerAdapter;
-import org.springframework.web.context.support.ServletContextAwareProcessor;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping;
-import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
import javax.servlet.ServletContext;
import java.util.Properties;
@@ -52,7 +48,7 @@ public class BlazeDsAutoConfiguration extends WebMvcConfigurationSupport {
@Autowired
private ResourceLoader resourceLoader;
- @Bean
+ @Bean(name = "_messageBroker")
public MessageBrokerFactoryBean messageBrokerFactoryBean() throws Exception {
MessageBrokerFactoryBean factoryBean = new MessageBrokerFactoryBean();
// TODO: Do all the special configuration magic here ...
@@ -73,18 +69,6 @@ public class BlazeDsAutoConfiguration extends WebMvcConfigurationSupport {
}
/**
- * Create and configure an instance of the MessageBroker.
- *
- * @return MessageBroker instance.
- * @throws Exception in case anything went wrong.
- */
- @Bean
- public MessageBroker _messageBroker(MessageBrokerFactoryBean factoryBean) throws Exception {
- // Return the instance.
- return factoryBean.getObject();
- }
-
- /**
* The MessageBrokerHandlerAdapter intercepts any requests to the
* MVC Servlet, detects the ones that match valid BlazeDS endpoints
* and redirects them to the matching endpoint implementation.