diff --git a/nb-configuration.xml b/nb-configuration.xml
index 99174dc..c23e52b 100644
--- a/nb-configuration.xml
+++ b/nb-configuration.xml
@@ -16,4 +16,10 @@ Any value defined here will override the pom.xml file value but is only applicab
1.6-web
Tomcat
+
+
+ src/main/resources/minaConfig.xml
+
+
+
diff --git a/src/main/java/com/ifish/config/MinaConfig.java b/src/main/java/com/ifish/config/MinaConfig.java
index 00f9d5b..c450c73 100644
--- a/src/main/java/com/ifish/config/MinaConfig.java
+++ b/src/main/java/com/ifish/config/MinaConfig.java
@@ -20,11 +20,13 @@ import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.logging.LoggingFilter;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
/**
*
* @author Administrator
*/
+@Configuration
public class MinaConfig {
/**
diff --git a/src/main/java/com/ifish/config/WebAppInitializer.java b/src/main/java/com/ifish/config/WebAppInitializer.java
index af5c16c..1529fbd 100644
--- a/src/main/java/com/ifish/config/WebAppInitializer.java
+++ b/src/main/java/com/ifish/config/WebAppInitializer.java
@@ -6,7 +6,9 @@
package com.ifish.config;
import javax.servlet.Filter;
+import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
+import org.springframework.context.support.FileSystemXmlApplicationContext;
import org.springframework.web.filter.CharacterEncodingFilter;
import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
@@ -18,7 +20,7 @@ public class WebAppInitializer extends AbstractAnnotationConfigDispatcherServlet
@Override
protected Class>[] getRootConfigClasses() {
- return new Class>[]{RootConfig.class, MybatisConfig.class,MinaConfig.class};
+ return new Class>[]{RootConfig.class, MybatisConfig.class, MinaConfig.class, applicationContext().getClass()};
}
@Override
@@ -36,6 +38,12 @@ public class WebAppInitializer extends AbstractAnnotationConfigDispatcherServlet
return null;
}
+ @Bean
+ public ApplicationContext applicationContext() {
+ ApplicationContext ct = new FileSystemXmlApplicationContext(this.getClass().getClassLoader().getResource("minaConfig.xml").getFile());
+ return ct;
+ }
+
@Bean
public Filter characterEncodingFilter() {
CharacterEncodingFilter filter = new CharacterEncodingFilter();
diff --git a/src/main/resources/minaConfig.xml b/src/main/resources/minaConfig.xml
new file mode 100644
index 0000000..826e8ed
--- /dev/null
+++ b/src/main/resources/minaConfig.xml
@@ -0,0 +1,28 @@
+
+
+
+