Resolução de conflitos do merge

WebContent/WEB-INF/struts/struts-config-course.xml

@@ -8,7 +8,7 @@
 			type="org.apache.struts.validator.DynaValidatorForm">
 			<form-property name="courseName" type="java.lang.String" />
 		</form-bean>
-		
+
 		<form-bean name="advancedSearchCourseForm"
 			type="org.apache.struts.validator.DynaValidatorForm">
 			<form-property name="name" type="java.lang.String" />
@@ -16,43 +16,30 @@
 			<form-property name="initialDate" type="java.lang.String" />
 			<form-property name="finalDate" type="java.lang.String" />
 		</form-bean>
-		
+
 		<form-bean name="viewCourseForm"
 			type="org.apache.struts.validator.DynaValidatorForm">
 			<form-property name="id" type="java.lang.Integer" />
 		</form-bean>
-		
+
 		<form-bean name="formRegisterCourseStepOne"
 			type="org.apache.struts.validator.DynaValidatorForm">
 			<form-property name="name" type="java.lang.String" />
 			<form-property name="objectives" type="java.lang.String" />
 			<form-property name="content" type="java.lang.String" />
-			<form-property name="maxAmountStudents"
+			<form-property name="maxAmountStudents" type="java.lang.String" />
-				type="java.lang.String" />
+			<form-property name="initialRegistrationDay" type="java.lang.String" />
-			<form-property name="initialRegistrationDay"
+			<form-property name="initialRegistrationMonth" type="java.lang.String" />
-				type="java.lang.String" />
+			<form-property name="initialRegistrationYear" type="java.lang.String" />
-			<form-property name="initialRegistrationMonth"
+			<form-property name="finalRegistrationDay" type="java.lang.String" />
-				type="java.lang.String" />
+			<form-property name="finalRegistrationMonth" type="java.lang.String" />
-			<form-property name="initialRegistrationYear"
+			<form-property name="finalRegistrationYear" type="java.lang.String" />
-				type="java.lang.String" />
+			<form-property name="initialCourseDay" type="java.lang.String" />
-			<form-property name="finalRegistrationDay"
+			<form-property name="initialCourseMonth" type="java.lang.String" />
-				type="java.lang.String" />
+			<form-property name="initialCourseYear" type="java.lang.String" />
-			<form-property name="finalRegistrationMonth"
+			<form-property name="finalCourseDay" type="java.lang.String" />
-				type="java.lang.String" />
+			<form-property name="finalCourseMonth" type="java.lang.String" />
-			<form-property name="finalRegistrationYear"
+			<form-property name="finalCourseYear" type="java.lang.String" />
-				type="java.lang.String" />
-			<form-property name="initialCourseDay"
-				type="java.lang.String" />
-			<form-property name="initialCourseMonth"
-				type="java.lang.String" />
-			<form-property name="initialCourseYear"
-				type="java.lang.String" />
-			<form-property name="finalCourseDay"
-				type="java.lang.String" />
-			<form-property name="finalCourseMonth"
-				type="java.lang.String" />
-			<form-property name="finalCourseYear"
-				type="java.lang.String" />
 			<form-property name="courseId" type="java.lang.Integer" />
 			<form-property name="keywords" type="java.lang.String" />
 		</form-bean>
@@ -60,86 +47,59 @@
 			type="org.apache.struts.validator.DynaValidatorForm">
 			<form-property name="keywords" type="java.lang.String" />
 		</form-bean>
-		
+
-		<form-bean name="changeTeacher" type="org.apache.struts.validator.DynaValidatorForm">
+		<form-bean name="changeTeacher"
+			type="org.apache.struts.validator.DynaValidatorForm">
 			<form-property name="teacher" type="java.lang.String"></form-property>
 		</form-bean>
 
-		<form-bean name="formEditCourse" 
+		<form-bean name="formEditCourse"
 			type="org.apache.struts.validator.DynaValidatorForm">
 			<form-property name="id" type="java.lang.Integer" />
 			<form-property name="name" type="java.lang.String" />
 			<form-property name="objectives" type="java.lang.String" />
 			<form-property name="content" type="java.lang.String" />
-			<form-property name="maxAmountStudents"
+			<form-property name="maxAmountStudents" type="java.lang.String" />
-				type="java.lang.String" />
+			<form-property name="initialRegistrationDay" type="java.lang.String" />
-			<form-property name="initialRegistrationDay"
+			<form-property name="initialRegistrationMonth" type="java.lang.String" />
-				type="java.lang.String" />
+			<form-property name="initialRegistrationYear" type="java.lang.String" />
-			<form-property name="initialRegistrationMonth"
+			<form-property name="finalRegistrationDay" type="java.lang.String" />
-				type="java.lang.String" />
+			<form-property name="finalRegistrationMonth" type="java.lang.String" />
-			<form-property name="initialRegistrationYear"
+			<form-property name="finalRegistrationYear" type="java.lang.String" />
-				type="java.lang.String" />
+			<form-property name="initialCourseDay" type="java.lang.String" />
-			<form-property name="finalRegistrationDay"
+			<form-property name="initialCourseMonth" type="java.lang.String" />
-				type="java.lang.String" />
+			<form-property name="initialCourseYear" type="java.lang.String" />
-			<form-property name="finalRegistrationMonth"
+			<form-property name="finalCourseDay" type="java.lang.String" />
-				type="java.lang.String" />
+			<form-property name="finalCourseMonth" type="java.lang.String" />
-			<form-property name="finalRegistrationYear"
+			<form-property name="finalCourseYear" type="java.lang.String" />
-				type="java.lang.String" />
-			<form-property name="initialCourseDay"
-				type="java.lang.String" />
-			<form-property name="initialCourseMonth"
-				type="java.lang.String" />
-			<form-property name="initialCourseYear"
-				type="java.lang.String" />
-			<form-property name="finalCourseDay"
-				type="java.lang.String" />
-			<form-property name="finalCourseMonth"
-				type="java.lang.String" />
-			<form-property name="finalCourseYear"
-				type="java.lang.String" />
 			<form-property name="courseId" type="java.lang.Integer" />
 			<form-property name="keywords" type="java.lang.String" />
 		</form-bean>
-		
+
-<<<<<<< HEAD
+		<form-bean name="formSocialInteractionMonitoring"
-		
-		<form-bean name="formSocialInteractionMonitoring" 
 			type="org.apache.struts.validator.DynaValidatorForm">
-			<form-property name="initialMonitoringDay"
+			<form-property name="initialMonitoringDay" type="java.lang.String" />
-				type="java.lang.String" />
+			<form-property name="initialMonitoringMonth" type="java.lang.String" />
-			<form-property name="initialMonitoringMonth"
+			<form-property name="initialMonitoringYear" type="java.lang.String" />
-				type="java.lang.String" />
+			<form-property name="forum" type="java.lang.String" />
-			<form-property name="initialMonitoringYear"
+			<form-property name="message" type="java.lang.String" />
-				type="java.lang.String" />
+			<form-property name="chat" type="java.lang.String" />
-			<form-property name="forum" 
+			<form-property name="twitter" type="java.lang.String" />
-				type="java.lang.String" />
+			<form-property name="finalMonitoringDay" type="java.lang.String" />
-			<form-property name="message" 
+			<form-property name="finalMonitoringMonth" type="java.lang.String" />
-				type="java.lang.String" />
+			<form-property name="finalMonitoringYear" type="java.lang.String" />
-			<form-property name="chat" 
+			<form-property name="socialMethod" type="java.lang.String" />
-				type="java.lang.String" />
-			<form-property name="twitter" 
-				type="java.lang.String" />
-			<form-property name="finalMonitoringDay"
-				type="java.lang.String" />
-			<form-property name="finalMonitoringMonth"
-				type="java.lang.String" />
-			<form-property name="finalMonitoringYear"
-				type="java.lang.String" />
-			<form-property name="socialMethod" 
-				type="java.lang.String" />
-			
-			
 		</form-bean>
-		<form-bean name="formSocialInteractionMonitoringReports" 
+
+		<form-bean name="formSocialInteractionMonitoringReports"
 			type="org.apache.struts.validator.DynaValidatorForm">
-			
+		</form-bean>
-=======
+
 		<form-bean name="formCriarGrupo" type="org.apache.struts.action.DynaActionForm">
-			<form-property name="courseId" type="java.lang.Integer"/>
+			<form-property name="courseId" type="java.lang.Integer" />
-			<form-property name="nomeGrupo" type="java.lang.String"/>
+			<form-property name="nomeGrupo" type="java.lang.String" />
-			<form-property name="listaAlunos" type="java.lang.String"/>
+			<form-property name="listaAlunos" type="java.lang.String" />
-			<form-property name="Concluir" type="java.lang.String"/>
+			<form-property name="Concluir" type="java.lang.String" />
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 		</form-bean>
 
 	</form-beans>
@@ -151,7 +111,8 @@
 		<forward name="fShowViewChangeTeacher" path="/jsp/course/viewChangeTeacher.jsp" />
 		<forward name="fShowViewEditCourse" path="/jsp/course/editCourse.jsp" />
 		<forward name="fShowViewSocialInteractionMonitoring" path="/jsp/course/socialInteractionMonitoring.jsp" />
-		<forward name="fShowViewSocialInteractionMonitoringReports" path="/jsp/course/socialInteractionMonitoringReports.jsp" />
+		<forward name="fShowViewSocialInteractionMonitoringReports"
+			path="/jsp/course/socialInteractionMonitoringReports.jsp" />
 		<forward name="fViewDeleteConfirmation" path="/fViewDeleteConfirmation.do" />
 		<forward name="fProject" path="/fProject.do" />
 		<forward name="fCases" path="/fCases.do" />
@@ -164,119 +125,98 @@
 		<forward name="fShowViewCourseNotLogged" path="/jsp/course/viewCourseNotLogged.jsp" />
 		<forward name="fShowViewCourseParticipants" path="/jsp/course/viewCourseParticipants.jsp" />
 		<forward name="signOut" path="/signOut.do" />
-		<forward name="fShowViewShowModules" path="/jsp/course/content_management/showModules.jsp"/>
+		<forward name="fShowViewShowModules" path="/jsp/course/content_management/showModules.jsp" />
-		
+
-		<forward name="fShowViewCourseEvaluations" path="/jsp/course/viewCourseEvaluations.jsp"/>
+		<forward name="fShowViewCourseEvaluations" path="/jsp/course/viewCourseEvaluations.jsp" />
-		<forward name="fShowViewSendMail" path="/jsp/course/viewSendMail.jsp"/>
+		<forward name="fShowViewSendMail" path="/jsp/course/viewSendMail.jsp" />
-		<forward name="fShowViewGraphic" path="/jsp/course/viewGraphic.jsp"/>
+		<forward name="fShowViewGraphic" path="/jsp/course/viewGraphic.jsp" />
-<<<<<<< HEAD
+
-=======
+		<forward name="fShowViewGroups" path="/jsp/course/viewGroups.jsp" />
-		<forward name="fShowViewGroups" path="/jsp/course/viewGroups.jsp"/>
+		<forward name="fShowGroupDayTimeline" path="/jsp/course/viewGroupDayTimeline.jsp" />
-		<forward name="fShowGroupDayTimeline" path="/jsp/course/viewGroupDayTimeline.jsp"/>
+		<forward name="fShowPersonDayTimeline" path="/jsp/course/viewPersonDayTimeline.jsp" />
-		<forward name="fShowPersonDayTimeline" path="/jsp/course/viewPersonDayTimeline.jsp"/>
+		<forward name="fShowViewGroupTimeline" path="/jsp/course/viewGroupTimeline.jsp" />
-		<forward name="fShowViewGroupTimeline" path="/jsp/course/viewGroupTimeline.jsp"/>
+		<forward name="fShowViewPersonTimeline" path="/jsp/course/ViewPersonTimeline.jsp" />
-		<forward name="fShowViewPersonTimeline" path="/jsp/course/ViewPersonTimeline.jsp"/>
+		<forward name="fShowViewOneGroup" path="/jsp/course/viewOneGroup.jsp" />
-		<forward name="fShowViewOneGroup" path="/jsp/course/viewOneGroup.jsp"/>
+		<forward name="fShowViewGroupsRelatorio" path="/jsp/course/viewGroupsRelatorio.jsp" />
-		<forward name="fShowViewGroupsRelatorio" path="/jsp/course/viewGroupsRelatorio.jsp"/>
+
-		
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
-		
 	</global-forwards>
 	<action-mappings>
-	
+
 		<action path="/courseMenu"
 			type="br.ufpe.cin.amadeus.amadeus_web.struts.action.CourseActions"
 			parameter="method" scope="request" />
-		
+
 		<action path="/course"
 			type="br.ufpe.cin.amadeus.amadeus_web.struts.action.CourseActions"
 			parameter="method" scope="request" />
