YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml

@@ -30,6 +30,7 @@
 				<prop key="/dispatchArticle.htm">DispatchArticleController</prop>
 				<prop key="/delegateArticle.htm">DelegateArticleController</prop>
 				<prop key="/addConference.htm">AddConferenceController</prop>
+				<prop key="/conflictList.htm">ConflictListController</prop>
 				<prop key="/reportConfCreate.htm">ReportConfCreateController</prop>
 				<prop key="/evaluation.htm">EvaluationController</prop>
 				<prop key="/createReport.htm">CreateReportController</prop>
@@ -165,11 +166,21 @@
 		<property name="articleManager" ref="articleManager" />
 	</bean>
 
+	
+
 	<bean id="ValidateOrRejectController"
 		class="org.yacos.web.PCmember.controller.ValidateOrRejectController">
 		<property name="articleManager" ref="articleManager" />
 	</bean>
 
+	<bean id="ConflictListController"
+		class="org.yacos.web.chairman.controller.ConflictListController">
+		<dwr:remote javascript="ConflictListJS" />
+		<property name="articleManager" ref="articleManager" />
+		<property name="userManager" ref="userManager" />
+		<property name="conferenceManager" ref="conferenceManager" />
+	</bean>
+
 	 <bean id="DispatchArticleController"
 		class="org.yacos.web.chairman.controller.DispatchArticleController">
 		<dwr:remote javascript="DispatchArticlesJS" />
@@ -187,6 +198,7 @@
 	</bean>
 	
 	
+	
 	<bean id="AddConferenceController"
 		class="org.yacos.web.chairman.controller.AddConferenceController"
 		scope="session">