From 1b473064b404c839c096b94a7d598fb9e230531b Mon Sep 17 00:00:00 2001
From: Frederic Debuire <frederic.debuire@gmail.com>
Date: Thu, 10 Jan 2008 16:33:46 +0000
Subject: [PATCH] Policy failures: Code errors - failed on resource
 yacos-servlet.xml. Reason: The element type "beans" must be terminated by the
 matching end-tag "</beans>"., line 7 Override reason: $$$

---
 YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
index cf260fc..53a8a1f 100644
--- a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
+++ b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
@@ -53,18 +53,21 @@
 		<property name="articleManager" ref="articleManager" />
 	</bean>
 	
-	<bean name="/addConference3.htm" class="org.yacos.web.chairman.controller.AddConferenceController3" />
+	<bean name="/addConference5.htm" class="org.yacos.web.chairman.controller.AddConferenceController" />
+	<bean name="/addConference4.htm" class="org.yacos.web.chairman.controller.AddConferenceController" />
+	<bean name="/addConference3.htm" class="org.yacos.web.chairman.controller.AddConferenceController" />
+	<bean name="/addConference2.htm" class="org.yacos.web.chairman.controller.AddConferenceController" />
+	<bean name="/addConference.htm" class="org.yacos.web.chairman.controller.AddConferenceController" />
 	
-	<bean name="/addConference2.htm" class="org.yacos.web.chairman.controller.AddConferenceController2">
+	<!-- <bean name="/addConference2.htm" class="org.yacos.web.chairman.controller.AddConferenceController">
 		<property name="sessionForm" value="true" />
-		<property name="commandName" value="formConference2" />
+		<property name="commandName" value="formConference" />
 		<property name="commandClass" value="org.yacos.web.chairman.form.FormConference" />
 		<property name="formView" value="addConference2" />
 		<property name="successView" value="addConference3.htm" />
 		<property name="conferenceManager" ref="conferenceManager" />
 	</bean>
 	
-	<!-- Conference Controller and Resolver -->
 	<bean name="/addConference.htm" class="org.yacos.web.chairman.controller.AddConferenceController">
 		<property name="sessionForm" value="true" />
 		<property name="commandName" value="formConference" />
@@ -72,6 +75,7 @@
 		<property name="formView" value="addConference" />
 		<property name="successView" value="addConference2.htm" />
 		<property name="conferenceManager" ref="conferenceManager" />
+	</bean> -->
 	</bean>
 	
 	<!-- List all conference -->