-			
+
 		<action path="/advancedCourse" name="advancedSearchCourseForm"
 			type="br.ufpe.cin.amadeus.amadeus_web.struts.action.manager.ManagerUserActions"
 			parameter="method" scope="request" />
-		
+
 		<action input="/system.do?method=showViewMenu" name="searchCourseForm"
 			parameter="searchCourse" path="/searchCourse" scope="request"
-			type="br.ufpe.cin.amadeus.amadeus_web.struts.action.CourseActions"/>
-		
-		<action parameter="/jsp/course/viewCourses.jsp"
-			path="/fSearchCourse"
-			type="org.apache.struts.actions.ForwardAction" />
-		
-		<action name="formChangeTeacher"
-			input="/course.do?method=changeTeacher"
-			path="/changeTeacher" parameter="method"
-			scope="request"
-			type="br.ufpe.cin.amadeus.amadeus_web.struts.action.CourseActions" />	
-			
-		<action name="formRegisterCourseStepOne"
-			input="/jsp/course/insertCourseStepOne.jsp"
-			path="/insertCourseStepOne" parameter="insertCourseStepOne"
-			scope="request"
 			type="br.ufpe.cin.amadeus.amadeus_web.struts.action.CourseActions" />
-			
+
-		<action name="formRegisterCourseStepOne"
+		<action parameter="/jsp/course/viewCourses.jsp" path="/fSearchCourse"
-			input="/jsp/course/replicateCourseStepOne.jsp"
+			type="org.apache.struts.actions.ForwardAction" />
+
+		<action name="formChangeTeacher" input="/course.do?method=changeTeacher"
+			path="/changeTeacher" parameter="method" scope="request"
+			type="br.ufpe.cin.amadeus.amadeus_web.struts.action.CourseActions" />
+
+		<action name="formRegisterCourseStepOne" input="/jsp/course/insertCourseStepOne.jsp"
+			path="/insertCourseStepOne" parameter="insertCourseStepOne" scope="request"
+			type="br.ufpe.cin.amadeus.amadeus_web.struts.action.CourseActions" />
+
+		<action name="formRegisterCourseStepOne" input="/jsp/course/replicateCourseStepOne.jsp"
 			path="/replicateCourseStepOne" parameter="replicateCourseStepOne"
-			scope="request"
+			scope="request" type="br.ufpe.cin.amadeus.amadeus_web.struts.action.CourseActions" />
-			type="br.ufpe.cin.amadeus.amadeus_web.struts.action.CourseActions" />	
+
-		
+		<action name="viewCourseForm" input="/jsp/course/viewCourse.jsp"
-		<action name="viewCourseForm"
+			path="/viewCourse" parameter="viewCourse" scope="request"
-			input="/jsp/course/viewCourse.jsp"
-			path="/viewCourse" parameter="viewCourse"
-			scope="request"
 			type="br.ufpe.cin.amadeus.amadeus_web.struts.action.CourseActions" />
-			
+
-		<action parameter="/jsp/course/insertCourseStepOne.jsp"
+		<action parameter="/jsp/course/insertCourseStepOne.jsp" path="/fInsertCourseStepOne"
-			path="/fInsertCourseStepOne"
 			type="org.apache.struts.actions.ForwardAction" />
-			
+
 		<action parameter="/jsp/course/replicateCourseStepOne.jsp"
-			path="/fReplicateCourseStepOne"
+			path="/fReplicateCourseStepOne" type="org.apache.struts.actions.ForwardAction" />
-			type="org.apache.struts.actions.ForwardAction" />
 
-		<action name="formRegisterCourseStepTwo"
+		<action name="formRegisterCourseStepTwo" input="/jsp/course/insertCourseStepTwo.jsp"
-			input="/jsp/course/insertCourseStepTwo.jsp"
+			path="/insertCourseStepTwo" parameter="insertCourseStepTwo" scope="request"
-			path="/insertCourseStepTwo" parameter="insertCourseStepTwo"
-			scope="request"
 			type="br.ufpe.cin.amadeus.amadeus_web.struts.action.CourseActions" />
 
-		<action parameter="/jsp/course/insertCourseStepTwo.jsp"
+		<action parameter="/jsp/course/insertCourseStepTwo.jsp" path="/fInsertCourseStepTwo"
-			path="/fInsertCourseStepTwo"
 			type="org.apache.struts.actions.ForwardAction" />
 
 		<action name="formEditCourse" input="/course.do?method=showViewEditCourse"
 			path="/editCourse" parameter="editCourse" scope="request"
 			type="br.ufpe.cin.amadeus.amadeus_web.struts.action.CourseActions">
-<<<<<<< HEAD
 		</action>
-		
-		<action name="formSocialInteractionMonitoring" input="/course.do?method=showViewSocialInteractionMonitoring"
-			path="/socialInteractionMonitoring" parameter="socialInteractionMonitoring" scope="request"
-			type="br.ufpe.cin.amadeus.amadeus_web.struts.action.CourseActions">
-		</action>
-		
-		<action name="formSocialInteractionMonitoringReports" input="/course.do?method=showViewSocialInteractionMonitoringReports"
-			path="/socialInteractionMonitoringReports" parameter="socialInteractionMonitoringReports" scope="request"
-			type="br.ufpe.cin.amadeus.amadeus_web.struts.action.CourseActions">
-		</action>
-=======
-			</action>
-			
-		<action name="formCriarGrupo" input="/course.do?method=showViewCreateGroup"
-			path="/course.do?method=showViewCreateGroup" parameter="criarGrupo" scope="request"
-			type="br.ufpe.cin.amadeus.amadeus_web.struts.action.CourseActions">
-			</action>
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 
-		<action path="/fViewDeleteConfirmation"
+		<action name="formSocialInteractionMonitoring"
-			parameter="/jsp/course/viewCourseDeleteConfirmation.jsp"
+			input="/course.do?method=showViewSocialInteractionMonitoring" path="/socialInteractionMonitoring"
-			scope="request"
+			parameter="socialInteractionMonitoring" scope="request"
-			type="org.apache.struts.actions.ForwardAction" />
+			type="br.ufpe.cin.amadeus.amadeus_web.struts.action.CourseActions">
+		</action>
+
+		<action name="formSocialInteractionMonitoringReports"
+			input="/course.do?method=showViewSocialInteractionMonitoringReports"
+			path="/socialInteractionMonitoringReports" parameter="socialInteractionMonitoringReports"
+			scope="request" type="br.ufpe.cin.amadeus.amadeus_web.struts.action.CourseActions">
+		</action>
+
+		<action name="formCriarGrupo" input="/course.do?method=showViewCreateGroup"
+			path="/course.do?method=showViewCreateGroup" parameter="criarGrupo"
+			scope="request" type="br.ufpe.cin.amadeus.amadeus_web.struts.action.CourseActions">
+		</action>
+
+		<action path="/fViewDeleteConfirmation" parameter="/jsp/course/viewCourseDeleteConfirmation.jsp"
+			scope="request" type="org.apache.struts.actions.ForwardAction" />
 
 	</action-mappings>
-	<controller nocache="true"  />
+	<controller nocache="true" />
 	<message-resources null="false"
 		parameter="br.ufpe.cin.amadeus.amadeus_web.struts.messages.MessageResources" />
 </struts-config>

WebContent/WEB-INF/web.xml

@@ -1,48 +1,49 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- <display-name>AmadeusLMS</display-name>
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+	<display-name>AmadeusLMS</display-name>
 	<filter>
