changed startup bean to Java configured

Zomis · Jan 21, 2015 · fa01a75 · fa01a75
1 parent f6f462e
commit fa01a75
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 54 deletions.
diff --git a/src/main/java/com/skiwi/githubhooksechatservice/init/RootConfig.java b/src/main/java/com/skiwi/githubhooksechatservice/init/RootConfig.java
@@ -19,6 +19,7 @@
 import org.springframework.web.multipart.MultipartResolver;
 import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 
+import com.skiwi.githubhooksechatservice.mvc.beans.StartupBean;
 import com.skiwi.githubhooksechatservice.mvc.beans.Statistics;
 
 @Configuration
@@ -44,6 +45,11 @@ public PasswordEncoder passwordEncoder() {
 		return new BCryptPasswordEncoder();
 	}
 
+	@Bean(initMethod = "start", destroyMethod = "destroy")
+	public StartupBean startup() {
+		return new StartupBean();
+	}
+
 	@Bean
 	public com.skiwi.githubhooksechatservice.mvc.configuration.Configuration config() {
 		com.skiwi.githubhooksechatservice.mvc.configuration.Configuration config = new com.skiwi.githubhooksechatservice.mvc.configuration.Configuration();

diff --git a/src/main/webapp/WEB-INF/dispatcher-servlet.xml b/src/main/webapp/WEB-INF/dispatcher-servlet.xml
@@ -34,39 +34,6 @@
 
     <bean class="org.springframework.web.servlet.mvc.support.ControllerClassNameHandlerMapping"/>
 
-    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-        <property name="locations">
-            <value>classpath:githubhooksechatservice-environment.properties</value>
-        </property>
-    </bean>
-
-    <!-- properties -->
-    <bean id="configuration" class="com.skiwi.githubhooksechatservice.mvc.configuration.Configuration">
-        <property name="rootUrl" value="${env.rootUrl}"/>
-        <property name="chatUrl" value="${env.chatUrl}"/>
-        <property name="botEmail" value="${env.botEmail}"/>
-        <property name="botPassword" value="${env.botPassword}"/>
-        <property name="roomId" value="${env.roomId}"/>
-        <property name="chatThrottle" value="${env.chatThrottle}"/>
-        <property name="chatMaxBurst" value="${env.chatMaxBurst}"/>
-        <property name="chatMinimumDelay" value="${env.chatMinimumDelay}"/>
-        <property name="deployGreetingEnabled" value="${env.deployGreetingEnabled}"/>
-        <property name="deployGreetingText" value="${env.deployGreetingText}"/>
-        <property name="undeployGoodbyeEnabled" value="${env.undeployGoodbyeEnabled}"/>
-        <property name="undeployGoodbyeText" value="${env.undeployGoodbyeText}"/>
-        <property name="userMappings" value="${env.userMappings}"/>
-        <property name="dailyRooms" value="${env.dailyRooms}"/>
-    </bean>
-
-<!-- <bean id="chatBot" class="com.skiwi.githubhooksechatservice.chatbot.StackExchangeChatBot">
-		<constructor-arg ref="configuration"/>
-	</bean> -->	
-
-<!--     <bean name="statistics" class="com.skiwi.githubhooksechatservice.mvc.beans.Statistics" /> -->
-
-    <!-- startup bean -->
-    <bean name="startup" init-method="start" class="com.skiwi.githubhooksechatservice.mvc.beans.StartupBean" lazy-init="false" />
-
     <task:annotation-driven />
     <bean name="scheduledTasks" class="com.skiwi.githubhooksechatservice.chatbot.duga.ScheduledBean" />
 </beans>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
@@ -1,24 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
-<!-- <context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>/WEB-INF/applicationContext.xml</param-value>
-    </context-param>
-    <listener>
-        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-    </listener> -->    
- <!--   <servlet>
-        <servlet-name>dispatcher</servlet-name>
-        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-        <load-on-startup>2</load-on-startup>
-    </servlet>  
-    <servlet-mapping>
-        <servlet-name>dispatcher</servlet-name>
-        <url-pattern>/*</url-pattern>
-    </servlet-mapping>
-    <session-config>
-        <session-timeout>
-            30
-        </session-timeout>
-    </session-config>-->
+
 </web-app>