Resolução de conflitos do merge
Esse commit está contido em:
Paulo Henrique
@@ -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"
|
||||
type="java.lang.String" />
|
||||
<form-property name="initialRegistrationDay"
|
||||
type="java.lang.String" />
|
||||
<form-property name="initialRegistrationMonth"
|
||||
type="java.lang.String" />
|
||||
<form-property name="initialRegistrationYear"
|
||||
type="java.lang.String" />
|
||||
<form-property name="finalRegistrationDay"
|
||||
type="java.lang.String" />
|
||||
<form-property name="finalRegistrationMonth"
|
||||
type="java.lang.String" />
|
||||
<form-property name="finalRegistrationYear"
|
||||
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="maxAmountStudents" type="java.lang.String" />
|
||||
<form-property name="initialRegistrationDay" type="java.lang.String" />
|
||||
<form-property name="initialRegistrationMonth" type="java.lang.String" />
|
||||
<form-property name="initialRegistrationYear" type="java.lang.String" />
|
||||
<form-property name="finalRegistrationDay" type="java.lang.String" />
|
||||
<form-property name="finalRegistrationMonth" type="java.lang.String" />
|
||||
<form-property name="finalRegistrationYear" 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"
|
||||
type="java.lang.String" />
|
||||
<form-property name="initialRegistrationDay"
|
||||
type="java.lang.String" />
|
||||
<form-property name="initialRegistrationMonth"
|
||||
type="java.lang.String" />
|
||||
<form-property name="initialRegistrationYear"
|
||||
type="java.lang.String" />
|
||||
<form-property name="finalRegistrationDay"
|
||||
type="java.lang.String" />
|
||||
<form-property name="finalRegistrationMonth"
|
||||
type="java.lang.String" />
|
||||
<form-property name="finalRegistrationYear"
|
||||
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="maxAmountStudents" type="java.lang.String" />
|
||||
<form-property name="initialRegistrationDay" type="java.lang.String" />
|
||||
<form-property name="initialRegistrationMonth" type="java.lang.String" />
|
||||
<form-property name="initialRegistrationYear" type="java.lang.String" />
|
||||
<form-property name="finalRegistrationDay" type="java.lang.String" />
|
||||
<form-property name="finalRegistrationMonth" type="java.lang.String" />
|
||||
<form-property name="finalRegistrationYear" 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"
|
||||
type="java.lang.String" />
|
||||
<form-property name="initialMonitoringMonth"
|
||||
type="java.lang.String" />
|
||||
<form-property name="initialMonitoringYear"
|
||||
type="java.lang.String" />
|
||||
<form-property name="forum"
|
||||
type="java.lang.String" />
|
||||
<form-property name="message"
|
||||
type="java.lang.String" />
|
||||
<form-property name="chat"
|
||||
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-property name="initialMonitoringDay" type="java.lang.String" />
|
||||
<form-property name="initialMonitoringMonth" type="java.lang.String" />
|
||||
<form-property name="initialMonitoringYear" type="java.lang.String" />
|
||||
<form-property name="forum" type="java.lang.String" />
|
||||
<form-property name="message" type="java.lang.String" />
|
||||
<form-property name="chat" 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="nomeGrupo" type="java.lang.String"/>
|
||||
<form-property name="listaAlunos" type="java.lang.String"/>
|
||||
<form-property name="Concluir" type="java.lang.String"/>
|
||||
>>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
|
||||
<form-property name="courseId" type="java.lang.Integer" />
|
||||
<form-property name="nomeGrupo" type="java.lang.String" />
|
||||
<form-property name="listaAlunos" type="java.lang.String" />
|
||||
<form-property name="Concluir" type="java.lang.String" />
|
||||
</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="fShowViewCourseEvaluations" path="/jsp/course/viewCourseEvaluations.jsp"/>
|
||||
<forward name="fShowViewSendMail" path="/jsp/course/viewSendMail.jsp"/>
|
||||
<forward name="fShowViewGraphic" path="/jsp/course/viewGraphic.jsp"/>
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<forward name="fShowViewGroups" path="/jsp/course/viewGroups.jsp"/>
|
||||
<forward name="fShowGroupDayTimeline" path="/jsp/course/viewGroupDayTimeline.jsp"/>
|
||||
<forward name="fShowPersonDayTimeline" path="/jsp/course/viewPersonDayTimeline.jsp"/>
|
||||
<forward name="fShowViewGroupTimeline" path="/jsp/course/viewGroupTimeline.jsp"/>
|
||||
<forward name="fShowViewPersonTimeline" path="/jsp/course/ViewPersonTimeline.jsp"/>
|
||||
<forward name="fShowViewOneGroup" path="/jsp/course/viewOneGroup.jsp"/>
|
||||
<forward name="fShowViewGroupsRelatorio" path="/jsp/course/viewGroupsRelatorio.jsp"/>
|
||||
|
||||
>>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
|
||||
|
||||
<forward name="fShowViewShowModules" path="/jsp/course/content_management/showModules.jsp" />
|
||||
|
||||
<forward name="fShowViewCourseEvaluations" path="/jsp/course/viewCourseEvaluations.jsp" />
|
||||
<forward name="fShowViewSendMail" path="/jsp/course/viewSendMail.jsp" />
|
||||
<forward name="fShowViewGraphic" path="/jsp/course/viewGraphic.jsp" />
|
||||
|
||||
<forward name="fShowViewGroups" path="/jsp/course/viewGroups.jsp" />
|
||||
<forward name="fShowGroupDayTimeline" path="/jsp/course/viewGroupDayTimeline.jsp" />
|
||||
<forward name="fShowPersonDayTimeline" path="/jsp/course/viewPersonDayTimeline.jsp" />
|
||||
<forward name="fShowViewGroupTimeline" path="/jsp/course/viewGroupTimeline.jsp" />
|
||||
<forward name="fShowViewPersonTimeline" path="/jsp/course/ViewPersonTimeline.jsp" />
|
||||
<forward name="fShowViewOneGroup" path="/jsp/course/viewOneGroup.jsp" />
|
||||
<forward name="fShowViewGroupsRelatorio" path="/jsp/course/viewGroupsRelatorio.jsp" />
|
||||
|
||||
</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"
|
||||
input="/jsp/course/replicateCourseStepOne.jsp"
|
||||
|
||||
<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" input="/jsp/course/replicateCourseStepOne.jsp"
|
||||
path="/replicateCourseStepOne" parameter="replicateCourseStepOne"
|
||||
scope="request"
|
||||
type="br.ufpe.cin.amadeus.amadeus_web.struts.action.CourseActions" />
|
||||
|
||||
<action name="viewCourseForm"
|
||||
input="/jsp/course/viewCourse.jsp"
|
||||
path="/viewCourse" parameter="viewCourse"
|
||||
scope="request"
|
||||
scope="request" type="br.ufpe.cin.amadeus.amadeus_web.struts.action.CourseActions" />
|
||||
|
||||
<action name="viewCourseForm" 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"
|
||||
path="/fInsertCourseStepOne"
|
||||
|
||||
<action parameter="/jsp/course/insertCourseStepOne.jsp" path="/fInsertCourseStepOne"
|
||||
type="org.apache.struts.actions.ForwardAction" />
|
||||
|
||||
|
||||
<action parameter="/jsp/course/replicateCourseStepOne.jsp"
|
||||
path="/fReplicateCourseStepOne"
|
||||
type="org.apache.struts.actions.ForwardAction" />
|
||||
path="/fReplicateCourseStepOne" type="org.apache.struts.actions.ForwardAction" />
|
||||
|
||||
<action name="formRegisterCourseStepTwo"
|
||||
input="/jsp/course/insertCourseStepTwo.jsp"
|
||||
path="/insertCourseStepTwo" parameter="insertCourseStepTwo"
|
||||
scope="request"
|
||||
<action name="formRegisterCourseStepTwo" input="/jsp/course/insertCourseStepTwo.jsp"
|
||||
path="/insertCourseStepTwo" parameter="insertCourseStepTwo" scope="request"
|
||||
type="br.ufpe.cin.amadeus.amadeus_web.struts.action.CourseActions" />
|
||||
|
||||
<action parameter="/jsp/course/insertCourseStepTwo.jsp"
|
||||
path="/fInsertCourseStepTwo"
|
||||
<action parameter="/jsp/course/insertCourseStepTwo.jsp" 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"
|
||||
parameter="/jsp/course/viewCourseDeleteConfirmation.jsp"
|
||||
scope="request"
|
||||
type="org.apache.struts.actions.ForwardAction" />
|
||||
<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 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>
|
||||
|
||||
+168
-177
@@ -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">
|
||||
<display-name>AmadeusLMS</display-name>
|
||||
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">
|
||||
<display-name>AmadeusLMS</display-name>
|
||||
<filter>
|
||||
<filter-name>AmadeusCharSetFilter</filter-name>
|
||||
<filter-class>br.ufpe.cin.amadeus.amadeus_web.util.AmadeusCharSetFilter</filter-class>
|
||||
<init-param>
|
||||
<param-name>requestEncoding</param-name>
|
||||
<param-value>UTF-8</param-value>
|
||||
</init-param>
|
||||
</filter>
|
||||
<filter-mapping>
|
||||
<filter-name>AmadeusCharSetFilter</filter-name>
|
||||
<url-pattern>/*</url-pattern>
|
||||
</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-name>AmadeusCharSetFilter</filter-name>
|
||||
<filter-class>br.ufpe.cin.amadeus.amadeus_web.util.AmadeusCharSetFilter</filter-class>
|
||||
<init-param>
|
||||
<param-name>requestEncoding</param-name>
|
||||
<param-value>UTF-8</param-value>
|
||||
</init-param>
|
||||
</filter>
|
||||
<filter-mapping>
|
||||
<filter-name>AmadeusCharSetFilter</filter-name>
|
||||
<url-pattern>/*</url-pattern>
|
||||
</filter-mapping>
|
||||
|
||||
<filter-mapping>
|
||||
<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,
|
||||
<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-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>
|
||||
<load-on-startup>2</load-on-startup>
|
||||
</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>
|
||||
</init-param>
|
||||
<load-on-startup>2</load-on-startup>
|
||||
</servlet>
|
||||
|
||||
<!-- Mapping REST Configuration -->
|
||||
<servlet-mapping>
|
||||
<servlet-name>Jersey REST Service</servlet-name>
|
||||
<url-pattern>/ws/*</url-pattern>
|
||||
</servlet-mapping>
|
||||
|
||||
|
||||
<!-- DWR Configuration-->
|
||||
<servlet>
|
||||
<description>dwr-invoker</description>
|
||||
<servlet-name>dwr-invoker</servlet-name>
|
||||
<servlet-class>org.directwebremoting.servlet.DwrServlet</servlet-class>
|
||||
<init-param>
|
||||
<param-name>debug</param-name>
|
||||
<param-value>false</param-value>
|
||||
</init-param>
|
||||
<init-param>
|
||||
<param-name>activeReverseAjaxEnabled</param-name>
|
||||
<param-value>true</param-value>
|
||||
</init-param>
|
||||
<init-param>
|
||||
<param-name>initApplicationScopeCreatorsAtStartup</param-name>
|
||||
<param-value>true</param-value>
|
||||
</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>
|
||||
<!-- 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 -->
|
||||
<servlet-mapping>
|
||||
<servlet-name>dwr-invoker</servlet-name>
|
||||
<url-pattern>/dwr/*</url-pattern>
|
||||
</servlet-mapping>
|
||||
<session-config>
|
||||
<session-timeout>20</session-timeout>
|
||||
</session-config>
|
||||
<!-- The Usual Welcome File List -->
|
||||
<welcome-file-list>
|
||||
<welcome-file>index.jsp</welcome-file>
|
||||
|
||||
</welcome-file-list>
|
||||
<error-page>
|
||||
<error-code>404</error-code>
|
||||
<location>/system.do?method=showViewPageNotFound</location>
|
||||
</error-page>
|
||||
<error-page>
|
||||
<exception-type>java.lang.Exception</exception-type>
|
||||
<location>/system.do?method=showViewException</location>
|
||||
</error-page>
|
||||
<jsp-config>
|
||||
<taglib>
|
||||
<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>
|
||||
|
||||
<servlet-name>Jersey REST Service</servlet-name>
|
||||
<url-pattern>/ws/*</url-pattern>
|
||||
</servlet-mapping>
|
||||
|
||||
|
||||
<!-- DWR Configuration -->
|
||||
<servlet>
|
||||
<description>dwr-invoker</description>
|
||||
<servlet-name>dwr-invoker</servlet-name>
|
||||
<servlet-class>org.directwebremoting.servlet.DwrServlet</servlet-class>
|
||||
<init-param>
|
||||
<param-name>debug</param-name>
|
||||
<param-value>false</param-value>
|
||||
</init-param>
|
||||
<init-param>
|
||||
<param-name>activeReverseAjaxEnabled</param-name>
|
||||
<param-value>true</param-value>
|
||||
</init-param>
|
||||
<init-param>
|
||||
<param-name>initApplicationScopeCreatorsAtStartup</param-name>
|
||||
<param-value>true</param-value>
|
||||
</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>
|
||||
<url-pattern>/dwr/*</url-pattern>
|
||||
</servlet-mapping>
|
||||
<session-config>
|
||||
<session-timeout>20</session-timeout>
|
||||
</session-config>
|
||||
<!-- The Usual Welcome File List -->
|
||||
<welcome-file-list>
|
||||
<welcome-file>index.jsp</welcome-file>
|
||||
|
||||
</welcome-file-list>
|
||||
<error-page>
|
||||
<error-code>404</error-code>
|
||||
<location>/system.do?method=showViewPageNotFound</location>
|
||||
</error-page>
|
||||
<error-page>
|
||||
<exception-type>java.lang.Exception</exception-type>
|
||||
<location>/system.do?method=showViewException</location>
|
||||
</error-page>
|
||||
<jsp-config>
|
||||
<taglib>
|
||||
<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>
|
||||
|
||||
@@ -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
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
Referência em uma Nova Issue
Bloquear um usuário