-  		<filter-name>AmadeusCharSetFilter</filter-name>
+		<filter-name>AmadeusCharSetFilter</filter-name>
-  		<filter-class>br.ufpe.cin.amadeus.amadeus_web.util.AmadeusCharSetFilter</filter-class>
+		<filter-class>br.ufpe.cin.amadeus.amadeus_web.util.AmadeusCharSetFilter</filter-class>
- 	 	<init-param>
+		<init-param>
-            <param-name>requestEncoding</param-name>
+			<param-name>requestEncoding</param-name>
-            <param-value>UTF-8</param-value>
+			<param-value>UTF-8</param-value>
-        </init-param>
+		</init-param>
-    </filter>
+	</filter>
-    <filter-mapping>
+	<filter-mapping>
-        <filter-name>AmadeusCharSetFilter</filter-name>
+		<filter-name>AmadeusCharSetFilter</filter-name>
-        <url-pattern>/*</url-pattern>
+		<url-pattern>/*</url-pattern>
-    </filter-mapping>
+	</filter-mapping>
- 
- <filter>
-  <filter-name>HibernateSessionRequestFilter</filter-name>
-  <filter-class>br.ufpe.cin.amadeus.amadeus_web.util.HibernateSessionRequestFilter</filter-class>
- </filter>
- <filter>
-  <filter-name>XSS</filter-name>
-  <filter-class>br.ufpe.cin.amadeus.amadeus_web.util.CrossScriptingFilter</filter-class>
- </filter>
- <filter-mapping>
-  <filter-name>HibernateSessionRequestFilter</filter-name>
-  <url-pattern>/*</url-pattern>
- </filter-mapping>
 
- <filter-mapping>
+	<filter>
-  <filter-name>XSS</filter-name>
+		<filter-name>HibernateSessionRequestFilter</filter-name>
-  <url-pattern>/*</url-pattern>
+		<filter-class>br.ufpe.cin.amadeus.amadeus_web.util.HibernateSessionRequestFilter</filter-class>
- </filter-mapping>
+	</filter>
- <listener>
+	<filter>
-  <listener-class>br.ufpe.cin.amadeus.amadeus_web.util.AmadeusSessionListener</listener-class>
+		<filter-name>XSS</filter-name>
- </listener>
+		<filter-class>br.ufpe.cin.amadeus.amadeus_web.util.CrossScriptingFilter</filter-class>
-  
+	</filter>
- <!-- Action Servlet Configuration -->
+	<filter-mapping>
- <servlet>
+		<filter-name>HibernateSessionRequestFilter</filter-name>
-  <servlet-name>action</servlet-name>
+		<url-pattern>/*</url-pattern>
-  <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
+	</filter-mapping>
-  <init-param>
+
-   <param-name>config</param-name>
+	<filter-mapping>
-   <param-value>/WEB-INF/struts/struts-config.xml,
+		<filter-name>XSS</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+	<listener>
+		<listener-class>br.ufpe.cin.amadeus.amadeus_web.util.AmadeusSessionListener</listener-class>
+	</listener>
+
+	<!-- Action Servlet Configuration -->
+	<servlet>
+		<servlet-name>action</servlet-name>
+		<servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
+		<init-param>
+			<param-name>config</param-name>
+			<param-value>/WEB-INF/struts/struts-config.xml,
    						 /WEB-INF/struts/struts-config-system.xml,
    					  	 /WEB-INF/struts/struts-config-user.xml,
    						 /WEB-INF/struts/struts-config-course.xml,
@@ -50,145 +51,135 @@
    						 /WEB-INF/struts/struts-config-mobile.xml,
    						 /WEB-INF/struts/struts-config-openid.xml,
    						 /WEB-INF/struts/struts-config-settings.xml,
-<<<<<<< HEAD
    						 /WEB-INF/struts/struts-config-log.xml,
    						 /WEB-INF/struts/struts-config-messenger.xml,
-   						 /WEB-INF/struts/struts-config-twittertool.xml</param-value>
+   						 /WEB-INF/struts/struts-config-twittertool.xml
-=======
    						 /WEB-INF/struts/struts-config-log.xml</param-value>
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
+		</init-param>
-  </init-param>
+		<load-on-startup>2</load-on-startup>
-  <load-on-startup>2</load-on-startup>
+	</servlet>
- </servlet>
- 
- <!-- JAXWS Servlet Configuration -->
- <!-- <servlet>
-    <description>Cadastro de Pessoa JAX-WS</description>
-    <display-name>courseWS</display-name>
-    <servlet-name>courseWS</servlet-name>
-    <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
-    <load-on-startup>1</load-on-startup>
-  </servlet>  -->
- <!-- Listener JAXWS Configuration -->
- <!-- <listener>
-    <listener-class>com.sun.xml.ws.transport.http.servlet.WSServletContextListener</listener-class>
- </listener>  -->
- <!-- Mapping JAXWS Configuration -->
- <!-- <servlet-mapping>
-    <servlet-name>courseWS</servlet-name>
-    <url-pattern>/courseWS</url-pattern>
- </servlet-mapping> -->
- 
- <!-- REST Servlet Configuration  -->
- <servlet>
-    <servlet-name>Jersey REST Service</servlet-name>
-    <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
-    <init-param>
-      <param-name>com.sun.jersey.config.property.packages</param-name>
-      <param-value>br.ufpe.cin.amadeus.amadeus_web.services</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
 
-<!-- Mapping REST Configuration -->
+	<!-- JAXWS Servlet Configuration -->
-<servlet-mapping>
+	<!-- <servlet> <description>Cadastro de Pessoa JAX-WS</description> <display-name>courseWS</display-name> 
-    <servlet-name>Jersey REST Service</servlet-name>
+		<servlet-name>courseWS</servlet-name> <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class> 
-    <url-pattern>/ws/*</url-pattern>
+		<load-on-startup>1</load-on-startup> </servlet> -->
-  </servlet-mapping>
+	<!-- Listener JAXWS Configuration -->
-  
+	<!-- <listener> <listener-class>com.sun.xml.ws.transport.http.servlet.WSServletContextListener</listener-class> 
-  
+		</listener> -->
- <!-- DWR Configuration-->
+	<!-- Mapping JAXWS Configuration -->
- <servlet>
+	<!-- <servlet-mapping> <servlet-name>courseWS</servlet-name> <url-pattern>/courseWS</url-pattern> 
-  <description>dwr-invoker</description>
+		</servlet-mapping> -->
-  <servlet-name>dwr-invoker</servlet-name>
+
-  <servlet-class>org.directwebremoting.servlet.DwrServlet</servlet-class>
+	<!-- REST Servlet Configuration -->
-  <init-param>
+	<servlet>
-   <param-name>debug</param-name>
+		<servlet-name>Jersey REST Service</servlet-name>
-   <param-value>false</param-value>
+		<servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
-  </init-param>
+		<init-param>
-  <init-param>
+			<param-name>com.sun.jersey.config.property.packages</param-name>
-   <param-name>activeReverseAjaxEnabled</param-name>
+			<param-value>br.ufpe.cin.amadeus.amadeus_web.services</param-value>
-   <param-value>true</param-value>
+		</init-param>
-  </init-param>
+		<load-on-startup>1</load-on-startup>
-  <init-param>
+	</servlet>
-   <param-name>initApplicationScopeCreatorsAtStartup</param-name>
+
-   <param-value>true</param-value>
+	<!-- Mapping REST Configuration -->
-  </init-param>
-  <init-param>
-   <param-name>classes</param-name>
-   <param-value>br.ufpe.cin.amadeus.amadeus_web.util.UtilDWR</param-value>
-  </init-param>
- </servlet>
- <!-- Action Servlet Mapping -->
- <servlet-mapping>
-  <servlet-name>action</servlet-name>
-  <url-pattern>*.do</url-pattern>
- </servlet-mapping>
- 
- <!-- DWR Mapping -->
- 	 <listener>
-    	<listener-class>org.directwebremoting.servlet.DwrListener</listener-class>
-  	</listener>
 	<servlet-mapping>
-  		<servlet-name>dwr-invoker</servlet-name>
+		<servlet-name>Jersey REST Service</servlet-name>
-  		<url-pattern>/dwr/*</url-pattern>
+		<url-pattern>/ws/*</url-pattern>
- 	</servlet-mapping>
+	</servlet-mapping>
- 	<session-config>
+
-  		<session-timeout>20</session-timeout>
+
- 	</session-config>
+	<!-- DWR Configuration -->
- <!-- The Usual Welcome File List -->
+	<servlet>
- <welcome-file-list>
+		<description>dwr-invoker</description>
-  <welcome-file>index.jsp</welcome-file>
+		<servlet-name>dwr-invoker</servlet-name>
-  
+		<servlet-class>org.directwebremoting.servlet.DwrServlet</servlet-class>
- </welcome-file-list>
+		<init-param>
- <error-page>
+			<param-name>debug</param-name>
-  <error-code>404</error-code>
+			<param-value>false</param-value>
-  <location>/system.do?method=showViewPageNotFound</location>
+		</init-param>
- </error-page>
+		<init-param>
- <error-page>
+			<param-name>activeReverseAjaxEnabled</param-name>
-  <exception-type>java.lang.Exception</exception-type>
+			<param-value>true</param-value>
-  <location>/system.do?method=showViewException</location>
+		</init-param>
- </error-page>
+		<init-param>
- <jsp-config>
+			<param-name>initApplicationScopeCreatorsAtStartup</param-name>
-  <taglib>
+			<param-value>true</param-value>
-   <taglib-uri>/WEB-INF/struts-bean</taglib-uri>
+		</init-param>
-   <taglib-location>/WEB-INF/tags/struts-bean.tld</taglib-location>
+		<init-param>
-  </taglib>
+			<param-name>classes</param-name>
-  <taglib>
+			<param-value>br.ufpe.cin.amadeus.amadeus_web.util.UtilDWR</param-value>
-   <taglib-uri>/WEB-INF/struts-logic</taglib-uri>
+		</init-param>
-   <taglib-location>/WEB-INF/tags/struts-logic.tld</taglib-location>
+	</servlet>
-  </taglib>
+	<!-- Action Servlet Mapping -->
-  <taglib>
+	<servlet-mapping>
-   <taglib-uri>/WEB-INF/struts-html</taglib-uri>
+		<servlet-name>action</servlet-name>
-   <taglib-location>/WEB-INF/tags/struts-html.tld</taglib-location>
+		<url-pattern>*.do</url-pattern>
-  </taglib>
+	</servlet-mapping>
-  <taglib>
+
-   <taglib-uri>/WEB-INF/struts-tiles</taglib-uri>
+	<!-- DWR Mapping -->
-   <taglib-location>/WEB-INF/tags/struts-tiles.tld</taglib-location>
+	<listener>
-  </taglib>
+		<listener-class>org.directwebremoting.servlet.DwrListener</listener-class>
-  <taglib>
+	</listener>
-   <taglib-uri>/WEB-INF/struts-nested</taglib-uri>
+	<servlet-mapping>
-   <taglib-location>/WEB-INF/tags/struts-nested.tld</taglib-location>
+		<servlet-name>dwr-invoker</servlet-name>
-  </taglib>
+		<url-pattern>/dwr/*</url-pattern>
-  <taglib>
+	</servlet-mapping>
-   <taglib-uri>/WEB-INF/c</taglib-uri>
+	<session-config>
-   <taglib-location>/WEB-INF/tags/c.tld</taglib-location>
+		<session-timeout>20</session-timeout>
-  </taglib>
+	</session-config>
-  <taglib>
+	<!-- The Usual Welcome File List -->
-   <taglib-uri>/WEB-INF/fmt</taglib-uri>
+	<welcome-file-list>
-   <taglib-location>/WEB-INF/tags/fmt.tld</taglib-location>
+		<welcome-file>index.jsp</welcome-file>
-  </taglib>
+
-  <taglib>
+	</welcome-file-list>
-   <taglib-uri>/WEB-INF/sql</taglib-uri>
+	<error-page>
-   <taglib-location>/WEB-INF/tags/sql.tld</taglib-location>
+		<error-code>404</error-code>
-  </taglib>
+		<location>/system.do?method=showViewPageNotFound</location>
-  <taglib>
+	</error-page>
-   <taglib-uri>/WEB-INF/x</taglib-uri>
+	<error-page>
-   <taglib-location>/WEB-INF/tags/x.tld</taglib-location>
+		<exception-type>java.lang.Exception</exception-type>
-  </taglib>
+		<location>/system.do?method=showViewException</location>
- </jsp-config>
+	</error-page>
- <login-config>
+	<jsp-config>
-  <auth-method>BASIC</auth-method>
+		<taglib>
- </login-config>
+			<taglib-uri>/WEB-INF/struts-bean</taglib-uri>
- 
+			<taglib-location>/WEB-INF/tags/struts-bean.tld</taglib-location>
+		</taglib>
+		<taglib>
+			<taglib-uri>/WEB-INF/struts-logic</taglib-uri>
+			<taglib-location>/WEB-INF/tags/struts-logic.tld</taglib-location>
+		</taglib>
+		<taglib>
+			<taglib-uri>/WEB-INF/struts-html</taglib-uri>
+			<taglib-location>/WEB-INF/tags/struts-html.tld</taglib-location>
+		</taglib>
+		<taglib>
+			<taglib-uri>/WEB-INF/struts-tiles</taglib-uri>
+			<taglib-location>/WEB-INF/tags/struts-tiles.tld</taglib-location>
+		</taglib>
+		<taglib>
+			<taglib-uri>/WEB-INF/struts-nested</taglib-uri>
+			<taglib-location>/WEB-INF/tags/struts-nested.tld</taglib-location>
+		</taglib>
+		<taglib>
+			<taglib-uri>/WEB-INF/c</taglib-uri>
+			<taglib-location>/WEB-INF/tags/c.tld</taglib-location>
+		</taglib>
+		<taglib>
+			<taglib-uri>/WEB-INF/fmt</taglib-uri>
+			<taglib-location>/WEB-INF/tags/fmt.tld</taglib-location>
+		</taglib>
+		<taglib>
+			<taglib-uri>/WEB-INF/sql</taglib-uri>
+			<taglib-location>/WEB-INF/tags/sql.tld</taglib-location>
+		</taglib>
+		<taglib>
+			<taglib-uri>/WEB-INF/x</taglib-uri>
+			<taglib-location>/WEB-INF/tags/x.tld</taglib-location>
+		</taglib>
+	</jsp-config>
+	<login-config>
+		<auth-method>BASIC</auth-method>
+	</login-config>
+
 </web-app>

WebContent/js/managementActivity.js

@@ -202,7 +202,6 @@ function showScoreGameGrupo(type,idMMJogos){
 	UtilDWR.getInclude('/changeOrderGame.do?method=changeOrderGame&type='+type+'&idMMJogos='+idMMJogos,
  		function(data) {
 			dwr.util.setValue('percepcao'+idMMJogos, data, { escapeHtml:false });
-<<<<<<< HEAD
 		}
   	);
 }
@@ -211,8 +210,6 @@ function showScoreGameIndividual(type,idMMJogos,idUser){
 	UtilDWR.getInclude('/changeOrderGame.do?method=changeOrderGame&type='+type+'&idMMJogos='+idMMJogos+'&idUser='+idUser,
  		function(data) {
 			dwr.util.setValue('percepcao'+idMMJogos, data, { escapeHtml:false });
-=======
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 		}
   	);
 }

src/br/ufpe/cin/amadeus/amadeus_web/dao/DAOFactory.java

@@ -13,12 +13,9 @@ Voc� deve ter recebido uma c�pia da Licen�a P�blica Geral GNU, sob o t
 
 package br.ufpe.cin.amadeus.amadeus_web.dao;
 
-<<<<<<< HEAD
 import java.util.Date;
 import java.util.List;
 
-=======
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 import br.ufpe.cin.amadeus.amadeus_web.dao.content_managment.AmadeusDroidHistoricDAO;
 import br.ufpe.cin.amadeus.amadeus_web.dao.content_managment.ArchiveDAO;
 import br.ufpe.cin.amadeus.amadeus_web.dao.content_managment.CourseDAO;
@@ -49,14 +46,11 @@ import br.ufpe.cin.amadeus.amadeus_web.dao.register.PersonDAO;
 import br.ufpe.cin.amadeus.amadeus_web.dao.register.ResumeDAO;
 import br.ufpe.cin.amadeus.amadeus_web.dao.register.TweetDAO;
 import br.ufpe.cin.amadeus.amadeus_web.dao.register.UserRequestDAO;
-<<<<<<< HEAD
 import br.ufpe.cin.amadeus.amadeus_web.domain.register.Tweet;
-=======
 import br.ufpe.cin.amadeus.amadeus_web.dao.content_managment.evaluation.EvaluationDAO;
 import br.ufpe.cin.amadeus.amadeus_web.dao.content_managment.evaluation.EvaluationRealizedDAO;
 import br.ufpe.cin.amadeus.amadeus_web.dao.content_managment.externallink.ExternalLinkDAO;
 import br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Groups;
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 
 public abstract class DAOFactory {
 
@@ -109,11 +103,8 @@ public abstract class DAOFactory {
 	public abstract ExternalLinkDAO getExternalLinkDAO();
 	public abstract AmadeusDroidHistoricDAO getAmadeusDroidHistoricDAO();
 	public abstract LogDAO getLogDAO();
-<<<<<<< HEAD
 	public abstract MessengerMessageDAO getMessengerMessageDAO(); //Added by Nailson Cunha
 	public abstract TweetDAO getTweetDAO(); //Added by Nailson Cunha
-=======
 	public abstract GroupsDAO getGroupsDAO();
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 }
 

src/br/ufpe/cin/amadeus/amadeus_web/dao/content_managment/ForumDAO.java

@@ -1,14 +1,14 @@
 /**
 Copyright 2008, 2009 UFPE - Universidade Federal de Pernambuco
  
-Este arquivo é parte do programa Amadeus Sistema de Gestão de Aprendizagem, ou simplesmente Amadeus LMS
+Este arquivo � parte do programa Amadeus Sistema de Gest�o de Aprendizagem, ou simplesmente Amadeus LMS
  
-O Amadeus LMS é um software livre; você pode redistribui-lo e/ou modifica-lo dentro dos termos da Licença Pública Geral GNU como
+O Amadeus LMS � um software livre; voc� pode redistribui-lo e/ou modifica-lo dentro dos termos da Licen�a P�blica Geral GNU como
-publicada pela Fundação do Software Livre (FSF); na versão 2 da Licença.
+publicada pela Funda��o do Software Livre (FSF); na vers�o 2 da Licen�a.
  
-Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU para maiores detalhes.
+Este programa � distribu�do na esperan�a que possa ser �til, mas SEM NENHUMA GARANTIA; sem uma garantia impl�cita de ADEQUA��O a qualquer MERCADO ou APLICA��O EM PARTICULAR. Veja a Licen�a P�blica Geral GNU para maiores detalhes.
  
-Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título "LICENCA.txt", junto com este programa, se não, escreva para a Fundação do Software Livre (FSF) Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
+Voc� deve ter recebido uma c�pia da Licen�a P�blica Geral GNU, sob o t�tulo "LICENCA.txt", junto com este programa, se n�o, escreva para a Funda��o do Software Livre (FSF) Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 **/
 
 package br.ufpe.cin.amadeus.amadeus_web.dao.content_managment;
