Merge avec mes modifications locales

Ajout d'un Bean SessionService pour factoriser les méthodes de session
Utilisation de WebUtils pour les classes ou ce n'est pas encore integré

YACOSWeb/WebContent/WEB-INF/classes/messages.properties

@@ -24,10 +24,12 @@ form.register.user.firstName=First Name
 form.register.user.lastName=Last Name
 form.register.user.organization=Organization
 form.register.error.loginTooShort=Login must be at least 3 characters long
-form.register.error.loginInvalid=
+form.register.error.loginInvalid=The login can only contain characters, dot, underscore and must start with a character
 form.register.error.passwordsDontMatches=The password doesn't match the confirmation
 form.register.error.firstNameEmpty=First name is required
 form.register.error.lastNameEmpty=Last name is required
+form.register.error.passwordEmpty=The password can't be empty
+form.register.error.alreadyExists=A user with this login already exists. Please check you haven't already registered or change your login. 
 
 button.add=Add
 button.browse=Browse

YACOSWeb/WebContent/WEB-INF/web.xml

@@ -47,7 +47,7 @@
 
 	<filter-mapping>
 		<filter-name>sitemesh</filter-name>
-		<url-pattern>/*</url-pattern>
+		<url-pattern>/*</url-pattern>
 	</filter-mapping>
 	<!-- SiteMesh Integration declaration End -->
 

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

@@ -204,7 +204,8 @@
 
 	<!-- Get chosen conference in session context -->
 	<bean id="ChooseConferenceController"
-		class="org.yacos.web.system.controller.ChooseConferenceController">
+		class="org.yacos.web.system.controller.ChooseConferenceController">
+		<property name="sessionService" ref="sessionService" />
 	</bean>
 
 
@@ -258,25 +259,28 @@
 		</property>
 		<property name="prefix" value="/WEB-INF/jsp/"></property>
 		<property name="suffix" value=".jsp"></property>
-	</bean>
-
-	<bean id="multipartResolver"
-		class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
-		<property name="maxUploadSize" value="10000000" />
-	</bean>
-
-
+	</bean>
+	
+	<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
+		<property name="maxUploadSize" value="10000000" />
+	</bean>
+	
 	<bean id="messageSource"
 		class="org.springframework.context.support.ResourceBundleMessageSource">
 		<property name="basename" value="messages" />
-	</bean>
-
-	<!-- EJB Services Linking -->
-	<jee:jndi-lookup id="articleManager"
-		jndi-name="ArticleManagerBean/remote" cache="true" />
-	<jee:jndi-lookup id="usersManager"
-		jndi-name="UserManagerBean/remote" cache="true" />
-	<jee:jndi-lookup id="conferenceManager"
+	</bean>
+	
+	
+	<bean id="sessionService" class="org.yacos.web.system.controller.SessionService">
+		<property name="conferenceManager" ref="conferenceManager"/>
+		<property name="userManager" ref="usersManager"/>
+	</bean>
+	
+	<!-- EJB Services Linking -->
+		<jee:jndi-lookup id="articleManager"
+		jndi-name="ArticleManagerBean/remote" cache="true" />
+	<jee:jndi-lookup id="usersManager"
+		jndi-name="UserManagerBean/remote" cache="true" />
+	<jee:jndi-lookup id="conferenceManager"
 		jndi-name="ConferenceManagerBean/remote" cache="true" />
-
 </beans>