@@ -22,10 +22,7 @@ import br.ufpe.cin.amadeus.amadeus_web.domain.register.Person;
 public interface ForumDAO extends GenericDAO <Forum, Integer> {
 	
 	List<Forum> getListForum();
-<<<<<<< HEAD
-=======
 	
 	boolean verificarStatusPorForum(List<Person> alunos, Forum forum);
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 
 }

src/br/ufpe/cin/amadeus/amadeus_web/dao/content_managment/GameDAO.java

@@ -1,14 +1,14 @@
 /**
 Copyright 2008, 2009 UFPE - Universidade Federal de Pernambuco
  
-Este arquivo é parte do programa Amadeus Sistema de Gestão de Aprendizagem, ou simplesmente Amadeus LMS
+Este arquivo � parte do programa Amadeus Sistema de Gest�o de Aprendizagem, ou simplesmente Amadeus LMS
  
-O Amadeus LMS é um software livre; você pode redistribui-lo e/ou modifica-lo dentro dos termos da Licença Pública Geral GNU como
+O Amadeus LMS � um software livre; voc� pode redistribui-lo e/ou modifica-lo dentro dos termos da Licen�a P�blica Geral GNU como
-publicada pela Fundação do Software Livre (FSF); na versão 2 da Licença.
+publicada pela Funda��o do Software Livre (FSF); na vers�o 2 da Licen�a.
  
-Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU para maiores detalhes.
+Este programa � distribu�do na esperan�a que possa ser �til, mas SEM NENHUMA GARANTIA; sem uma garantia impl�cita de ADEQUA��O a qualquer MERCADO ou APLICA��O EM PARTICULAR. Veja a Licen�a P�blica Geral GNU para maiores detalhes.
  
-Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título "LICENCA.txt", junto com este programa, se não, escreva para a Fundação do Software Livre (FSF) Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
+Voc� deve ter recebido uma c�pia da Licen�a P�blica Geral GNU, sob o t�tulo "LICENCA.txt", junto com este programa, se n�o, escreva para a Funda��o do Software Livre (FSF) Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 **/
 
 package br.ufpe.cin.amadeus.amadeus_web.dao.content_managment;
@@ -21,10 +21,8 @@ import br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Game;
 import br.ufpe.cin.amadeus.amadeus_web.domain.register.Person;
 
 public interface GameDAO extends GenericDAO <Game, Integer>{
-<<<<<<< HEAD
+
 	public List<Game> getAllGameFromCourse(Course course);
-=======
+	
-	public List<Game> getAllGameFromCourse(Course course);	
 	boolean verificarStatusPorGame(List<Person> alunos, Game game);
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 }

src/br/ufpe/cin/amadeus/amadeus_web/dao/content_managment/PersonRoleCourseDAO.java

@@ -34,8 +34,5 @@ public interface PersonRoleCourseDAO extends GenericDAO<PersonRoleCourse, Intege
 	public List<PersonRoleCourse> getByRoleInCourse(Person person, Course course, Role role);
 	public List<PersonRoleCourse> getStudentRolesCourses(int studentId);
 	public List<PersonRoleCourse> getStudentByUser(AccessInfo accessInfo);
-<<<<<<< HEAD
-=======
 	public List<StudentHaveGroup> getStudentHaveGroupByCourse(Course course, Person person);
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 }

src/br/ufpe/cin/amadeus/amadeus_web/dao/hibernate/HibernateDAOFactory.java

@@ -208,10 +208,9 @@ public class HibernateDAOFactory extends DAOFactory {
 	public LogDAO getLogDAO() {
 		return (LogDAO) instantiateDAO(LogHibernateDAO.class);
 	}
-<<<<<<< HEAD
 
 	/**
-	 * Método que retorna o MessengerMessageDAO
+	 * M�todo que retorna o MessengerMessageDAO
 	 * @author Nailson Cunha
 	 */
 	@Override
@@ -223,14 +222,12 @@ public class HibernateDAOFactory extends DAOFactory {
 	public TweetDAO getTweetDAO() {
 		return (TweetDAO) instantiateDAO(TweetHibernateDAO.class);
 	}
-	
+		
-=======
-	
 	@Override
 	public GroupsDAO getGroupsDAO() {
 		return (GroupsDAO) instantiateDAO(GroupsHibernateDAO.class);
 	}
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
+
 }
 
 

src/br/ufpe/cin/amadeus/amadeus_web/dao/hibernate/content_managment/ForumHibernateDAO.java

@@ -1,25 +1,22 @@
 /**
 Copyright 2008, 2009 UFPE - Universidade Federal de Pernambuco
  
-Este arquivo é parte do programa Amadeus Sistema de Gestão de Aprendizagem, ou simplesmente Amadeus LMS
+Este arquivo � parte do programa Amadeus Sistema de Gest�o de Aprendizagem, ou simplesmente Amadeus LMS
  
-O Amadeus LMS é um software livre; você pode redistribui-lo e/ou modifica-lo dentro dos termos da Licença Pública Geral GNU como
+O Amadeus LMS � um software livre; voc� pode redistribui-lo e/ou modifica-lo dentro dos termos da Licen�a P�blica Geral GNU como
-publicada pela Fundação do Software Livre (FSF); na versão 2 da Licença.
+publicada pela Funda��o do Software Livre (FSF); na vers�o 2 da Licen�a.
  
-Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU para maiores detalhes.
+Este programa � distribu�do na esperan�a que possa ser �til, mas SEM NENHUMA GARANTIA; sem uma garantia impl�cita de ADEQUA��O a qualquer MERCADO ou APLICA��O EM PARTICULAR. Veja a Licen�a P�blica Geral GNU para maiores detalhes.
  
-Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título "LICENCA.txt", junto com este programa, se não, escreva para a Fundação do Software Livre (FSF) Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
+Voc� deve ter recebido uma c�pia da Licen�a P�blica Geral GNU, sob o t�tulo "LICENCA.txt", junto com este programa, se n�o, escreva para a Funda��o do Software Livre (FSF) Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 **/
 
 package br.ufpe.cin.amadeus.amadeus_web.dao.hibernate.content_managment;
 
 import java.util.List;
 
-<<<<<<< HEAD
-=======
 import org.apache.poi.hssf.record.formula.functions.Int;
 
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 import br.ufpe.cin.amadeus.amadeus_web.dao.content_managment.ForumDAO;
 import br.ufpe.cin.amadeus.amadeus_web.dao.hibernate.GenericHibernateDAO;
 import br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Course;
@@ -39,8 +36,6 @@ public class ForumHibernateDAO extends GenericHibernateDAO<Forum, Integer> imple
 		return results;
 	}
 
-<<<<<<< HEAD
-=======
 	@SuppressWarnings("unchecked")
 	@Override
 	public boolean verificarStatusPorForum(List<Person> alunos, Forum forum) {
@@ -69,5 +64,4 @@ public class ForumHibernateDAO extends GenericHibernateDAO<Forum, Integer> imple
 		return retorno;
 	}
 
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 }

src/br/ufpe/cin/amadeus/amadeus_web/dao/hibernate/content_managment/GameHibernateDAO.java

@@ -1,25 +1,22 @@
 /**
 Copyright 2008, 2009 UFPE - Universidade Federal de Pernambuco
  
-Este arquivo é parte do programa Amadeus Sistema de Gestão de Aprendizagem, ou simplesmente Amadeus LMS
+Este arquivo � parte do programa Amadeus Sistema de Gest�o de Aprendizagem, ou simplesmente Amadeus LMS
  
-O Amadeus LMS é um software livre; você pode redistribui-lo e/ou modifica-lo dentro dos termos da Licença Pública Geral GNU como
+O Amadeus LMS � um software livre; voc� pode redistribui-lo e/ou modifica-lo dentro dos termos da Licen�a P�blica Geral GNU como
-publicada pela Fundação do Software Livre (FSF); na versão 2 da Licença.
+publicada pela Funda��o do Software Livre (FSF); na vers�o 2 da Licen�a.
  
-Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU para maiores detalhes.
+Este programa � distribu�do na esperan�a que possa ser �til, mas SEM NENHUMA GARANTIA; sem uma garantia impl�cita de ADEQUA��O a qualquer MERCADO ou APLICA��O EM PARTICULAR. Veja a Licen�a P�blica Geral GNU para maiores detalhes.
  
-Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título "LICENCA.txt", junto com este programa, se não, escreva para a Fundação do Software Livre (FSF) Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
+Voc� deve ter recebido uma c�pia da Licen�a P�blica Geral GNU, sob o t�tulo "LICENCA.txt", junto com este programa, se n�o, escreva para a Funda��o do Software Livre (FSF) Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 **/
 
 package br.ufpe.cin.amadeus.amadeus_web.dao.hibernate.content_managment;
 
 import java.util.List;
 
-<<<<<<< HEAD
-=======
 import org.apache.poi.hssf.record.formula.functions.Int;
 
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 import br.ufpe.cin.amadeus.amadeus_web.dao.content_managment.GameDAO;
 import br.ufpe.cin.amadeus.amadeus_web.dao.hibernate.GenericHibernateDAO;
 import br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Course;
@@ -39,8 +36,6 @@ public class GameHibernateDAO extends GenericHibernateDAO<Game, Integer>
 
 		return game;
 	}
-<<<<<<< HEAD
-=======
 	
 	@SuppressWarnings("unchecked")
 	@Override
@@ -69,6 +64,5 @@ public class GameHibernateDAO extends GenericHibernateDAO<Game, Integer>
 		
 		return retorno;
 	}
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 
 }

src/br/ufpe/cin/amadeus/amadeus_web/dao/hibernate/register/PersonHibernateDAO.java

@@ -13,16 +13,13 @@ Voc� deve ter recebido uma c�pia da Licen�a P�blica Geral GNU, sob o t
 
 package br.ufpe.cin.amadeus.amadeus_web.dao.hibernate.register;
 
-<<<<<<< HEAD
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-=======
 import java.math.BigInteger;
 import java.util.ArrayList;
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 import java.util.List;
 
 import org.hibernate.Criteria;
@@ -38,13 +35,10 @@ import br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Role;
 import br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Status;
 import br.ufpe.cin.amadeus.amadeus_web.domain.register.Person;
 import br.ufpe.cin.amadeus.amadeus_web.syncronize.AccessInfo;
-<<<<<<< HEAD
+import br.ufpe.cin.amadeus.amadeus_web.syncronize.TimelineItem;
 
 public class PersonHibernateDAO extends GenericHibernateDAO<Person, Integer>
 		implements PersonDAO {
-=======
-import br.ufpe.cin.amadeus.amadeus_web.syncronize.TimelineItem;
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 
 	public PersonHibernateDAO() {
 		super();
@@ -86,22 +80,12 @@ import br.ufpe.cin.amadeus.amadeus_web.syncronize.TimelineItem;
 
 	@Override
 	public Person getPersonByLogin(String login) {
-<<<<<<< HEAD
-
 		StringBuilder hql = new StringBuilder();
 		hql.append("select p from Person p " + "where p.accessInfo.login = '"
 				+ login + "'");
 
 		Person person = (Person) getSession().createQuery(hql.toString())
 				.uniqueResult();
-=======
-		
-		StringBuilder hql = new StringBuilder();
-		hql.append("select p from Person p " +
-				   "where p.accessInfo.login = '" + login + "'");
-		
-		Person person = (Person) getSession().createQuery(hql.toString()).uniqueResult();
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 		return person;
 	}
 
@@ -109,7 +93,7 @@ import br.ufpe.cin.amadeus.amadeus_web.syncronize.TimelineItem;
 	public Person getPersonByUserName(String userName) {
 		StringBuilder hql = new StringBuilder();
 		hql.append("select p from Person p where p.name = '" + userName + "'");
-<<<<<<< HEAD
+
 		Person person = (Person) getSession().createQuery(hql.toString())
 				.uniqueResult();
 		return person;
@@ -135,9 +119,6 @@ import br.ufpe.cin.amadeus.amadeus_web.syncronize.TimelineItem;
 			e.printStackTrace();
 		}
 		return 0;
-=======
-		Person person = (Person) getSession().createQuery(hql.toString()).uniqueResult();
-		return person;
 	}
 	
 	@SuppressWarnings("unchecked")
@@ -186,7 +167,6 @@ import br.ufpe.cin.amadeus.amadeus_web.syncronize.TimelineItem;
 		
 		List<Log>  list = getSession().createSQLQuery(sqlQuery).addEntity("l", Log.class).list();
 		return list;
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 	}
 
 }

src/br/ufpe/cin/amadeus/amadeus_web/dao/register/PersonDAO.java

@@ -21,10 +21,7 @@ import br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Log;
 import br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Role;
 import br.ufpe.cin.amadeus.amadeus_web.domain.register.Person;
 import br.ufpe.cin.amadeus.amadeus_web.syncronize.AccessInfo;
-<<<<<<< HEAD
-=======
 import br.ufpe.cin.amadeus.amadeus_web.syncronize.TimelineItem;
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 
 public interface PersonDAO extends GenericDAO<Person, Integer> {
 	
@@ -33,10 +30,8 @@ public interface PersonDAO extends GenericDAO<Person, Integer> {
 	public List<String> getAllEmails();
 	public Person getPersonByLogin(String login);
 	public Person getPersonByUserName(String userName);
-<<<<<<< HEAD
 	public int getPersonByTwitterLogin(String screenName);
-=======
 	public List<TimelineItem> getTimelineByPersonID(int personID, int groupID);
 	public List<Log> getLogsByDayAndPerson(String data, int groupID, int personID);
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
+
 }

src/br/ufpe/cin/amadeus/amadeus_web/domain/content_management/Forum.java

@@ -29,15 +29,11 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.xml.bind.annotation.XmlRootElement;
-<<<<<<< HEAD
 
 import org.apache.commons.collections.MultiHashMap;
 import org.apache.commons.collections.MultiMap;
 import org.hibernate.annotations.Cascade;
 
-
-=======
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 /**
  * Classe que encapsula os dados de um forum
  * 

src/br/ufpe/cin/amadeus/amadeus_web/domain/content_management/Log.java

@@ -34,7 +34,6 @@ public class Log implements Serializable{
 	@Column(name="metaalternativa")
 	private Integer metaAlternativa;
 
-<<<<<<< HEAD
 	public static int LOG_CODIGO_LOGIN = 1; //Ok
 	public static int LOG_CODIGO_LOGOUT = 2; //Ok
 	public static int LOG_CODIGO_FORUM_POST = 3; //Ok - postagens em foruns
@@ -45,18 +44,6 @@ public class Log implements Serializable{
 	public static int LOG_CODIGO_JOGAR = 8; //Ok
 	public static int LOG_CODIGO_ENTREGAR_MATERIAL = 9; //Ok
 	public static int LOG_CODIGO_VISUALIZACAO_VIDEO = 10;
-=======
-	public final static int LOG_CODIGO_LOGIN = 1; //Ok
-	public final static int LOG_CODIGO_LOGOUT = 2; //Ok
-	public final static int LOG_CODIGO_FORUM_POST = 3; //Ok - postagens em foruns
-	public final static int LOG_CODIGO_FORUM_TOPICO = 4; //Ok - visualizacoes de topicos
-	public final static int LOG_CODIGO_VISUALIZACAO_MATERIAL = 5; //Ok - abertura de materias dos modulos
-	public final static int LOG_CODIGO_RESPOSTA_ENQUETE = 6; //Ok
-	public final static int LOG_CODIGO_ABRIR_JOGO = 7; //Ok
-	public final static int LOG_CODIGO_JOGAR = 8; //Ok
-	public final static int LOG_CODIGO_ENTREGAR_MATERIAL = 9; //Ok
-	public final static int LOG_CODIGO_VISUALIZACAO_VIDEO = 10;
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 
 	public Log (){
 		

src/br/ufpe/cin/amadeus/amadeus_web/domain/register/Person.java

@@ -29,13 +29,10 @@ import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.xml.bind.annotation.XmlRootElement;
-<<<<<<< HEAD
 
 import org.hibernate.annotations.Cascade;
 
 import br.ufpe.cin.amadeus.amadeus_web.domain.content_management.PersonForum;
-=======
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 
 /**
  * Classe que encapsula os dados de um usuário do sistema

src/br/ufpe/cin/amadeus/amadeus_web/facade/Controller.java

@@ -107,12 +107,9 @@ import br.ufpe.cin.amadeus.amadeus_web.exception.InvalidVideoException;
 import br.ufpe.cin.amadeus.amadeus_web.exception.RequestException;
 import br.ufpe.cin.amadeus.amadeus_web.struts.messages.Messages;
 import br.ufpe.cin.amadeus.amadeus_web.syncronize.Archive;
-<<<<<<< HEAD
-=======
 import br.ufpe.cin.amadeus.amadeus_web.syncronize.LogVisualizacao;
 import br.ufpe.cin.amadeus.amadeus_web.syncronize.StudentHaveGroup;
-import br.ufpe.cin.amadeus.amadeus_web.syncronize.TimelineItem;
+import br.ufpe.cin.amadeus.amadeus_web.syncronize.TimelineItem;
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 import br.ufpe.cin.amadeus.amadeus_web.util.Cryptography;
 import br.ufpe.cin.amadeus.amadeus_web.util.DateConstructor;
 import br.ufpe.cin.amadeus.amadeus_web.util.MailSender;
@@ -674,15 +671,10 @@ public class Controller {
 		if (this.existEmail(person.getEmail()) && !(this.getPersonByID(person.getId()).getEmail().equals(person.getEmail()))) {
 			throw new InvalidUserException("errors.email.alreadyExists");
 		}
-		System.out.println("CHAMOUUUUU");
+
 		try {
 			
 			if (person.getResume().getYear() == null || yearTitulation <= yearNowadays) {			
-<<<<<<< HEAD
-				System.out.println("CHAMOUUUUU2");
-=======
-
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 				PersonDAO personDAO = factory.getPersonDAO();
 				personDAO.merge(person);
 			} else {
@@ -1871,14 +1863,11 @@ public class Controller {
 		return forum.findById(forumId, false);
 	}
 	
-<<<<<<< HEAD
 	public Message getMessageById(int idMessage) {
 		MessageDAO messageDao = factory.getMessageDAO();
 		return messageDao.findById(idMessage, false);
 	}
 	
-=======
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 	public List<br.ufpe.cin.amadeus.amadeus_web.syncronize.Forum> getListForum(){
 		List<br.ufpe.cin.amadeus.amadeus_web.syncronize.Forum> listForum = new ArrayList<br.ufpe.cin.amadeus.amadeus_web.syncronize.Forum>();
 		ForumDAO forum = factory.getForumDAO();
@@ -3610,6 +3599,8 @@ public class Controller {
 	@SuppressWarnings("unchecked")
 	public String getJSONArrayGameOpen(int idModule, int idAluno)
 	{
+		// TODO Analisar "AND l.person_id =  " + 130 +" " +
+		
 		List logs = HibernateUtil.getSessionFactory().getCurrentSession().
 		createSQLQuery(
 				"SELECT nome, sum(count) as jogadas " +
@@ -3618,11 +3609,7 @@ public class Controller {
 				"WHERE " +
 				"l.codigo =  7 " +
 				"AND l.idobjeto =   g.id " +
-<<<<<<< HEAD
-				"AND l.person_id =  " + 130 +" " +
-=======
 				"AND l.person_id =  " + idAluno +" " +
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 				"AND g.module_id =  " + idModule +" " +
 				"AND prc.person_id = l.person_id " +
 				"AND prc.role_id = 1 " +
@@ -3649,12 +3636,11 @@ public class Controller {
 		array+="]";
 		
 		return array;
-	}
+	}
-<<<<<<< HEAD
 
 	/**
-	 * Método criado para persistir as mensagens enviadas, como primeira mensagem (não resposta a outra)
+	 * Metodo criado para persistir as mensagens enviadas, como primeira mensagem (não resposta a outra)
-	 * Recebe como parâmetro a mensagem, o pessoa que enviou e a pessoa que vai receber a mensagem.
+	 * Recebe como parametro a mensagem, o pessoa que enviou e a pessoa que vai receber a mensagem.
 	 * @param message
 	 * @param from
 	 * @param to
@@ -3684,10 +3670,10 @@ public class Controller {
 	}
 
 	/**
-	 * Método que retorna a lista de mensagens não ligas de uma determinada pessoa
+	 * M�todo que retorna a lista de mensagens n�o ligas de uma determinada pessoa
 	 * @author Nailson Cunha
-	 * @param person A pessoa que solicita as mensagens não lidas.
+	 * @param person A pessoa que solicita as mensagens n�o lidas.
-	 * @return retorna a lista de mensagens ainda não lidas.
+	 * @return retorna a lista de mensagens ainda n�o lidas.
 	 */
 	public List<MessengerMessage> getAllUnreadByPerson(Person person) {
 		MessengerMessageDAO mmd = factory.getMessengerMessageDAO();
@@ -3695,7 +3681,7 @@ public class Controller {
 	}
 
 	/**
-	 * Método que retorna uma mensagem com base em seu ID
+	 * M�todo que retorna uma mensagem com base em seu ID
 	 * @param idMensagemLida
 	 * @return A mensagem encontrada
 	 */
@@ -3711,7 +3697,7 @@ public class Controller {
 	}
 
 	/**
-	 * Método que exclui a mensagem recebida como parametro
+	 * M�todo que exclui a mensagem recebida como parametro
 	 * @param message
 	 */
 	public void deleteMessengerMessage(MessengerMessage message) {
@@ -3725,7 +3711,7 @@ public class Controller {
 	}
 
 	/**
-	 * Método que retorna todas as Mensagems de uma determinada pessoa
+	 * M�todo que retorna todas as Mensagems de uma determinada pessoa
 	 * @param person
 	 * @return
 	 */
@@ -3752,9 +3738,8 @@ public class Controller {
 		return factory.getTweetDAO().getTweetBetweenDates(inicio,fim);
 	}
 
-=======
 	/*
-	 * TODO - Métodos para recuperar grupo
+	 * TODO - Métodos para recuperar grupo
 	 */
 	public List<Groups> getGroups(int id) {
 		List<Groups> grupo = null;
@@ -4048,5 +4033,4 @@ public List<TimelineItem> listarTimelinePerson(Person p, Groups g){
 		GameDAO gameDAO = factory.getGameDAO();
 		return gameDAO.verificarStatusPorGame(alunos, game);
 	}
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 }

src/br/ufpe/cin/amadeus/amadeus_web/facade/Facade.java

@@ -23,12 +23,9 @@ import javax.mail.MessagingException;
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.upload.FormFile;
 
-<<<<<<< HEAD
-=======
 import br.ufpe.cin.amadeus.amadeus_web.dao.content_managment.ForumDAO;
 import br.ufpe.cin.amadeus.amadeus_web.dao.content_managment.GroupsDAO;
 import br.ufpe.cin.amadeus.amadeus_web.dao.content_managment.PersonRoleCourseDAO;
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 import br.ufpe.cin.amadeus.amadeus_web.domain.content_management.AmadeusDroidHistoric;
 import br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Course;
 import br.ufpe.cin.amadeus.amadeus_web.domain.content_management.ExternalLink;
@@ -73,12 +70,9 @@ import br.ufpe.cin.amadeus.amadeus_web.exception.InvalidUserException;
 import br.ufpe.cin.amadeus.amadeus_web.exception.InvalidVideoException;
 import br.ufpe.cin.amadeus.amadeus_web.exception.RequestException;
 import br.ufpe.cin.amadeus.amadeus_web.syncronize.Archive;
-<<<<<<< HEAD
-=======
 import br.ufpe.cin.amadeus.amadeus_web.syncronize.LogVisualizacao;
 import br.ufpe.cin.amadeus.amadeus_web.syncronize.StudentHaveGroup;
 import br.ufpe.cin.amadeus.amadeus_web.syncronize.TimelineItem;
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 
 public class Facade {
 	
@@ -533,13 +527,10 @@ public class Facade {
 		return this.controller.getForumById(forumId);
 	}
 	
-<<<<<<< HEAD
 	public Message getMessageById(int idMessage){
 		return this.controller.getMessageById(idMessage);
 	}
 	
-=======
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 	public List<br.ufpe.cin.amadeus.amadeus_web.syncronize.Forum> getListForumSyncronize(){
 		return this.controller.getListForum();
 	}
@@ -851,7 +842,6 @@ public class Facade {
 	
 	public String getJSONArrayGameGridByUser(int idGame, int idUser) {
 		return this.controller.getJSONArrayGameGridByUser(idGame, idUser);
-<<<<<<< HEAD
 	}
 	
 	public String getJSONArrayTagCloudForum(int idModule){
@@ -915,8 +905,8 @@ public class Facade {
 	}
 
 	/**
-	 * Método criado para persistir as mensagens enviadas, como primeira mensagem (não resposta a outra)
+	 * M�todo criado para persistir as mensagens enviadas, como primeira mensagem (n�o resposta a outra)
-	 * Recebe como parâmetro a mensagem, o pessoa que enviou e a pessoa que vai receber a mensagem.
+	 * Recebe como par�metro a mensagem, o pessoa que enviou e a pessoa que vai receber a mensagem.
 	 * @author Nailson Cunha
 	 * @param message
 	 * @param from
@@ -928,10 +918,10 @@ public class Facade {
 	}
 
 	/**
-	 * Método que retorna a lista de mensagens não ligas de uma determinada pessoa
+	 * M�todo que retorna a lista de mensagens n�o ligas de uma determinada pessoa
 	 * @author Nailson Cunha
-	 * @param person A pessoa que solicita as mensagens não lidas.
+	 * @param person A pessoa que solicita as mensagens n�o lidas.
-	 * @return retorna a lista de mensagens ainda não lidas.
+	 * @return retorna a lista de mensagens ainda n�o lidas.
 	 */
 	public List<MessengerMessage> getAllUnreadByPerson(Person person) {
 		return this.controller.getAllUnreadByPerson(person);
@@ -955,7 +945,7 @@ public class Facade {
 	}
 
 	/**
-	 * Método que retorna todas as Persons do banco de dados
+	 * M�todo que retorna todas as Persons do banco de dados
 	 * @return A lista de pessoas.
 	 */
 	public List<Person> getAllPersons() {
@@ -972,68 +962,6 @@ public class Facade {
 
 	public List<Tweet> getTweetBetweenDates(Date inicio, Date fim) {
 		return this.controller.getTweetBetweenDates(inicio,fim);
-=======
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
-	}
-	
-	public String getJSONArrayTagCloudForum(int idModule){
-		return this.controller.getJSONArrayTagCloudForum(idModule);
-	}
-	
-	public String getJSONArrayPostsPerModule(int idModule){
-		return this.controller.getJSONArrayPostsPerModule(idModule);
-	}
-	
-	public String getJSONArraySizeMessagePerModule(int idModule){
-		return this.controller.getJSONArraySizeMessagePerModule(idModule);
-	}
-	
-	public String getJSONArrayPersonGameTimePerModule(int idPerson, int idModule){
-		return this.controller.getJSONArrayPersonGameTimePerModule(idPerson, idModule);
-	}
-	
-	public String getJSONObjectTempoLevelPontuacao(int idGame)
-	{
-		return this.controller.getJSONObjectTempoLevelPontuacao(idGame);
-	}
-	
-	public String getJSONObjectTempoQuantidadePartidas(int idGame)
-	{
-		return this.controller.getJSONObjectTempoQuantidadePartidas(idGame);
-	}
-	
-	public String getJSONObjectQuantidadeTamanhoMSG(int idModule)
-	{
-		return this.controller.getJSONObjectQuantidadeTamanhoMSG(idModule);
-	}
-	
-	public String getJSONObjectLevelPontuacao(int idGame)
-	{
-		return this.controller.getJSONObjectLevelPontuacao(idGame);
-	}
-	
-	public String getJSONArrayGameMeta(int idGame){
-		return this.controller.getJSONArrayGameMeta(idGame);
-	}
-	
-	public String getJSONArrayPersonTimeOnline(int idPerson){
-		return this.controller.getJSONArrayPersonTimeOnline(idPerson);
-	}
-	
-	public String getJSONArrayForumVisualizacao(int idModule, int idAluno){
-		return this.controller.getJSONArrayForumVisualizacao(idModule, idAluno);
-	}
-	public String getJSONArrayPostsPerUser(int idModule, int idUser){
-		return this.controller.getJSONArrayPostsPerUser(idModule, idUser);
-	}
-	public String getJSONArrayMaterialView(int idUsuario, int idModule){
-		return this.controller.getJSONArrayMaterialView(idUsuario, idModule);
-	}
-	public String getJSONArrayPollAnswered(int moduleID, int idAluno){
-		return this.controller.getJSONArrayPollAnswered(moduleID, idAluno);
-	}
-	public String getJSONArrayGameOpen(int idModule, int idAluno){
-		return this.controller.getJSONArrayGameOpen(idModule, idAluno);
 	}
 	
 	public List<Groups> getGroups(int idCourse){

src/br/ufpe/cin/amadeus/amadeus_web/permissions/content_management/CoursePermissions.java

@@ -130,9 +130,7 @@ public class CoursePermissions {
 		}
 		
 		return userCanViewGraphic; 
-	}
+	}
-<<<<<<< HEAD
-=======
 	
 	public static boolean userCanViewGroups(HttpServletRequest request, Course course) {
 		boolean userCanViewGroups = false;
@@ -173,7 +171,6 @@ public class CoursePermissions {
 		}		
 		return userCanCreateGroups; 
 	}
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 
 	
 }

src/br/ufpe/cin/amadeus/amadeus_web/struts/action/CourseActions.java

@@ -108,10 +108,8 @@ public class CourseActions extends SystemActions {
 	private final String FORWARD_SHOW_VIEW_NEW_EXTERNAL_LINK = "fshowViewNewExternalLink";
 	private final String FORWARD_SHOW_VIEW_REPLICATE_COURSE = "fReplicateCourseStepOne";
 	private final String FORWARD_SHOW_VIEW_GRAPHIC = "fShowViewGraphic";
-<<<<<<< HEAD
 	private final String FORWARD_SHOW_VIEW_SOCIAL_INTERACTION_MONITORING = "fShowViewSocialInteractionMonitoring";
 	private final String FORWARD_SHOW_VIEW_SOCIAL_INTERACTION_MONITORING_REPORTS = "fShowViewSocialInteractionMonitoringReports";
-=======
 	private final String FORWARD_SHOW_VIEW_GROUPS = "fShowViewGroups";
 	private final String FORWARD_SHOW_VIEW_GROUPS_RELATORIO = "fShowViewGroupsRelatorio";
 	private final String FORWARD_SHOW_GROUP_DAY_TIMELINE = "fShowGroupDayTimeline";
@@ -119,7 +117,6 @@ public class CourseActions extends SystemActions {
 	private final String FORWARD_SHOW_VIEW_GROUP_TIMELINE = "fShowViewGroupTimeline";
 	private final String FORWARD_SHOW_VIEW_PERSON_TIMELINE = "fShowViewPersonTimeline";
 	private final String FORWARD_SHOW_VIEW_ONE_GROUP = "fShowViewOneGroup";
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 
 	@Override
 	protected Map<String, String> getKeyMethodMap() {
@@ -151,14 +148,13 @@ public class CourseActions extends SystemActions {
 		map.put("course.showViewShowModules", "showViewShowModules");
 		map.put("course.showViewCourseEvaluations", "showViewCourseEvaluations");
 		map.put("course.showViewGraphic", "showViewGraphic");
-<<<<<<< HEAD
+
 		map.put("course.showViewSendMail", "showViewSendMail");
 		map.put("course.sendMailForCourseParticipants", "sendMailForCourseParticipants");
 		map.put("course.changeTeacher", "changeTeacher");
 		map.put("course.viewChangeTeacher", "viewChangeTeacher");
 		map.put("course.sendMailForCourseParticipants", "sendMailForCourseParticipants");
 		
-=======
 		map.put("course.showViewGroups", "showViewGroups");
 		map.put("course.showViewOneGroup", "showViewOneGroup");
 		map.put("course.habilitarDesabilitarCriarGrupos", "habilitarDesabilitarCriarGrupos");
@@ -174,7 +170,6 @@ public class CourseActions extends SystemActions {
 		map.put("course.showViewPersonTimeline", "showViewPersonTimeline");
 		map.put("course.showViewGroupsRelatorio", "showViewRelatorioAtividade");
 
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 		return map;
 	}
 
@@ -1210,36 +1205,26 @@ public class CourseActions extends SystemActions {
 			Course course = facade.getCoursesById(courseId);
 			List<Person> teachers = facade.getTeachersByCourse(course);
 			List<Person> assistants = facade.listAssistantsByCourse(course);
-<<<<<<< HEAD
 			List<Person> participants = facade.listStudentsByCourse(course); //added by Nailson
 			List<MessengerMessage> messagesUnread = facade.getAllUnreadByPerson(facade.getPersonByLogin(user.getLogin())); //added by Nailson
 			
-=======
-
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 			int studentsNumber = facade.getNumberOfStudentsInCourse(course);
 			course.setNumberOfStudentsInCourse(studentsNumber);
 
 			Set<Keyword> keywords = course.getKeywords();
 
 			boolean canRegisterUser = false;
-<<<<<<< HEAD
+
 			boolean canMonitorSocialInteractions = false;
 			
 			if (facade.canRegisterUser(user, course)) {
 				canRegisterUser = true;
 			}
+			
 			if(course.getProfessor().equals(user.getPerson())){
 				canMonitorSocialInteractions = true;
 			}
 			
-=======
-
-			if (facade.canRegisterUser(user, course)) {
-				canRegisterUser = true;
-			}
-
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 			Role userRoleInCourse = Facade.getInstance().getRoleByPersonInCourse(user.getPerson(), course);
 
 			SystemActions.setMenuPermissionsForUserInRequest(request, course);
@@ -1302,26 +1287,16 @@ public class CourseActions extends SystemActions {
 			List<Person> participants = facade.listStudentsByCourse(course);
 			List<Person> teachers = facade.listTeachersByCourse(course);
 			List<Person> assistants = facade.listAssistantsByCourse(course);
-<<<<<<< HEAD
 			List<MessengerMessage> messagesUnread = facade.getAllUnreadByPerson(facade.getPersonByLogin(user.getLogin())); //added by Nailson
 			
-			
-=======
-
-
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 			SystemActions.setMenuPermissionsForUserInRequest(request, course);
 			request.setAttribute("course", course);
 			request.setAttribute("participants", participants);
 			request.setAttribute("teachers", teachers);
 			request.setAttribute("assistants", assistants);
 			request.setAttribute("userRoleInCourse", userRoleInCourse);
-<<<<<<< HEAD
 			request.setAttribute("messagesUnread", messagesUnread); //added by Nailson
 			
-=======
-
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 			forward = mapping.findForward(FORWARD_SHOW_VIEW_COURSE_PARTICIPANTS);
 		} else {
 			forward = showViewWelcome(mapping, form, request, response);
@@ -1403,8 +1378,7 @@ public class CourseActions extends SystemActions {
 		}
 
 		return forward;
-	}
+	}
-<<<<<<< HEAD
 	
 	public ActionForward showViewSocialInteractionMonitoring(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) throws Exception {
@@ -1479,9 +1453,6 @@ public class CourseActions extends SystemActions {
 		return forward;
 	}
 	
-=======
-
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 	public ActionForward showViewShowModules(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) throws Exception {
 
@@ -1499,7 +1470,6 @@ public class CourseActions extends SystemActions {
 				Role userRoleInCourse = Facade.getInstance().getRoleByPersonInCourse(user.getPerson(), course);
 
 				List<Module> modules = course.getModules();
-<<<<<<< HEAD
 				
 				List<PersonForum> forunsperson = user.getPerson().getForuns();
 				
@@ -1508,27 +1478,17 @@ public class CourseActions extends SystemActions {
 				List<Person> participants = facade.listStudentsByCourse(course); //added by Nailson
 				List<MessengerMessage> messagesUnread = facade.getAllUnreadByPerson(facade.getPersonByLogin(user.getLogin())); //added by Nailson
 		
-=======
-
-				List<Person> assistances = facade.getAssistanceInCourse(course);
-
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 				SystemActions.setMenuPermissionsForUserInRequest(request, course);
 				request.setAttribute("userRoleInCourse", ( userRoleInCourse != null) ? userRoleInCourse.getRoleType() : null );
 				request.setAttribute("course", course);
 				request.setAttribute("modules", modules);
 				request.setAttribute("forunsperson",forunsperson);
 				request.setAttribute("assistants", assistances);
-<<<<<<< HEAD
 				
 				request.setAttribute("teachers", teachers); //added by Nailson
 				request.setAttribute("participants", participants); //added by Nailson
 				request.setAttribute("messagesUnread", messagesUnread); //added by Nailson
 				
-				
-=======
-
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 				forward = mapping.findForward(FORWARD_SHOW_VIEW_SHOW_MODULES);
 			} else {
 				forward = SystemActions.showViewAccessDenied(mapping, form, request, response);
@@ -1704,7 +1664,7 @@ public class CourseActions extends SystemActions {
 					if (viewCreateGroup.equals("1")){					
 						request.setAttribute("viewCreateGroup", "1");
 						//codigo alocado no lugar errado
-						//preguiça de mapear uma nova função
+						//pregui�a de mapear uma nova fun��o
 						AccessInfo user = (AccessInfo) request.getSession().getAttribute("user");
 						List<StudentHaveGroup> list = facade.getStudentsHaveGroup(course, user.getPerson());
 						request.setAttribute("students", list);
@@ -2426,332 +2386,6 @@ public class CourseActions extends SystemActions {
 		}
 		return forward;	
 	}
-<<<<<<< HEAD
-
-	public ActionForward showViewGraphic(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) throws Exception {
-
-		ActionForward forward = null;
-
-		if(SystemActions.isLoggedUser(request)) {
-
-			int courseId = Integer.parseInt(request.getParameter("courseId"));
-			Course course = facade.getCoursesById(courseId);
-
-
-			if(CoursePermissions.userCanViewGraphic(request, course)) {
-				SystemActions.setMenuPermissionsForUserInRequest(request, course);
-
-				String graphic = request.getParameter("graphic");
-				Integer moduleSel = Integer.parseInt(request.getParameter("moduleSel"));
-				Integer idAluno = Integer.parseInt(request.getParameter("idAluno"));
-				Integer idGame = Integer.parseInt(request.getParameter("idGame"));
-				Integer idForum;// = Integer.parseInt(request.getParameter("idForum"));
-
-				request.setAttribute("course", course);
-				request.setAttribute("graphic", graphic);
-				request.setAttribute("moduleSel", moduleSel);
-				request.setAttribute("idAluno", idAluno);
-				request.setAttribute("idGame", idGame);
-				//request.setAttribute("idForum", idForum);
-
-				if(graphic.equals("g1"))
-				{
-					request.setAttribute("modules", course.getModules());
-
-					if(moduleSel!=-1)
-					{
-						String data = facade.getJSONArrayModuleGameTotalTime(moduleSel);
-						request.setAttribute("xml", data);
-					}
-				}
-				else if(graphic.equals("g2"))
-				{
-					request.setAttribute("modules", course.getModules());
-
-					if(moduleSel!=-1)
-					{
-						String data = facade.getJSONArrayModuleGameTimePerDay(moduleSel);
-						request.setAttribute("xml", data);
-					}
-				}
-				else if(graphic.equals("g3"))
-				{
-					request.setAttribute("modules", course.getModules());
-
-					if(moduleSel!=-1)
-					{
-						String data = facade.getJSONArrayTagCloudForum(moduleSel);
-						request.setAttribute("xml", data);
-					}
-				}
-				else if(graphic.equals("g4"))
-				{
-					request.setAttribute("modules", course.getModules());
-
-					if(moduleSel!=-1)
-					{
-						String data = facade.getJSONArrayPostsPerModule(moduleSel);
-						request.setAttribute("xml", data);
-					}
-				}
-				else if(graphic.equals("g5"))
-				{
-					request.setAttribute("modules", course.getModules());
-
-					if(moduleSel!=-1)
-					{
-						String data = facade.getJSONArraySizeMessagePerModule(moduleSel);
-						request.setAttribute("xml", data);
-					}
-				}
-				else if(graphic.equals("g6"))
-				{
-					request.setAttribute("modules", course.getModules());
-
-
-					if(moduleSel!=-1)
-					{
-						List<Person> participants = facade.listStudentsByCourse(course);
-						request.setAttribute("alunos", participants);						
-
-						if(idAluno!=-1)
-						{
-							String data = facade.getJSONArrayPersonGameTimePerModule(idAluno, moduleSel);
-							//							String data = "[{\"Aluno\":\"GameTest\",\"Tempo\":18}]";
-							request.setAttribute("xml", data);							
-						}
-
-					}
-				}
-				//Código dos Gráficos de Danilo Começa aqui
-				//Tempo de permanência no sistema - Diferença entre os horários de login e logout.
-				else if(graphic.equals("g7"))
-				{
-					request.setAttribute("modules", course.getModules());
-
-
-					if(moduleSel!=-1)
-					{
-						List<Person> participants = facade.listStudentsByCourse(course);
-						request.setAttribute("alunos", participants);						
-
-						if(idAluno!=-1)
-						{
-							String data = facade.getJSONArrayPersonGameTimePerModule(idAluno, moduleSel);
-							request.setAttribute("xml", data);							
-						}
-
-					}
-				}
-				//Quantidade de visualizações dos fóruns - Número de vezes que o usuário abriu um fórum de determinado módulo.
-				else if(graphic.equals("g8"))
-				{
-					request.setAttribute("modules", course.getModules());
-					
-					if(moduleSel!=-1)
-					{
-						List<Person> participants = facade.listStudentsByCourse(course);
-						request.setAttribute("alunos", participants);						
-
-						if(idAluno!=-1)
-						{						
-							String data = facade.getJSONArrayForumVisualizacao(moduleSel, idAluno);
-							request.setAttribute("xml", data);							
-						}
-					}
-
-				}
-				//Quantidade de posts em um fórum - Número de vezes que o usuário respondeu ao fórum.
-				else if(graphic.equals("g9"))
-				{
-					request.setAttribute("modules", course.getModules());
-
-
-					if(moduleSel!=-1)
-					{
-						List<Person> participants = facade.listStudentsByCourse(course);
-						request.setAttribute("alunos", participants);
-
-						if(idAluno!=-1)
-						{
-							String data = facade.getJSONArrayPostsPerUser(moduleSel, idAluno);
-							request.setAttribute("xml", data);						
-						}						
-					}
-				}
-				//Quantidade de acessos à materiais - Número de vezes que o usuário abriu um material presente no módulo.
-				else if(graphic.equals("g10"))
-				{
-					request.setAttribute("modules", course.getModules());
-
-					if(moduleSel!=-1)
-					{
-						List<Person> participants = facade.listStudentsByCourse(course);
-						request.setAttribute("alunos", participants);						
-
-						if(idAluno!=-1)
-						{
-							String data = facade.getJSONArrayMaterialView(idAluno, moduleSel);
-							request.setAttribute("xml", data);							
-						}
-
-					}
-				}
-				//Quantidade de enquetes respondidas - Número de repostas a enquetes de um módulo feitas pelo usuário.
-				else if(graphic.equals("g11"))
-				{
-					request.setAttribute("modules", course.getModules());
-
-
-					if(moduleSel!=-1)
-					{
-						List<Person> participants = facade.listStudentsByCourse(course);
-						request.setAttribute("alunos", participants);						
-
-						if(idAluno!=-1)
-						{
-							String data = facade.getJSONArrayPollAnswered(moduleSel, idAluno);
-							request.setAttribute("xml", data);							
-						}
-
-					}
-				}
-				//Quantidade de acesso aos jogos - Número de vezes que o usuário abriu um jogo do módulo.
-				else if(graphic.equals("g12"))
-				{
-					request.setAttribute("modules", course.getModules());
-
-					if(moduleSel!=-1)
-					{
-						List<Person> participants = facade.listStudentsByCourse(course);
-						request.setAttribute("alunos", participants);						
-
-						if(idAluno!=-1)
-						{
-							String data = facade.getJSONArrayGameOpen(moduleSel, idAluno);
-							request.setAttribute("xml", data);							
-						}
-
-					}
-				}
-				else if(graphic.equals("g13"))
-				{
-					request.setAttribute("modules", course.getModules());					
-
-					if(moduleSel!=-1)
-					{
-						String data = facade.getJSONObjectQuantidadeTamanhoMSG(moduleSel);
-						request.setAttribute("xml", data);
-					}
-				}
-				//Graficos do jogo
-				//Pontuação
-				else if(graphic.equals("g14")||graphic.equals("g15"))
-				{
-					request.setAttribute("modules", course.getModules());
-
-					if(moduleSel!=-1)
-					{
-						Module module = facade.getModuleById(moduleSel.intValue());
-						request.setAttribute("games", module.getGames());						
-
-						if(idGame!=-1)
-						{
-							String data = facade.getJSONArrayGameScore(idGame);
-							request.setAttribute("xml", data);							
-						}
-
-					}
-				}
-				//Level
-				else if(graphic.equals("g16")||graphic.equals("g17"))
-				{
-					request.setAttribute("modules", course.getModules());
-
-					if(moduleSel!=-1)
-					{
-						Module module = facade.getModuleById(moduleSel.intValue());
-						request.setAttribute("games", module.getGames());						
-
-						if(idGame!=-1)
-						{
-							String data = facade.getJSONArrayGameLevel(idGame);
-							request.setAttribute("xml", data);							
-						}
-
-					}
-				}
-				//tempo X level X pontuacao
-				else if(graphic.equals("g18"))
-				{
-					request.setAttribute("modules", course.getModules());
-
-					if(moduleSel!=-1)
-					{
-						Module module = facade.getModuleById(moduleSel.intValue());
-						request.setAttribute("games", module.getGames());						
-
-						if(idGame!=-1)
-						{
-							String data = facade.getJSONObjectTempoLevelPontuacao(idGame);
-							request.setAttribute("xml", data);							
-						}
-
-					}
-				}
-				// tempo X quantidade de partidas
-				else if(graphic.equals("g19"))
-				{
-					request.setAttribute("modules", course.getModules());
-
-					if(moduleSel!=-1)
-					{
-						Module module = facade.getModuleById(moduleSel.intValue());
-						request.setAttribute("games", module.getGames());						
-
-						if(idGame!=-1)
-						{
-							String data = facade.getJSONObjectTempoQuantidadePartidas(idGame);
-							request.setAttribute("xml", data);							
-						}
-
-					}
-				}
-				//level X pontuacao
-				else if(graphic.equals("g20"))
-				{
-					request.setAttribute("modules", course.getModules());
-
-					if(moduleSel!=-1)
-					{
-						Module module = facade.getModuleById(moduleSel.intValue());
-						request.setAttribute("games", module.getGames());						
-
-						if(idGame!=-1)
-						{
-							String data = facade.getJSONObjectLevelPontuacao(idGame);
-							request.setAttribute("xml", data);							
-						}
-
-					}
-
-				}
-				
-				request.setAttribute("domain", SystemActions.webSettings.getSystemGeneralDomain());
-				forward = mapping.findForward(FORWARD_SHOW_VIEW_GRAPHIC);
-			} else {
-				forward = SystemActions.showViewAccessDenied(mapping, form, request, response);
-			}
-		} else {
-			forward = this.showViewWelcome(mapping, form, request, response);
-		}
-
-		return forward;
-
-	}	 
 
 }
-=======
+
-}
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631

src/br/ufpe/cin/amadeus/amadeus_web/struts/action/SystemActions.java

@@ -180,15 +180,12 @@ public class SystemActions extends LookupDispatchAction {
 		boolean canViewCourseEvaluations = CoursePermissions.userCanShowViewCourseEvaluations(request, course);
 		boolean canAssistanceRequest = false;
 		boolean canViewCourseContent = false;
-<<<<<<< HEAD
 		boolean canViewGraphic = true;
 		boolean canMonitoringHashtag = false;
 		boolean canSendToClassmates = false;
-=======
+
-		boolean canViewGraphic = false;
 		boolean canViewGroups = false;
 		boolean canViewEnableGroups = false;
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 		
 		AccessInfo user = (AccessInfo) request.getSession().getAttribute("user");
 		
@@ -200,23 +197,19 @@ public class SystemActions extends LookupDispatchAction {
 			canEditCourse = true;
 			canDeleteCourse = true;
 			canViewCourseContent = true;
-<<<<<<< HEAD
+
 			canMonitoringHashtag = true;
 			canSendToClassmates = true;
 			
+			canViewEnableGroups = true;
+			canViewGroups = true;
+			canViewGraphic = true;
+			
 		} else if (userRoleInCourse != null) {
 			if(	userProfileType == ProfileType.PROFESSOR) {
 				canInsertCourse = true;
 				canMonitoringHashtag = true;
 				canSendToClassmates = true;
-=======
-			canViewEnableGroups = true;
-			canViewGroups = true;
-			canViewGraphic = true;
-		} else if (userRoleInCourse != null) {
-			if(	userProfileType == ProfileType.PROFESSOR) {
-				canInsertCourse = true;				
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 			}
 			
 			if(	userRoleInCourse.getRoleType() == RoleType.TEACHER || 
@@ -226,12 +219,11 @@ public class SystemActions extends LookupDispatchAction {
 			
 			if( userRoleInCourse.getRoleType() == RoleType.TEACHER) {
 				canDeleteCourse = true;
-<<<<<<< HEAD
+
 				canMonitoringHashtag = true;
 				canSendToClassmates = true;
-=======
+
 				canViewEnableGroups = true;
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 			}
 			
 			if( userRoleInCourse.getRoleType() == RoleType.TEACHER ||
@@ -254,12 +246,11 @@ public class SystemActions extends LookupDispatchAction {
 		request.setAttribute("canViewCourseContent", canViewCourseContent);
 		request.setAttribute("canAssistanceRequest", canAssistanceRequest);
 		request.setAttribute("canViewGraphic", canViewGraphic);
-<<<<<<< HEAD
+
 		request.setAttribute("canMonitoringHashtag", canMonitoringHashtag);
 		request.setAttribute("canSendToClassmates", canSendToClassmates);
-=======
+
 		request.setAttribute("canViewGroups", canViewGroups);
 		request.setAttribute("canViewEnableGroups", canViewEnableGroups);
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 	}
 }

src/br/ufpe/cin/amadeus/amadeus_web/struts/action/UserActions.java

@@ -1388,12 +1388,9 @@ public class UserActions extends SystemActions {
 
 				DynaActionForm dynaForm = (DynaActionForm) form;
 				Person person = new Person();
-<<<<<<< HEAD
+
+				// TODO Analisar a necessidade desse setid
 				//person.setId(Integer.parseInt(request.getParameter("userId")));
-=======
-				
-				person.setId(Integer.parseInt(request.getParameter("userId")));
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 				person.setName(dynaForm.getString("name"));
 				person.setCity(dynaForm.getString("city"));
 				person.setState(dynaForm.getString("state"));
@@ -1524,13 +1521,9 @@ public class UserActions extends SystemActions {
 
 				Person person = new Person();
 				
-<<<<<<< HEAD
 				//person.getAccessInfo().setId(Integer.parseInt(request.getParameter("userId")));
 				AccessInfo accessInfoOld = facade.searchUserById(Integer.parseInt(request.getParameter("userId")));
 				person.setId(accessInfoOld.getPerson().getId());
-=======
-				person.setId(Integer.parseInt(request.getParameter("userId")));
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 				person.setName(dynaForm.getString("name"));
 				person.setCity(dynaForm.getString("city"));
 				person.setState(dynaForm.getString("state"));
@@ -1571,12 +1564,8 @@ public class UserActions extends SystemActions {
 				}
 
 				AccessInfo accessInfo = new AccessInfo();
-<<<<<<< HEAD
 				accessInfo.setLogin(accessInfoOld.getLogin());
 				accessInfo.setTypeProfile(accessInfoOld.getTypeProfile());
-=======
-				accessInfo.setLogin(dynaForm.getString("login"));
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 				accessInfo.setPassword(dynaForm.getString("password"));
 				
 				String profileType = request.getParameter("userType");
@@ -1616,17 +1605,11 @@ public class UserActions extends SystemActions {
 
 				person.setResume(resume);
 
-<<<<<<< HEAD
 				/*if (facade.existLogin(person.getAccessInfo().getLogin())) {
 					messages.add("error", new ActionMessage(
 					"errors.login.alreadyExists"));
 				}*/
-=======
+
-				if (facade.existLogin(person.getAccessInfo().getLogin())) {
-					messages.add("error", new ActionMessage(
-					"errors.login.alreadyExists"));
-				}
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 				/*if (facade.existEmail(person.getEmail())) {
 					messages.add("error", new ActionMessage(
 					"errors.email.alreadyExists"));

src/br/ufpe/cin/amadeus/amadeus_web/struts/action/content_management/ModuleActions.java

@@ -89,13 +89,8 @@ public class ModuleActions extends SystemActions {
 			int positionModule = facade.getNextPositionModule(course);
 			
 			Module module = new Module();
-<<<<<<< HEAD
-			module.setName("Nome do Módulo - "+(positionModule));
-			module.setDescription("Descrição");
-=======
 			module.setName("Nome do Módulo - "+(positionModule));
 			module.setDescription("Descrição");
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 			module.setVisible(true);
 			module.setPosition(positionModule);		
 			module.setCourse(course);

src/br/ufpe/cin/amadeus/amadeus_web/struts/action/content_management/forum/ForumActions.java

@@ -109,24 +109,14 @@ public class ForumActions extends SystemActions {
 
 		request.setAttribute("forum", forum);
 		request.setAttribute("module", module);
-<<<<<<< HEAD
 		// request.setAttribute("canAnswerForum", canAnswerForum);
 
 		// TODO - LOG - Visualizacao de um topico - OK
-=======
-		//request.setAttribute("canAnswerForum", canAnswerForum);
-		
-		//TODO - LOG - Visualizacao de um topico - OK
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 		Log log = SystemActions.getLogUser(request);
 		log.setCodigo(Log.LOG_CODIGO_FORUM_TOPICO);
 		log.setIdObjeto(forum.getId());
 		facade.saveLog(log);
-<<<<<<< HEAD
 
-=======
-		
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 		return mapping.findForward(FORWARD_SHOW_VIEW_FORUM_ACTIVITY);
 	}
 
@@ -407,7 +397,7 @@ public class ForumActions extends SystemActions {
 			personForum.getPk().setForum(forum);
 			personForum.getPk().setPerson(user.getPerson());
 			
-			//se for o primeiro post do usuário
+			//se for o primeiro post do usu�rio
 			if(!user.getPerson().getForuns().contains(personForum)){
 				personForum.setLastTimeInForum(date);
 				user.getPerson().getForuns().add(personForum);				
@@ -471,7 +461,7 @@ public class ForumActions extends SystemActions {
 			personForum.getPk().setForum(forum);
 			personForum.getPk().setPerson(user.getPerson());
 			
-			//se for o primeiro post do usuário
+			//se for o primeiro post do usu�rio
 			if(!user.getPerson().getForuns().contains(personForum)){
 				personForum.setLastTimeInForum(date);
 				user.getPerson().getForuns().add(personForum);				

src/br/ufpe/cin/amadeus/amadeus_web/syncronize/Course.java

@@ -35,11 +35,8 @@ public class Course implements Serializable{
 	
 	private Person professor;
 	
-<<<<<<< HEAD
-=======
 	private boolean flag_habilitar_grupo;
 	
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 	private List<Material> materials = new ArrayList<Material>();
 	
 	private List<Forum> foruns = new ArrayList<Forum>();
@@ -155,9 +152,7 @@ public class Course implements Serializable{
 
 	public void setForuns(List<Forum> foruns) {
 		this.foruns = foruns;
-	}
+	}
-<<<<<<< HEAD
-=======
 
 	public void setFlag_habilitar_grupo(boolean flag_habilitar_grupo) {
 		this.flag_habilitar_grupo = flag_habilitar_grupo;
@@ -165,8 +160,6 @@ public class Course implements Serializable{
 
 	public boolean isFlag_habilitar_grupo() {
 		return flag_habilitar_grupo;
-	}
+	}	
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
-	
 
 }

src/hibernate.cfg.xml

@@ -3,25 +3,16 @@
 		"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
 		"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
 
-<hibernate-configuration> 
+<hibernate-configuration>
 	<session-factory name="org.hibernate.transaction.JDBCTransactionFactory">
-	
+
 		<property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property>
 		<property name="hibernate.connection.driver_class">org.postgresql.Driver</property>
 		<property name="hibernate.connection.url">jdbc:postgresql://localhost:5432/amadeus_web</property>
 		<property name="hibernate.connection.username">postgres</property>
 		<property name="hibernate.connection.password">postgres</property>
-<<<<<<< HEAD
-		<property name="hibernate.current_session_context_class">thread</property>		
-		
-			<property name="hibernate.hbm2ddl.auto">update</property>		
-=======
 		<property name="hibernate.current_session_context_class">thread</property>
-<!--	Senha de Paulo	-->
+		<property name="hibernate.hbm2ddl.auto">update</property>
-<!--	<property name="hibernate.connection.password">mcplparp</property> -->
-		
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
-		
 		<property name="hibernate.c3p0.max_size">10</property>
 		<property name="hibernate.c3p0.min_size">2</property>
 		<property name="hibernate.c3p0.timeout">5000</property>
@@ -33,70 +24,115 @@
 		<property name="use_outer_join">true</property>
 		<property name="hibernate.generate_statistics">true</property>
 		<property name="hibernate.use_sql_comments">true</property>
-		<property name="hibernate.cache.provider_class">org.hibernate.cache.NoCacheProvider</property> 
+		<property name="hibernate.cache.provider_class">org.hibernate.cache.NoCacheProvider</property>
-		
+
 		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.register.AccessInfo" />
 		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.register.Image" />
 		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.register.Person" />
 		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.register.OpenID" />
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.register.Resume"/>
+		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.register.Resume" />
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.register.UserRequest"/>
+		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.register.UserRequest" />
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.register.MessengerMessage"/>
+		<mapping
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.register.Tweet"/>
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.register.MessengerMessage" />
-		
+		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.register.Tweet" />
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Answer" />
+
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.AmadeusDroidHistoric" />
+		<mapping
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Choice" />
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Answer" />
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Commentary" />
+		<mapping
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Course" />
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.AmadeusDroidHistoric" />
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.CourseEvaluation" />
+		<mapping
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.CourseScores" />
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Choice" />
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Criterion" />
+		<mapping
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.CriterionAnswers" />
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Commentary" />
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Forum" />
+		<mapping
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Game" />
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Course" />
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Homework" />
+		<mapping
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Keyword" />
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.CourseEvaluation" />
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Material" />
+		<mapping
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Archive" />
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.CourseScores" />
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.VideoIriz" />
+		<mapping
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.MaterialRequest" />
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Criterion" />
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.LearningObject" />
+		<mapping
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Message" />
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.CriterionAnswers" />
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Module" />
+		<mapping
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Poll" />
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Forum" />
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Role"/>
+		<mapping
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.PersonRoleCourse"/>
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Game" />
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Delivery" />
+		<mapping
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Archive" />
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Homework" />
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.VideoIriz" />
+		<mapping
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.LearningObject" />
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Keyword" />
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.HistoryLearningObject" />
+		<mapping
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.PersonForum" />
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Material" />
-		
+		<mapping
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.Evaluation" /> 
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Archive" />
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.Alternative" /> 
+		<mapping
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.Question" /> 
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.VideoIriz" />
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.QuestionGap" /> 
+		<mapping
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.QuestionDiscursive" /> 
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.MaterialRequest" />
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.QuestionMultiple" /> 
+		<mapping
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.QuestionTrueFalse" /> 
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.LearningObject" />
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.QuestionAssociation" /> 
+		<mapping
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.realized.EvaluationRealized" /> 
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Message" />
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.realized.AlternativeRealized" /> 
+		<mapping
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.realized.QuestionRealized" /> 
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Module" />
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.realized.QuestionGapRealized" /> 
+		<mapping
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.realized.QuestionDiscursiveRealized" /> 
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Poll" />
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.realized.QuestionAlternativableRealized" /> 
+		<mapping
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.realized.QuestionAssociationRealized" /> 
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Role" />
-	
+		<mapping
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.ExternalLink" />
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.PersonRoleCourse" />
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Log" />
+		<mapping
-<<<<<<< HEAD
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Delivery" />
-=======
+		<mapping
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Groups" />
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Archive" />
-		<mapping class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Person_Groups" />
+		<mapping
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.VideoIriz" />
-	
+		<mapping
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.LearningObject" />
+		<mapping
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.HistoryLearningObject" />
+		<mapping
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.PersonForum" />
+
+		<mapping
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.Evaluation" />
+		<mapping
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.Alternative" />
+		<mapping
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.Question" />
+		<mapping
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.QuestionGap" />
+		<mapping
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.QuestionDiscursive" />
+		<mapping
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.QuestionMultiple" />
+		<mapping
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.QuestionTrueFalse" />
+		<mapping
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.QuestionAssociation" />
+		<mapping
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.realized.EvaluationRealized" />
+		<mapping
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.realized.AlternativeRealized" />
+		<mapping
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.realized.QuestionRealized" />
+		<mapping
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.realized.QuestionGapRealized" />
+		<mapping
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.realized.QuestionDiscursiveRealized" />
+		<mapping
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.realized.QuestionAlternativableRealized" />
+		<mapping
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.evaluation.realized.QuestionAssociationRealized" />
+
+		<mapping
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.ExternalLink" />
+		<mapping
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Log" />
+		<mapping
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Groups" />
+		<mapping
+			class="br.ufpe.cin.amadeus.amadeus_web.domain.content_management.Person_Groups" />
 	</session-factory>
 </hibernate-configuration>

src/settings/amadeus.web.settings.xml

@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <web>
-<<<<<<< HEAD
 	<system>
 		<general.version>00.96.60</general.version>
-=======
-    <system>
-	<general.version>00.96.30</general.version>
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
     	<general.language>Português-Brasil</general.language>
     	<general.encoding>UTF-8</general.encoding>
     	<general.themes>default</general.themes>
@@ -14,13 +9,8 @@
     </system>
     <mailsender>
     	<mail.description>Conta de e-mail padrão</mail.description>
-<<<<<<< HEAD
     	<mail.from>exemploamadeus@gmail.com</mail.from>
-    	<mail.password>amadeus2012!</mail.password>
+    	<mail.password>amadeus2012!</mail.password>
-=======
-    	<mail.from>exemplo@email.com</mail.from>
-    	<mail.password>senha</mail.password>
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
     	<mail.smtp.host>smtp.gmail.com</mail.smtp.host>
     	<mail.smtp.auth>true</mail.smtp.auth>
     	<mail.debug>false</mail.debug>