[Castore-commits] struts-validation.xml 1.4 1.5
struts-statistique.xml 1.3 1.4 struts-soumission.xml 1.3 1.4
struts-groupes.xml 1.3 1.4 struts-collections.xml 1.4 1.5
struts-recherche.xml 1.3 1.4 struts-config.xml 1.4 1.5
struts-annotation.xml 1.3 1.4 struts-authentification.xml 1.4
1.5 struts-administration.xml 1.2 1.3
Céline BENOIT
cbenoit at adullact1.hosting.cri74.org
Jeu 11 Mai 11:36:19 CEST 2006
Update of /cvsroot/castore/castore-struts-webapp/src/webapp/WEB-INF
In directory adullact1:/tmp/cvs-serv16138/src/webapp/WEB-INF
Modified Files:
struts-validation.xml struts-statistique.xml
struts-soumission.xml struts-groupes.xml
struts-collections.xml struts-recherche.xml struts-config.xml
struts-annotation.xml struts-authentification.xml
struts-administration.xml
Log Message:
mise en page et ajout de commentaires
Index: struts-config.xml
===================================================================
RCS file: /cvsroot/castore/castore-struts-webapp/src/webapp/WEB-INF/struts-config.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** struts-config.xml 23 Jan 2006 10:31:08 -0000 1.4
--- struts-config.xml 11 May 2006 09:36:17 -0000 1.5
***************
*** 1,19 ****
<?xml version="1.0" encoding="UTF-8"?>
! <!--
! DTD for the Struts Application Configuration File
!
! To support validation of your configuration file, include the following
! DOCTYPE element at the beginning (after the "xml" declaration):
!
! <!DOCTYPE struts-config PUBLIC
! "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
! "http://struts.apache.org/dtds/struts-config_1_2.dtd">
!
! $Id$
! -->
! <!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN" "http://struts.apache.org/dtds/struts-config_1_2.dtd">
<struts-config>
<data-sources />
<form-beans />
<global-exceptions>
<exception handler="fr.emn.castor.common.CastorExceptionHandler"
--- 1,15 ----
<?xml version="1.0" encoding="UTF-8"?>
! <!DOCTYPE struts-config PUBLIC
! "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
! "http://struts.apache.org/dtds/struts-config_1_2.dtd">
<struts-config>
+
+ <!-- Sources de donnees -->
<data-sources />
+
+ <!-- Beans de formulaire -->
<form-beans />
+
+ <!-- Erreurs globales -->
<global-exceptions>
<exception handler="fr.emn.castor.common.CastorExceptionHandler"
***************
*** 21,24 ****
--- 17,22 ----
type="java.lang.Exception" />
</global-exceptions>
+
+ <!-- References aval globales -->
<global-forwards>
<forward contextRelative="true" name="home" path="/home.do" />
***************
*** 63,67 ****
<forward contextRelative="true" name="prefActionDocumentalist"
path="/preferences/prefActionDocumentalist.do" />
! <forward name="modifierMsgAccueilPage" contextRelative="true"
path="/profil/modifMsgAccueilPage.do" />
<forward contextRelative="true" name="updateUserSubmit"
--- 61,65 ----
<forward contextRelative="true" name="prefActionDocumentalist"
path="/preferences/prefActionDocumentalist.do" />
! <forward name="modifierMsgAccueilPage" contextRelative="true"
path="/profil/modifMsgAccueilPage.do" />
<forward contextRelative="true" name="updateUserSubmit"
***************
*** 106,110 ****
path="/visualisation/telechargerDocument.do" />
<forward name="telechargerDocumentSource" contextRelative="true"
! path="/visualisation/telechargerDocumentSource.do" />
<forward contextRelative="true" name="visualiserNotice"
path="/visualisation/visualisationNotice.do" />
--- 104,108 ----
path="/visualisation/telechargerDocument.do" />
<forward name="telechargerDocumentSource" contextRelative="true"
! path="/visualisation/telechargerDocumentSource.do" />
<forward contextRelative="true" name="visualiserNotice"
path="/visualisation/visualisationNotice.do" />
***************
*** 120,129 ****
--- 118,133 ----
path="/administration/gererLesFeuillesDeStyles.do" />
</global-forwards>
+
+ <!-- Mappages d'action -->
<action-mappings>
<action parameter="castor.default" path="/home"
type="org.apache.struts.actions.ForwardAction" />
</action-mappings>
+
+ <!-- Ressources des Messages -->
<message-resources key="common"
parameter="fr.emn.castor.struts.resources.common.messages" />
+
+ <!-- plugin -->
<plug-in className="org.apache.struts.tiles.TilesPlugin">
<set-property property="definitions-config"
***************
*** 135,137 ****
--- 139,142 ----
<set-property property="moduleAware" value="true" />
</plug-in>
+
</struts-config>
\ No newline at end of file
Index: struts-statistique.xml
===================================================================
RCS file: /cvsroot/castore/castore-struts-webapp/src/webapp/WEB-INF/struts-statistique.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** struts-statistique.xml 23 Jan 2006 10:31:08 -0000 1.3
--- struts-statistique.xml 11 May 2006 09:36:17 -0000 1.4
***************
*** 5,20 ****
<struts-config>
! <!-- Sources de données -->
<data-sources></data-sources>
<!-- Beans de formulaire -->
<form-beans>
! <form-bean name="connexionsStatsForm" type="fr.emn.castor.struts.forms.statistiques.ConnexionsStatsForm"></form-bean>
! <form-bean name="choixStatsEt1Form" type="fr.emn.castor.struts.forms.statistiques.ChoixStatistiquesEtape1Form"></form-bean>
! <form-bean name="choixStatsEt2Form" type="fr.emn.castor.struts.forms.statistiques.ChoixStatistiquesEtape2Form"></form-bean>
! <form-bean name="typesActionsStatsForm" type="fr.emn.castor.struts.forms.statistiques.TypesActionsStatsForm"></form-bean>
! <form-bean name="typesRequetesStatsForm" type="fr.emn.castor.struts.forms.statistiques.TypesRequetesStatsForm"></form-bean>
! <form-bean name="nbRequetesStatsForm" type="fr.emn.castor.struts.forms.statistiques.NbRequetesStatsForm"></form-bean>
! <form-bean name="statsDocsForm" type="fr.emn.castor.struts.forms.statistiques.StatsDocumentsForm"></form-bean>
</form-beans>
--- 5,34 ----
<struts-config>
! <!-- Sources de donnees -->
<data-sources></data-sources>
<!-- Beans de formulaire -->
<form-beans>
! <form-bean name="connexionsStatsForm"
! type="fr.emn.castor.struts.forms.statistiques.ConnexionsStatsForm">
! </form-bean>
! <form-bean name="choixStatsEt1Form"
! type="fr.emn.castor.struts.forms.statistiques.ChoixStatistiquesEtape1Form">
! </form-bean>
! <form-bean name="choixStatsEt2Form"
! type="fr.emn.castor.struts.forms.statistiques.ChoixStatistiquesEtape2Form">
! </form-bean>
! <form-bean name="typesActionsStatsForm"
! type="fr.emn.castor.struts.forms.statistiques.TypesActionsStatsForm">
! </form-bean>
! <form-bean name="typesRequetesStatsForm"
! type="fr.emn.castor.struts.forms.statistiques.TypesRequetesStatsForm">
! </form-bean>
! <form-bean name="nbRequetesStatsForm"
! type="fr.emn.castor.struts.forms.statistiques.NbRequetesStatsForm">
! </form-bean>
! <form-bean name="statsDocsForm"
! type="fr.emn.castor.struts.forms.statistiques.StatsDocumentsForm">
! </form-bean>
</form-beans>
***************
*** 22,76 ****
<global-exceptions></global-exceptions>
! <!-- Références aval globales -->
! <!-- Références aval globales -->
<global-forwards>
<forward name="home" contextRelative="true" path="/home.do" />
! <forward name="authentification" contextRelative="true" path="/authentification/login.do" />
! <forward name="deconnexion" contextRelative="true" path="/authentification/logoff.do" />
! <forward name="groupes" contextRelative="true" path="/groupes/groupesIndex.do" />
! <forward name="gererColl" contextRelative="true" path="/collections/gestionCollectionsPage.do" />
! <forward name="creerColl" contextRelative="true" path="/collections/creerCollection.do" />
! <forward name="detruireColl" contextRelative="true" path="/collections/detruireCollection.do" />
! <forward name="renommerColl" contextRelative="true" path="/collections/renommerCollection.do" />
! <forward name="modifierColl" contextRelative="true" path="/collections/modifierCollection.do" />
! <forward name="creerCollPerso" contextRelative="true" path="/collections/creerCollectionPerso.do" />
! <forward name="detruireCollPerso" contextRelative="true" path="/collections/detruireCollectionPerso.do" />
! <forward name="renommerCollPerso" contextRelative="true" path="/collections/renommerCollectionPerso.do" />
! <forward name="modifierCollPerso" contextRelative="true" path="/collections/modifierCollectionPerso.do" />
! <forward name="creerGroupe" contextRelative="true" path="/groupes/createGroupe.do" />
! <forward name="modifierMembresGroupe" contextRelative="true" path="/groupes/modifMembresGroupe.do" />
! <forward name="soumettre" path="/soumission/soumettreDoc.do" contextRelative="true" />
! <forward name="valider" path="/validation/choisirDocument.do" contextRelative="true" />
! <forward name="visualiser" contextRelative="true" path="/soumission/validationContenu.do" />
! <forward name="prefAction" contextRelative="true" path="/preferences/prefAction.do" />
! <forward name="prefActionSupervisor" contextRelative="true" path="/preferences/prefActionSupervisor.do" />
! <forward name="prefActionDocumentalist" contextRelative="true" path="/preferences/prefActionDocumentalist.do" />
! <forward name="modifierMsgAccueilPage" contextRelative="true" path="/profil/modifMsgAccueilPage.do" />
! <forward name="updateUserSubmit" contextRelative="true" path="/users/updateUserSubmit.do" />
! <forward name="updateDocumentalistSubmit" contextRelative="true" path="/users/updateDocumentalistSubmit.do" />
! <forward name="updateSupervisorSubmit" contextRelative="true" path="/users/updateSupervisorSubmit.do" />
! <forward name="accueilUserSubmit" contextRelative="true" path="/profil/accueilUserSubmit.do" />
! <forward name="myGroupesPage" contextRelative="true" path="/profil/myGroupesPage.do" />
! <forward name="mesPreferencesPage" contextRelative="true" path="/profil/mesPreferencesPage.do" />
! <forward name="mesDocumentsPage" contextRelative="true" path="/profil/mesDocumentsPage.do" />
! <forward name="mesCollectionsPage" contextRelative="true" path="/profil/mesCollectionsPage.do" />
! <forward name="accueilUserPage" contextRelative="true" path="/profil/accueilUserPage.do" />
! <forward name="prefpage" contextRelative="true" path="/preferences/prefpage.do" />
! <forward name="prefpageSupervisor" contextRelative="true" path="/preferences/prefpageSupervisor.do" />
! <forward name="prefpageDocumentalist" contextRelative="true" path="/preferences/prefpageDocumentalist.do" />
! <forward name="updateUserPage" contextRelative="true" path="/users/updateUserPage.do" />
! <forward name="updateDocumentalistPage" contextRelative="true" path="/users/updateDocumentalistPage.do" />
! <forward name="updateSupervisorPage" contextRelative="true" path="/users/updateSupervisorPage.do" />
! <forward name="rechercher" contextRelative="true" path="/recherche/rechercheSimple.do" />
! <forward name="mySubmissionsCollNat" contextRelative="true" path="/soumission/soumettreDocCollNat.do" />
! <forward name="naviguer" contextRelative="true" path="/collections/navigationPage.do" />
! <forward name="stats" path="/statistique/choixStatsPage.do" contextRelative="true" />
! <forward name="telechargerDocument" contextRelative="true" path="/visualisation/telechargerDocument.do" />
! <forward name="telechargerDocumentSource" contextRelative="true" path="/visualisation/telechargerDocumentSource.do" />
! <forward name="visualiserNotice" contextRelative="true" path="/visualisation/visualisationNotice.do" />
! <forward name="visualiserDocument" contextRelative="true" path="/visualisation/visualisationDocument.do" />
! <forward name="visualiserGroupe" path="/groupes/visualiserGroupe.do" />
! <forward name="changerProfil" contextRelative="true" path="/authentification/changerProfilPage.do" />
! <forward name="gererLesTypesDeDoc" contextRelative="true"
path="/administration/gererLesTypesDeDoc.do" />
<forward name="gererLesFeuillesDeStyles" contextRelative="true"
--- 36,135 ----
<global-exceptions></global-exceptions>
! <!-- References aval globales -->
<global-forwards>
<forward name="home" contextRelative="true" path="/home.do" />
! <forward name="authentification" contextRelative="true"
! path="/authentification/login.do" />
! <forward name="deconnexion" contextRelative="true"
! path="/authentification/logoff.do" />
! <forward name="groupes" contextRelative="true"
! path="/groupes/groupesIndex.do" />
! <forward name="gererColl" contextRelative="true"
! path="/collections/gestionCollectionsPage.do" />
! <forward name="creerColl" contextRelative="true"
! path="/collections/creerCollection.do" />
! <forward name="detruireColl" contextRelative="true"
! path="/collections/detruireCollection.do" />
! <forward name="renommerColl" contextRelative="true"
! path="/collections/renommerCollection.do" />
! <forward name="modifierColl" contextRelative="true"
! path="/collections/modifierCollection.do" />
! <forward name="creerCollPerso" contextRelative="true"
! path="/collections/creerCollectionPerso.do" />
! <forward name="detruireCollPerso" contextRelative="true"
! path="/collections/detruireCollectionPerso.do" />
! <forward name="renommerCollPerso" contextRelative="true"
! path="/collections/renommerCollectionPerso.do" />
! <forward name="modifierCollPerso" contextRelative="true"
! path="/collections/modifierCollectionPerso.do" />
! <forward name="creerGroupe" contextRelative="true"
! path="/groupes/createGroupe.do" />
! <forward name="modifierMembresGroupe" contextRelative="true"
! path="/groupes/modifMembresGroupe.do" />
! <forward name="soumettre" path="/soumission/soumettreDoc.do"
! contextRelative="true" />
! <forward name="valider" path="/validation/choisirDocument.do"
! contextRelative="true" />
! <forward name="visualiser" contextRelative="true"
! path="/soumission/validationContenu.do" />
! <forward name="prefAction" contextRelative="true"
! path="/preferences/prefAction.do" />
! <forward name="prefActionSupervisor" contextRelative="true"
! path="/preferences/prefActionSupervisor.do" />
! <forward name="prefActionDocumentalist" contextRelative="true"
! path="/preferences/prefActionDocumentalist.do" />
! <forward name="modifierMsgAccueilPage" contextRelative="true"
! path="/profil/modifMsgAccueilPage.do" />
! <forward name="updateUserSubmit" contextRelative="true"
! path="/users/updateUserSubmit.do" />
! <forward name="updateDocumentalistSubmit" contextRelative="true"
! path="/users/updateDocumentalistSubmit.do" />
! <forward name="updateSupervisorSubmit" contextRelative="true"
! path="/users/updateSupervisorSubmit.do" />
! <forward name="accueilUserSubmit" contextRelative="true"
! path="/profil/accueilUserSubmit.do" />
! <forward name="myGroupesPage" contextRelative="true"
! path="/profil/myGroupesPage.do" />
! <forward name="mesPreferencesPage" contextRelative="true"
! path="/profil/mesPreferencesPage.do" />
! <forward name="mesDocumentsPage" contextRelative="true"
! path="/profil/mesDocumentsPage.do" />
! <forward name="mesCollectionsPage" contextRelative="true"
! path="/profil/mesCollectionsPage.do" />
! <forward name="accueilUserPage" contextRelative="true"
! path="/profil/accueilUserPage.do" />
! <forward name="prefpage" contextRelative="true"
! path="/preferences/prefpage.do" />
! <forward name="prefpageSupervisor" contextRelative="true"
! path="/preferences/prefpageSupervisor.do" />
! <forward name="prefpageDocumentalist" contextRelative="true"
! path="/preferences/prefpageDocumentalist.do" />
! <forward name="updateUserPage" contextRelative="true"
! path="/users/updateUserPage.do" />
! <forward name="updateDocumentalistPage" contextRelative="true"
! path="/users/updateDocumentalistPage.do" />
! <forward name="updateSupervisorPage" contextRelative="true"
! path="/users/updateSupervisorPage.do" />
! <forward name="rechercher" contextRelative="true"
! path="/recherche/rechercheSimple.do" />
! <forward name="mySubmissionsCollNat" contextRelative="true"
! path="/soumission/soumettreDocCollNat.do" />
! <forward name="naviguer" contextRelative="true"
! path="/collections/navigationPage.do" />
! <forward name="stats" path="/statistique/choixStatsPage.do"
! contextRelative="true" />
! <forward name="telechargerDocument" contextRelative="true"
! path="/visualisation/telechargerDocument.do" />
! <forward name="telechargerDocumentSource" contextRelative="true"
! path="/visualisation/telechargerDocumentSource.do" />
! <forward name="visualiserNotice" contextRelative="true"
! path="/visualisation/visualisationNotice.do" />
! <forward name="visualiserDocument" contextRelative="true"
! path="/visualisation/visualisationDocument.do" />
! <forward name="visualiserGroupe"
! path="/groupes/visualiserGroupe.do" />
! <forward name="changerProfil" contextRelative="true"
! path="/authentification/changerProfilPage.do" />
! <forward name="gererLesTypesDeDoc" contextRelative="true"
path="/administration/gererLesTypesDeDoc.do" />
<forward name="gererLesFeuillesDeStyles" contextRelative="true"
***************
*** 80,112 ****
<!-- Mappages d'action -->
<action-mappings>
! <action path="/choixStats" type="fr.emn.castor.struts.actions.statistiques.ChoixStatistiqueEtape1Action" name="choixStatsEt1Form" scope="request" input="statistique.choixStatEt1">
! <forward name="nextStep" path="/statistique/choixStatsEt2Page.do" contextRelative="true"></forward>
! <forward name="statsTypesActions" path="/statistique/typesActionsStatsPage.do" contextRelative="true"></forward>
! <forward name="statsTypesRequetes" path="/statistique/typesRequetesStatsPage.do" contextRelative="true"></forward>
! <forward name="statsDocuments" path="/statistique/docsStatsPage.do" contextRelative="true"></forward>
</action>
! <action path="/choixStatsPage" parameter="statistique.choixStatEt1" type="org.apache.struts.actions.ForwardAction"></action>
! <action path="/choixStatsEt2" type="fr.emn.castor.struts.actions.statistiques.ChoixStatistiqueEtape2Action" input="statistique.choixStatEt2" name="choixStatsEt2Form" scope="request">
! <forward name="statsConnexions" path="/statistique/connexionsStatsPage.do" contextRelative="true"></forward>
! <forward name="statsRequetes" path="/statistique/nbRequetesStatsPage.do" contextRelative="true"></forward>
</action>
- <action path="/choixStatsEt2Page" parameter="statistique.choixStatEt2" type="org.apache.struts.actions.ForwardAction"></action>
- <action path="/connexionsStatsPage" type="org.apache.struts.actions.ForwardAction" parameter="statistique.connexions"></action>
- <action path="/connexionsStats" input="statistique.connexions" name="connexionsStatsForm" type="fr.emn.castor.struts.actions.statistiques.ActionVidePourStat" scope="request"></action>
- <action path="/typesActionsStatsPage" type="org.apache.struts.actions.ForwardAction" parameter="statistique.typesActions"></action>
- <action path="/typesActionsStats" type="fr.emn.castor.struts.actions.statistiques.ActionVidePourStat" input="statistique.typesActions" name="typesActionsStatsForm" scope="request"></action>
- <action path="/typesRequetesStatsPage" type="org.apache.struts.actions.ForwardAction" parameter="statistique.typesRequetes"></action>
- <action path="/typesRequetesStats" type="fr.emn.castor.struts.actions.statistiques.ActionVidePourStat" name="typesRequetesStatsForm" scope="request" input="statistique.typesRequetes"></action>
- <action path="/nbRequetesStatsPage" parameter="statistique.nbRequetes" type="org.apache.struts.actions.ForwardAction"></action>
- <action path="/nbRequetesStats" type="fr.emn.castor.struts.actions.statistiques.ActionVidePourStat" name="nbRequetesStatsForm" scope="request" input="statistique.nbRequetes"></action>
- <action path="/docsStatsPage" type="org.apache.struts.actions.ForwardAction" parameter="statistique.docsStats"></action>
- <action path="/docsStats" input="statistique.docsStats" name="statsDocsForm" type="fr.emn.castor.struts.actions.statistiques.ActionVidePourStat"></action>
</action-mappings>
<!-- Ressources des Messages -->
! <message-resources parameter="fr.emn.castor.struts.resources.statistiques.statistique" />
<plug-in className="org.apache.struts.tiles.TilesPlugin">
! <set-property property="definitions-config" value="/WEB-INF/tiles-default.xml,/WEB-INF/tiles-statistique.xml" />
<set-property property="moduleAware" value="true" />
</plug-in>
--- 139,234 ----
<!-- Mappages d'action -->
<action-mappings>
! <action path="/choixStats"
! type="fr.emn.castor.struts.actions.statistiques.ChoixStatistiqueEtape1Action"
! name="choixStatsEt1Form" scope="request"
! input="statistique.choixStatEt1">
! <forward name="nextStep"
! path="/statistique/choixStatsEt2Page.do" contextRelative="true">
! </forward>
! <forward name="statsTypesActions"
! path="/statistique/typesActionsStatsPage.do"
! contextRelative="true">
! </forward>
! <forward name="statsTypesRequetes"
! path="/statistique/typesRequetesStatsPage.do"
! contextRelative="true">
! </forward>
! <forward name="statsDocuments"
! path="/statistique/docsStatsPage.do" contextRelative="true">
! </forward>
</action>
! <action path="/choixStatsPage"
! parameter="statistique.choixStatEt1"
! type="org.apache.struts.actions.ForwardAction">
! </action>
! <action path="/choixStatsEt2"
! type="fr.emn.castor.struts.actions.statistiques.ChoixStatistiqueEtape2Action"
! input="statistique.choixStatEt2" name="choixStatsEt2Form"
! scope="request">
! <forward name="statsConnexions"
! path="/statistique/connexionsStatsPage.do" contextRelative="true">
! </forward>
! <forward name="statsRequetes"
! path="/statistique/nbRequetesStatsPage.do" contextRelative="true">
! </forward>
! </action>
! <action path="/choixStatsEt2Page"
! parameter="statistique.choixStatEt2"
! type="org.apache.struts.actions.ForwardAction">
! </action>
! <action path="/connexionsStatsPage"
! type="org.apache.struts.actions.ForwardAction"
! parameter="statistique.connexions">
! </action>
! <action path="/connexionsStats" input="statistique.connexions"
! name="connexionsStatsForm"
! type="fr.emn.castor.struts.actions.statistiques.ActionVidePourStat"
! scope="request">
! </action>
! <action path="/typesActionsStatsPage"
! type="org.apache.struts.actions.ForwardAction"
! parameter="statistique.typesActions">
! </action>
! <action path="/typesActionsStats"
! type="fr.emn.castor.struts.actions.statistiques.ActionVidePourStat"
! input="statistique.typesActions" name="typesActionsStatsForm"
! scope="request">
! </action>
! <action path="/typesRequetesStatsPage"
! type="org.apache.struts.actions.ForwardAction"
! parameter="statistique.typesRequetes">
! </action>
! <action path="/typesRequetesStats"
! type="fr.emn.castor.struts.actions.statistiques.ActionVidePourStat"
! name="typesRequetesStatsForm" scope="request"
! input="statistique.typesRequetes">
! </action>
! <action path="/nbRequetesStatsPage"
! parameter="statistique.nbRequetes"
! type="org.apache.struts.actions.ForwardAction">
! </action>
! <action path="/nbRequetesStats"
! type="fr.emn.castor.struts.actions.statistiques.ActionVidePourStat"
! name="nbRequetesStatsForm" scope="request"
! input="statistique.nbRequetes">
! </action>
! <action path="/docsStatsPage"
! type="org.apache.struts.actions.ForwardAction"
! parameter="statistique.docsStats">
! </action>
! <action path="/docsStats" input="statistique.docsStats"
! name="statsDocsForm"
! type="fr.emn.castor.struts.actions.statistiques.ActionVidePourStat">
</action>
</action-mappings>
<!-- Ressources des Messages -->
! <message-resources
! parameter="fr.emn.castor.struts.resources.statistiques.statistique" />
+ <!-- Plugin -->
<plug-in className="org.apache.struts.tiles.TilesPlugin">
! <set-property property="definitions-config"
! value="/WEB-INF/tiles-default.xml,/WEB-INF/tiles-statistique.xml" />
<set-property property="moduleAware" value="true" />
</plug-in>
Index: struts-recherche.xml
===================================================================
RCS file: /cvsroot/castore/castore-struts-webapp/src/webapp/WEB-INF/struts-recherche.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** struts-recherche.xml 23 Jan 2006 10:31:07 -0000 1.3
--- struts-recherche.xml 11 May 2006 09:36:17 -0000 1.4
***************
*** 5,15 ****
<struts-config>
! <!-- Sources de données -->
<data-sources></data-sources>
<!-- Beans de formulaire -->
<form-beans>
! <form-bean name="rechercheSimpleForm" type="fr.emn.castor.struts.forms.recherches.RechercheSimpleForm" />
! <form-bean name="rechercheAvanceeForm" type="fr.emn.castor.struts.forms.recherches.RechercheAvanceeForm" />
</form-beans>
--- 5,17 ----
<struts-config>
! <!-- Sources de donnees -->
<data-sources></data-sources>
<!-- Beans de formulaire -->
<form-beans>
! <form-bean name="rechercheSimpleForm"
! type="fr.emn.castor.struts.forms.recherches.RechercheSimpleForm" />
! <form-bean name="rechercheAvanceeForm"
! type="fr.emn.castor.struts.forms.recherches.RechercheAvanceeForm" />
</form-beans>
***************
*** 17,70 ****
<global-exceptions></global-exceptions>
! <!-- Références aval globales -->
<global-forwards>
<forward name="home" contextRelative="true" path="/home.do" />
! <forward name="authentification" contextRelative="true" path="/authentification/login.do" />
! <forward name="deconnexion" contextRelative="true" path="/authentification/logoff.do" />
! <forward name="groupes" contextRelative="true" path="/groupes/groupesIndex.do" />
! <forward name="gererColl" contextRelative="true" path="/collections/gestionCollectionsPage.do" />
! <forward name="creerColl" contextRelative="true" path="/collections/creerCollection.do" />
! <forward name="detruireColl" contextRelative="true" path="/collections/detruireCollection.do" />
! <forward name="renommerColl" contextRelative="true" path="/collections/renommerCollection.do" />
! <forward name="modifierColl" contextRelative="true" path="/collections/modifierCollection.do" />
! <forward name="creerCollPerso" contextRelative="true" path="/collections/creerCollectionPerso.do" />
! <forward name="detruireCollPerso" contextRelative="true" path="/collections/detruireCollectionPerso.do" />
! <forward name="renommerCollPerso" contextRelative="true" path="/collections/renommerCollectionPerso.do" />
! <forward name="modifierCollPerso" contextRelative="true" path="/collections/modifierCollectionPerso.do" />
! <forward name="creerGroupe" contextRelative="true" path="/groupes/createGroupe.do" />
! <forward name="modifierMembresGroupe" contextRelative="true" path="/groupes/modifMembresGroupe.do" />
! <forward name="soumettre" path="/soumission/soumettreDoc.do" contextRelative="true" />
! <forward name="valider" path="/validation/choisirDocument.do" contextRelative="true" />
! <forward name="visualiser" contextRelative="true" path="/soumission/validationContenu.do" />
! <forward name="prefAction" contextRelative="true" path="/preferences/prefAction.do" />
! <forward name="prefActionSupervisor" contextRelative="true" path="/preferences/prefActionSupervisor.do" />
! <forward name="prefActionDocumentalist" contextRelative="true" path="/preferences/prefActionDocumentalist.do" />
! <forward name="modifierMsgAccueilPage" contextRelative="true" path="/profil/modifMsgAccueilPage.do" />
! <forward name="updateUserSubmit" contextRelative="true" path="/users/updateUserSubmit.do" />
! <forward name="updateDocumentalistSubmit" contextRelative="true" path="/users/updateDocumentalistSubmit.do" />
! <forward name="updateSupervisorSubmit" contextRelative="true" path="/users/updateSupervisorSubmit.do" />
! <forward name="accueilUserSubmit" contextRelative="true" path="/profil/accueilUserSubmit.do" />
! <forward name="myGroupesPage" contextRelative="true" path="/profil/myGroupesPage.do" />
! <forward name="mesPreferencesPage" contextRelative="true" path="/profil/mesPreferencesPage.do" />
! <forward name="mesDocumentsPage" contextRelative="true" path="/profil/mesDocumentsPage.do" />
! <forward name="mesCollectionsPage" contextRelative="true" path="/profil/mesCollectionsPage.do" />
! <forward name="accueilUserPage" contextRelative="true" path="/profil/accueilUserPage.do" />
! <forward name="prefpage" contextRelative="true" path="/preferences/prefpage.do" />
! <forward name="prefpageSupervisor" contextRelative="true" path="/preferences/prefpageSupervisor.do" />
! <forward name="prefpageDocumentalist" contextRelative="true" path="/preferences/prefpageDocumentalist.do" />
! <forward name="updateUserPage" contextRelative="true" path="/users/updateUserPage.do" />
! <forward name="updateDocumentalistPage" contextRelative="true" path="/users/updateDocumentalistPage.do" />
! <forward name="updateSupervisorPage" contextRelative="true" path="/users/updateSupervisorPage.do" />
! <forward name="rechercher" contextRelative="true" path="/recherche/rechercheSimple.do" />
! <forward name="mySubmissionsCollNat" contextRelative="true" path="/soumission/soumettreDocCollNat.do" />
! <forward name="naviguer" contextRelative="true" path="/collections/navigationPage.do" />
! <forward name="stats" path="/statistique/choixStatsPage.do" contextRelative="true" />
! <forward name="telechargerDocument" contextRelative="true" path="/visualisation/telechargerDocument.do" />
! <forward name="telechargerDocumentSource" contextRelative="true" path="/visualisation/telechargerDocumentSource.do" />
! <forward name="visualiserNotice" contextRelative="true" path="/visualisation/visualisationNotice.do" />
! <forward name="visualiserDocument" contextRelative="true" path="/visualisation/visualisationDocument.do" />
! <forward name="visualiserGroupe" path="/groupes/visualiserGroupe.do" />
! <forward name="annoterDocument" path="/annotation/annotationDoc.do" />
! <forward name="gererLesTypesDeDoc" contextRelative="true"
path="/administration/gererLesTypesDeDoc.do" />
<forward name="gererLesFeuillesDeStyles" contextRelative="true"
--- 19,118 ----
<global-exceptions></global-exceptions>
! <!-- References aval globales -->
<global-forwards>
<forward name="home" contextRelative="true" path="/home.do" />
! <forward name="authentification" contextRelative="true"
! path="/authentification/login.do" />
! <forward name="deconnexion" contextRelative="true"
! path="/authentification/logoff.do" />
! <forward name="groupes" contextRelative="true"
! path="/groupes/groupesIndex.do" />
! <forward name="gererColl" contextRelative="true"
! path="/collections/gestionCollectionsPage.do" />
! <forward name="creerColl" contextRelative="true"
! path="/collections/creerCollection.do" />
! <forward name="detruireColl" contextRelative="true"
! path="/collections/detruireCollection.do" />
! <forward name="renommerColl" contextRelative="true"
! path="/collections/renommerCollection.do" />
! <forward name="modifierColl" contextRelative="true"
! path="/collections/modifierCollection.do" />
! <forward name="creerCollPerso" contextRelative="true"
! path="/collections/creerCollectionPerso.do" />
! <forward name="detruireCollPerso" contextRelative="true"
! path="/collections/detruireCollectionPerso.do" />
! <forward name="renommerCollPerso" contextRelative="true"
! path="/collections/renommerCollectionPerso.do" />
! <forward name="modifierCollPerso" contextRelative="true"
! path="/collections/modifierCollectionPerso.do" />
! <forward name="creerGroupe" contextRelative="true"
! path="/groupes/createGroupe.do" />
! <forward name="modifierMembresGroupe" contextRelative="true"
! path="/groupes/modifMembresGroupe.do" />
! <forward name="soumettre" path="/soumission/soumettreDoc.do"
! contextRelative="true" />
! <forward name="valider" path="/validation/choisirDocument.do"
! contextRelative="true" />
! <forward name="visualiser" contextRelative="true"
! path="/soumission/validationContenu.do" />
! <forward name="prefAction" contextRelative="true"
! path="/preferences/prefAction.do" />
! <forward name="prefActionSupervisor" contextRelative="true"
! path="/preferences/prefActionSupervisor.do" />
! <forward name="prefActionDocumentalist" contextRelative="true"
! path="/preferences/prefActionDocumentalist.do" />
! <forward name="modifierMsgAccueilPage" contextRelative="true"
! path="/profil/modifMsgAccueilPage.do" />
! <forward name="updateUserSubmit" contextRelative="true"
! path="/users/updateUserSubmit.do" />
! <forward name="updateDocumentalistSubmit" contextRelative="true"
! path="/users/updateDocumentalistSubmit.do" />
! <forward name="updateSupervisorSubmit" contextRelative="true"
! path="/users/updateSupervisorSubmit.do" />
! <forward name="accueilUserSubmit" contextRelative="true"
! path="/profil/accueilUserSubmit.do" />
! <forward name="myGroupesPage" contextRelative="true"
! path="/profil/myGroupesPage.do" />
! <forward name="mesPreferencesPage" contextRelative="true"
! path="/profil/mesPreferencesPage.do" />
! <forward name="mesDocumentsPage" contextRelative="true"
! path="/profil/mesDocumentsPage.do" />
! <forward name="mesCollectionsPage" contextRelative="true"
! path="/profil/mesCollectionsPage.do" />
! <forward name="accueilUserPage" contextRelative="true"
! path="/profil/accueilUserPage.do" />
! <forward name="prefpage" contextRelative="true"
! path="/preferences/prefpage.do" />
! <forward name="prefpageSupervisor" contextRelative="true"
! path="/preferences/prefpageSupervisor.do" />
! <forward name="prefpageDocumentalist" contextRelative="true"
! path="/preferences/prefpageDocumentalist.do" />
! <forward name="updateUserPage" contextRelative="true"
! path="/users/updateUserPage.do" />
! <forward name="updateDocumentalistPage" contextRelative="true"
! path="/users/updateDocumentalistPage.do" />
! <forward name="updateSupervisorPage" contextRelative="true"
! path="/users/updateSupervisorPage.do" />
! <forward name="rechercher" contextRelative="true"
! path="/recherche/rechercheSimple.do" />
! <forward name="mySubmissionsCollNat" contextRelative="true"
! path="/soumission/soumettreDocCollNat.do" />
! <forward name="naviguer" contextRelative="true"
! path="/collections/navigationPage.do" />
! <forward name="stats" path="/statistique/choixStatsPage.do"
! contextRelative="true" />
! <forward name="telechargerDocument" contextRelative="true"
! path="/visualisation/telechargerDocument.do" />
! <forward name="telechargerDocumentSource" contextRelative="true"
! path="/visualisation/telechargerDocumentSource.do" />
! <forward name="visualiserNotice" contextRelative="true"
! path="/visualisation/visualisationNotice.do" />
! <forward name="visualiserDocument" contextRelative="true"
! path="/visualisation/visualisationDocument.do" />
! <forward name="visualiserGroupe"
! path="/groupes/visualiserGroupe.do" />
! <forward name="annoterDocument"
! path="/annotation/annotationDoc.do" />
! <forward name="gererLesTypesDeDoc" contextRelative="true"
path="/administration/gererLesTypesDeDoc.do" />
<forward name="gererLesFeuillesDeStyles" contextRelative="true"
***************
*** 74,90 ****
<!-- Mappages d'action -->
<action-mappings>
! <action path="/rechercheSimple" type="org.apache.struts.actions.ForwardAction" parameter="recherche.simple" />
! <action path="/rechercheAvancee" type="org.apache.struts.actions.ForwardAction" parameter="recherche.avancee" />
! <action path="/rechercherSimple" type="fr.emn.castor.struts.actions.recherches.RechercheSimpleAction" name="rechercheSimpleForm" scope="request" input="recherche.simple" />
! <action path="/rechercherAvancee" type="fr.emn.castor.struts.actions.recherches.RechercheAvanceeAction" name="rechercheAvanceeForm" scope="request" input="recherche.avancee" />
! <action path="/visualiser" type="fr.emn.castor.struts.actions.documents.VisualisationAction" input="recherche.simple" name="rechercheSimpleForm" scope="request" validate="false" />
</action-mappings>
! <message-resources parameter="fr.emn.castor.struts.resources.recherches.recherche" />
!
!
<!-- Plugin -->
<plug-in className="org.apache.struts.tiles.TilesPlugin">
! <set-property property="definitions-config" value="/WEB-INF/tiles-default.xml,/WEB-INF/tiles-recherche.xml" />
<set-property property="moduleAware" value="true" />
</plug-in>
--- 122,152 ----
<!-- Mappages d'action -->
<action-mappings>
! <action path="/rechercheSimple"
! type="org.apache.struts.actions.ForwardAction"
! parameter="recherche.simple" />
! <action path="/rechercheAvancee"
! type="org.apache.struts.actions.ForwardAction"
! parameter="recherche.avancee" />
! <action path="/rechercherSimple"
! type="fr.emn.castor.struts.actions.recherches.RechercheSimpleAction"
! name="rechercheSimpleForm" scope="request" input="recherche.simple" />
! <action path="/rechercherAvancee"
! type="fr.emn.castor.struts.actions.recherches.RechercheAvanceeAction"
! name="rechercheAvanceeForm" scope="request"
! input="recherche.avancee" />
! <action path="/visualiser"
! type="fr.emn.castor.struts.actions.documents.VisualisationAction"
! input="recherche.simple" name="rechercheSimpleForm" scope="request"
! validate="false" />
</action-mappings>
! <!-- Ressources des Messages -->
! <message-resources
! parameter="fr.emn.castor.struts.resources.recherches.recherche" />
!
<!-- Plugin -->
<plug-in className="org.apache.struts.tiles.TilesPlugin">
! <set-property property="definitions-config"
! value="/WEB-INF/tiles-default.xml,/WEB-INF/tiles-recherche.xml" />
<set-property property="moduleAware" value="true" />
</plug-in>
Index: struts-authentification.xml
===================================================================
RCS file: /cvsroot/castore/castore-struts-webapp/src/webapp/WEB-INF/struts-authentification.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** struts-authentification.xml 23 Jan 2006 10:31:07 -0000 1.4
--- struts-authentification.xml 11 May 2006 09:36:17 -0000 1.5
***************
*** 5,16 ****
<struts-config>
! <!-- Sources de données -->
<data-sources></data-sources>
<!-- Beans de formulaire -->
<form-beans>
! <form-bean name="loginForm" type="fr.emn.castor.struts.forms.users.LoginForm"></form-bean>
! <form-bean name="accueilUserForm" type="fr.emn.castor.struts.forms.users.AccueilBean"></form-bean>
! <form-bean name="changerProfilForm" type="fr.emn.castor.struts.forms.users.ChangerProfilForm">
</form-bean>
</form-beans>
--- 5,21 ----
<struts-config>
! <!-- Sources de donnees -->
<data-sources></data-sources>
<!-- Beans de formulaire -->
<form-beans>
! <form-bean name="loginForm"
! type="fr.emn.castor.struts.forms.users.LoginForm">
! </form-bean>
! <form-bean name="accueilUserForm"
! type="fr.emn.castor.struts.forms.users.AccueilBean">
! </form-bean>
! <form-bean name="changerProfilForm"
! type="fr.emn.castor.struts.forms.users.ChangerProfilForm">
</form-bean>
</form-beans>
***************
*** 19,72 ****
<global-exceptions></global-exceptions>
! <!-- Références aval globales -->
<global-forwards>
<forward name="home" contextRelative="true" path="/home.do" />
! <forward name="authentification" contextRelative="true" path="/authentification/login.do" />
! <forward name="deconnexion" contextRelative="true" path="/authentification/logoff.do" />
! <forward name="groupes" contextRelative="true" path="/groupes/groupesIndex.do" />
! <forward name="gererColl" contextRelative="true" path="/collections/gestionCollectionsPage.do" />
! <forward name="creerColl" contextRelative="true" path="/collections/creerCollection.do" />
! <forward name="detruireColl" contextRelative="true" path="/collections/detruireCollection.do" />
! <forward name="renommerColl" contextRelative="true" path="/collections/renommerCollection.do" />
! <forward name="modifierColl" contextRelative="true" path="/collections/modifierCollection.do" />
! <forward name="creerCollPerso" contextRelative="true" path="/collections/creerCollectionPerso.do" />
! <forward name="detruireCollPerso" contextRelative="true" path="/collections/detruireCollectionPerso.do" />
! <forward name="renommerCollPerso" contextRelative="true" path="/collections/renommerCollectionPerso.do" />
! <forward name="modifierCollPerso" contextRelative="true" path="/collections/modifierCollectionPerso.do" />
! <forward name="creerGroupe" contextRelative="true" path="/groupes/createGroupe.do" />
! <forward name="modifierMembresGroupe" contextRelative="true" path="/groupes/modifMembresGroupe.do" />
! <forward name="soumettre" path="/soumission/soumettreDoc.do" contextRelative="true" />
! <forward name="valider" path="/validation/choisirDocument.do" contextRelative="true" />
! <forward name="visualiser" contextRelative="true" path="/soumission/validationContenu.do" />
! <forward name="prefAction" contextRelative="true" path="/preferences/prefAction.do" />
! <forward name="prefActionSupervisor" contextRelative="true" path="/preferences/prefActionSupervisor.do" />
! <forward name="prefActionDocumentalist" contextRelative="true" path="/preferences/prefActionDocumentalist.do" />
! <forward name="modifierMsgAccueilPage" contextRelative="true" path="/profil/modifMsgAccueilPage.do" />
! <forward name="updateUserSubmit" contextRelative="true" path="/users/updateUserSubmit.do" />
! <forward name="updateDocumentalistSubmit" contextRelative="true" path="/users/updateDocumentalistSubmit.do" />
! <forward name="updateSupervisorSubmit" contextRelative="true" path="/users/updateSupervisorSubmit.do" />
! <forward name="accueilUserSubmit" contextRelative="true" path="/profil/accueilUserSubmit.do" />
! <forward name="myGroupesPage" contextRelative="true" path="/profil/myGroupesPage.do" />
! <forward name="mesPreferencesPage" contextRelative="true" path="/profil/mesPreferencesPage.do" />
! <forward name="mesDocumentsPage" contextRelative="true" path="/profil/mesDocumentsPage.do" />
! <forward name="mesCollectionsPage" contextRelative="true" path="/profil/mesCollectionsPage.do" />
! <forward name="accueilUserPage" contextRelative="true" path="/profil/accueilUserPage.do" />
! <forward name="prefpage" contextRelative="true" path="/preferences/prefpage.do" />
! <forward name="prefpageSupervisor" contextRelative="true" path="/preferences/prefpageSupervisor.do" />
! <forward name="prefpageDocumentalist" contextRelative="true" path="/preferences/prefpageDocumentalist.do" />
! <forward name="updateUserPage" contextRelative="true" path="/users/updateUserPage.do" />
! <forward name="updateDocumentalistPage" contextRelative="true" path="/users/updateDocumentalistPage.do" />
! <forward name="updateSupervisorPage" contextRelative="true" path="/users/updateSupervisorPage.do" />
! <forward name="rechercher" contextRelative="true" path="/recherche/rechercheSimple.do" />
! <forward name="mySubmissionsCollNat" contextRelative="true" path="/soumission/soumettreDocCollNat.do" />
! <forward name="naviguer" contextRelative="true" path="/collections/navigationPage.do" />
! <forward name="stats" path="/statistique/choixStatsPage.do" contextRelative="true" />
! <forward name="telechargerDocument" contextRelative="true" path="/visualisation/telechargerDocument.do" />
! <forward name="telechargerDocumentSource" contextRelative="true" path="/visualisation/telechargerDocumentSource.do" />
! <forward name="visualiserNotice" contextRelative="true" path="/visualisation/visualisationNotice.do" />
! <forward name="visualiserDocument" contextRelative="true" path="/visualisation/visualisationDocument.do" />
! <forward name="visualiserGroupe" path="/groupes/visualiserGroupe.do" />
! <forward name="changerProfil" contextRelative="true" path="/authentification/changerProfilPage.do" />
! <forward name="gererLesTypesDeDoc" contextRelative="true"
path="/administration/gererLesTypesDeDoc.do" />
<forward name="gererLesFeuillesDeStyles" contextRelative="true"
--- 24,123 ----
<global-exceptions></global-exceptions>
! <!-- References aval globales -->
<global-forwards>
<forward name="home" contextRelative="true" path="/home.do" />
! <forward name="authentification" contextRelative="true"
! path="/authentification/login.do" />
! <forward name="deconnexion" contextRelative="true"
! path="/authentification/logoff.do" />
! <forward name="groupes" contextRelative="true"
! path="/groupes/groupesIndex.do" />
! <forward name="gererColl" contextRelative="true"
! path="/collections/gestionCollectionsPage.do" />
! <forward name="creerColl" contextRelative="true"
! path="/collections/creerCollection.do" />
! <forward name="detruireColl" contextRelative="true"
! path="/collections/detruireCollection.do" />
! <forward name="renommerColl" contextRelative="true"
! path="/collections/renommerCollection.do" />
! <forward name="modifierColl" contextRelative="true"
! path="/collections/modifierCollection.do" />
! <forward name="creerCollPerso" contextRelative="true"
! path="/collections/creerCollectionPerso.do" />
! <forward name="detruireCollPerso" contextRelative="true"
! path="/collections/detruireCollectionPerso.do" />
! <forward name="renommerCollPerso" contextRelative="true"
! path="/collections/renommerCollectionPerso.do" />
! <forward name="modifierCollPerso" contextRelative="true"
! path="/collections/modifierCollectionPerso.do" />
! <forward name="creerGroupe" contextRelative="true"
! path="/groupes/createGroupe.do" />
! <forward name="modifierMembresGroupe" contextRelative="true"
! path="/groupes/modifMembresGroupe.do" />
! <forward name="soumettre" path="/soumission/soumettreDoc.do"
! contextRelative="true" />
! <forward name="valider" path="/validation/choisirDocument.do"
! contextRelative="true" />
! <forward name="visualiser" contextRelative="true"
! path="/soumission/validationContenu.do" />
! <forward name="prefAction" contextRelative="true"
! path="/preferences/prefAction.do" />
! <forward name="prefActionSupervisor" contextRelative="true"
! path="/preferences/prefActionSupervisor.do" />
! <forward name="prefActionDocumentalist" contextRelative="true"
! path="/preferences/prefActionDocumentalist.do" />
! <forward name="modifierMsgAccueilPage" contextRelative="true"
! path="/profil/modifMsgAccueilPage.do" />
! <forward name="updateUserSubmit" contextRelative="true"
! path="/users/updateUserSubmit.do" />
! <forward name="updateDocumentalistSubmit" contextRelative="true"
! path="/users/updateDocumentalistSubmit.do" />
! <forward name="updateSupervisorSubmit" contextRelative="true"
! path="/users/updateSupervisorSubmit.do" />
! <forward name="accueilUserSubmit" contextRelative="true"
! path="/profil/accueilUserSubmit.do" />
! <forward name="myGroupesPage" contextRelative="true"
! path="/profil/myGroupesPage.do" />
! <forward name="mesPreferencesPage" contextRelative="true"
! path="/profil/mesPreferencesPage.do" />
! <forward name="mesDocumentsPage" contextRelative="true"
! path="/profil/mesDocumentsPage.do" />
! <forward name="mesCollectionsPage" contextRelative="true"
! path="/profil/mesCollectionsPage.do" />
! <forward name="accueilUserPage" contextRelative="true"
! path="/profil/accueilUserPage.do" />
! <forward name="prefpage" contextRelative="true"
! path="/preferences/prefpage.do" />
! <forward name="prefpageSupervisor" contextRelative="true"
! path="/preferences/prefpageSupervisor.do" />
! <forward name="prefpageDocumentalist" contextRelative="true"
! path="/preferences/prefpageDocumentalist.do" />
! <forward name="updateUserPage" contextRelative="true"
! path="/users/updateUserPage.do" />
! <forward name="updateDocumentalistPage" contextRelative="true"
! path="/users/updateDocumentalistPage.do" />
! <forward name="updateSupervisorPage" contextRelative="true"
! path="/users/updateSupervisorPage.do" />
! <forward name="rechercher" contextRelative="true"
! path="/recherche/rechercheSimple.do" />
! <forward name="mySubmissionsCollNat" contextRelative="true"
! path="/soumission/soumettreDocCollNat.do" />
! <forward name="naviguer" contextRelative="true"
! path="/collections/navigationPage.do" />
! <forward name="stats" path="/statistique/choixStatsPage.do"
! contextRelative="true" />
! <forward name="telechargerDocument" contextRelative="true"
! path="/visualisation/telechargerDocument.do" />
! <forward name="telechargerDocumentSource" contextRelative="true"
! path="/visualisation/telechargerDocumentSource.do" />
! <forward name="visualiserNotice" contextRelative="true"
! path="/visualisation/visualisationNotice.do" />
! <forward name="visualiserDocument" contextRelative="true"
! path="/visualisation/visualisationDocument.do" />
! <forward name="visualiserGroupe"
! path="/groupes/visualiserGroupe.do" />
! <forward name="changerProfil" contextRelative="true"
! path="/authentification/changerProfilPage.do" />
! <forward name="gererLesTypesDeDoc" contextRelative="true"
path="/administration/gererLesTypesDeDoc.do" />
<forward name="gererLesFeuillesDeStyles" contextRelative="true"
***************
*** 76,103 ****
<!-- Mappages d'action -->
<action-mappings>
! <action path="/login" type="org.apache.struts.actions.ForwardAction" parameter="/authentification/login.jsp" />
! <action path="/loginSubmit" name="loginForm" scope="request" type="fr.emn.castor.struts.actions.users.LoginAction" input="/login.jsp" validate="true">
! <forward name="success" path="/profil/accueilUserPage.do" contextRelative="true"></forward>
</action>
! <action path="/logoff" type="fr.emn.castor.struts.actions.users.LogoffAction">
! <forward name="success" path="/authentification/login.jsp" contextRelative="true"></forward>
</action>
! <action path="/changerProfilPage" type="org.apache.struts.actions.ForwardAction" parameter="changerProfil.default">
</action>
! <action path="/changerProfilAction" name="changerProfilForm" type="fr.emn.castor.struts.actions.users.ChangerProfilAction" input="changerProfil.default" scope="request">
</action>
! <action path="/retourProfilAction" type="fr.emn.castor.struts.actions.users.RetourProfilAction">
</action>
</action-mappings>
<!-- Ressources des Messages -->
! <message-resources parameter="fr.emn.castor.struts.resources.users.authentification" />
!
<plug-in className="org.apache.struts.tiles.TilesPlugin">
! <set-property property="definitions-config" value="/WEB-INF/tiles-default.xml,/WEB-INF/tiles-profil.xml" />
<set-property property="moduleAware" value="true" />
</plug-in>
-
</struts-config>
\ No newline at end of file
--- 127,169 ----
<!-- Mappages d'action -->
<action-mappings>
! <action path="/login"
! type="org.apache.struts.actions.ForwardAction"
! parameter="/authentification/login.jsp" />
! <action path="/loginSubmit" name="loginForm" scope="request"
! type="fr.emn.castor.struts.actions.users.LoginAction"
! input="/login.jsp" validate="true">
! <forward name="success" path="/profil/accueilUserPage.do"
! contextRelative="true">
! </forward>
</action>
! <action path="/logoff"
! type="fr.emn.castor.struts.actions.users.LogoffAction">
! <forward name="success" path="/authentification/login.jsp"
! contextRelative="true">
! </forward>
</action>
! <action path="/changerProfilPage"
! type="org.apache.struts.actions.ForwardAction"
! parameter="changerProfil.default">
</action>
! <action path="/changerProfilAction" name="changerProfilForm"
! type="fr.emn.castor.struts.actions.users.ChangerProfilAction"
! input="changerProfil.default" scope="request">
</action>
! <action path="/retourProfilAction"
! type="fr.emn.castor.struts.actions.users.RetourProfilAction">
</action>
</action-mappings>
<!-- Ressources des Messages -->
! <message-resources
! parameter="fr.emn.castor.struts.resources.users.authentification" />
+ <!-- Plugin -->
<plug-in className="org.apache.struts.tiles.TilesPlugin">
! <set-property property="definitions-config"
! value="/WEB-INF/tiles-default.xml,/WEB-INF/tiles-profil.xml" />
<set-property property="moduleAware" value="true" />
</plug-in>
</struts-config>
\ No newline at end of file
Index: struts-annotation.xml
===================================================================
RCS file: /cvsroot/castore/castore-struts-webapp/src/webapp/WEB-INF/struts-annotation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** struts-annotation.xml 23 Jan 2006 10:31:08 -0000 1.3
--- struts-annotation.xml 11 May 2006 09:36:17 -0000 1.4
***************
*** 5,15 ****
<struts-config>
! <!-- Sources de données -->
<data-sources></data-sources>
<!-- Beans de formulaire -->
<form-beans>
! <form-bean name="annoterDocumentForm" type="fr.emn.castor.struts.forms.documents.AnnoterDocumentForm"></form-bean>
! <form-bean name="voirAnnotationsForm" type="fr.emn.castor.struts.forms.documents.VoirAnnotationsForm"></form-bean>
</form-beans>
--- 5,19 ----
<struts-config>
! <!-- Sources de donnees -->
<data-sources></data-sources>
<!-- Beans de formulaire -->
<form-beans>
! <form-bean name="annoterDocumentForm"
! type="fr.emn.castor.struts.forms.documents.AnnoterDocumentForm">
! </form-bean>
! <form-bean name="voirAnnotationsForm"
! type="fr.emn.castor.struts.forms.documents.VoirAnnotationsForm">
! </form-bean>
</form-beans>
***************
*** 17,70 ****
<global-exceptions></global-exceptions>
! <!-- Références aval globales -->
<global-forwards>
<forward name="home" contextRelative="true" path="/home.do" />
! <forward name="authentification" contextRelative="true" path="/authentification/login.do" />
! <forward name="deconnexion" contextRelative="true" path="/authentification/logoff.do" />
! <forward name="groupes" contextRelative="true" path="/groupes/groupesIndex.do" />
! <forward name="gererColl" contextRelative="true" path="/collections/gestionCollectionsPage.do" />
! <forward name="creerColl" contextRelative="true" path="/collections/creerCollection.do" />
! <forward name="detruireColl" contextRelative="true" path="/collections/detruireCollection.do" />
! <forward name="renommerColl" contextRelative="true" path="/collections/renommerCollection.do" />
! <forward name="modifierColl" contextRelative="true" path="/collections/modifierCollection.do" />
! <forward name="creerCollPerso" contextRelative="true" path="/collections/creerCollectionPerso.do" />
! <forward name="detruireCollPerso" contextRelative="true" path="/collections/detruireCollectionPerso.do" />
! <forward name="renommerCollPerso" contextRelative="true" path="/collections/renommerCollectionPerso.do" />
! <forward name="modifierCollPerso" contextRelative="true" path="/collections/modifierCollectionPerso.do" />
! <forward name="creerGroupe" contextRelative="true" path="/groupes/createGroupe.do" />
! <forward name="modifierMembresGroupe" contextRelative="true" path="/groupes/modifMembresGroupe.do" />
! <forward name="soumettre" path="/soumission/soumettreDoc.do" contextRelative="true" />
! <forward name="valider" path="/validation/choisirDocument.do" contextRelative="true" />
! <forward name="visualiser" contextRelative="true" path="/soumission/validationContenu.do" />
! <forward name="prefAction" contextRelative="true" path="/preferences/prefAction.do" />
! <forward name="prefActionSupervisor" contextRelative="true" path="/preferences/prefActionSupervisor.do" />
! <forward name="prefActionDocumentalist" contextRelative="true" path="/preferences/prefActionDocumentalist.do" />
! <forward name="modifierMsgAccueilPage" contextRelative="true" path="/profil/modifMsgAccueilPage.do" />
! <forward name="updateUserSubmit" contextRelative="true" path="/users/updateUserSubmit.do" />
! <forward name="updateDocumentalistSubmit" contextRelative="true" path="/users/updateDocumentalistSubmit.do" />
! <forward name="updateSupervisorSubmit" contextRelative="true" path="/users/updateSupervisorSubmit.do" />
! <forward name="accueilUserSubmit" contextRelative="true" path="/profil/accueilUserSubmit.do" />
! <forward name="myGroupesPage" contextRelative="true" path="/profil/myGroupesPage.do" />
! <forward name="mesPreferencesPage" contextRelative="true" path="/profil/mesPreferencesPage.do" />
! <forward name="mesDocumentsPage" contextRelative="true" path="/profil/mesDocumentsPage.do" />
! <forward name="mesCollectionsPage" contextRelative="true" path="/profil/mesCollectionsPage.do" />
! <forward name="accueilUserPage" contextRelative="true" path="/profil/accueilUserPage.do" />
! <forward name="prefpage" contextRelative="true" path="/preferences/prefpage.do" />
! <forward name="prefpageSupervisor" contextRelative="true" path="/preferences/prefpageSupervisor.do" />
! <forward name="prefpageDocumentalist" contextRelative="true" path="/preferences/prefpageDocumentalist.do" />
! <forward name="updateUserPage" contextRelative="true" path="/users/updateUserPage.do" />
! <forward name="updateDocumentalistPage" contextRelative="true" path="/users/updateDocumentalistPage.do" />
! <forward name="updateSupervisorPage" contextRelative="true" path="/users/updateSupervisorPage.do" />
! <forward name="rechercher" contextRelative="true" path="/recherche/rechercheSimple.do" />
! <forward name="mySubmissionsCollNat" contextRelative="true" path="/soumission/soumettreDocCollNat.do" />
! <forward name="naviguer" contextRelative="true" path="/collections/navigationPage.do" />
! <forward name="stats" path="/statistique/choixStatsPage.do" contextRelative="true" />
! <forward name="telechargerDocument" contextRelative="true" path="/visualisation/telechargerDocument.do" />
! <forward name="telechargerDocumentSource" contextRelative="true" path="/visualisation/telechargerDocumentSource.do" />
! <forward name="visualiserNotice" contextRelative="true" path="/visualisation/visualisationNotice.do" />
! <forward name="visualiserDocument" contextRelative="true" path="/visualisation/visualisationDocument.do" />
! <forward name="visualiserGroupe" path="/groupes/visualiserGroupe.do" />
! <forward name="changerProfil" contextRelative="true" path="/authentification/changerProfilPage.do" />
! <forward name="gererLesTypesDeDoc" contextRelative="true"
path="/administration/gererLesTypesDeDoc.do" />
<forward name="gererLesFeuillesDeStyles" contextRelative="true"
--- 21,120 ----
<global-exceptions></global-exceptions>
! <!-- References aval globales -->
<global-forwards>
<forward name="home" contextRelative="true" path="/home.do" />
! <forward name="authentification" contextRelative="true"
! path="/authentification/login.do" />
! <forward name="deconnexion" contextRelative="true"
! path="/authentification/logoff.do" />
! <forward name="groupes" contextRelative="true"
! path="/groupes/groupesIndex.do" />
! <forward name="gererColl" contextRelative="true"
! path="/collections/gestionCollectionsPage.do" />
! <forward name="creerColl" contextRelative="true"
! path="/collections/creerCollection.do" />
! <forward name="detruireColl" contextRelative="true"
! path="/collections/detruireCollection.do" />
! <forward name="renommerColl" contextRelative="true"
! path="/collections/renommerCollection.do" />
! <forward name="modifierColl" contextRelative="true"
! path="/collections/modifierCollection.do" />
! <forward name="creerCollPerso" contextRelative="true"
! path="/collections/creerCollectionPerso.do" />
! <forward name="detruireCollPerso" contextRelative="true"
! path="/collections/detruireCollectionPerso.do" />
! <forward name="renommerCollPerso" contextRelative="true"
! path="/collections/renommerCollectionPerso.do" />
! <forward name="modifierCollPerso" contextRelative="true"
! path="/collections/modifierCollectionPerso.do" />
! <forward name="creerGroupe" contextRelative="true"
! path="/groupes/createGroupe.do" />
! <forward name="modifierMembresGroupe" contextRelative="true"
! path="/groupes/modifMembresGroupe.do" />
! <forward name="soumettre" path="/soumission/soumettreDoc.do"
! contextRelative="true" />
! <forward name="valider" path="/validation/choisirDocument.do"
! contextRelative="true" />
! <forward name="visualiser" contextRelative="true"
! path="/soumission/validationContenu.do" />
! <forward name="prefAction" contextRelative="true"
! path="/preferences/prefAction.do" />
! <forward name="prefActionSupervisor" contextRelative="true"
! path="/preferences/prefActionSupervisor.do" />
! <forward name="prefActionDocumentalist" contextRelative="true"
! path="/preferences/prefActionDocumentalist.do" />
! <forward name="modifierMsgAccueilPage" contextRelative="true"
! path="/profil/modifMsgAccueilPage.do" />
! <forward name="updateUserSubmit" contextRelative="true"
! path="/users/updateUserSubmit.do" />
! <forward name="updateDocumentalistSubmit" contextRelative="true"
! path="/users/updateDocumentalistSubmit.do" />
! <forward name="updateSupervisorSubmit" contextRelative="true"
! path="/users/updateSupervisorSubmit.do" />
! <forward name="accueilUserSubmit" contextRelative="true"
! path="/profil/accueilUserSubmit.do" />
! <forward name="myGroupesPage" contextRelative="true"
! path="/profil/myGroupesPage.do" />
! <forward name="mesPreferencesPage" contextRelative="true"
! path="/profil/mesPreferencesPage.do" />
! <forward name="mesDocumentsPage" contextRelative="true"
! path="/profil/mesDocumentsPage.do" />
! <forward name="mesCollectionsPage" contextRelative="true"
! path="/profil/mesCollectionsPage.do" />
! <forward name="accueilUserPage" contextRelative="true"
! path="/profil/accueilUserPage.do" />
! <forward name="prefpage" contextRelative="true"
! path="/preferences/prefpage.do" />
! <forward name="prefpageSupervisor" contextRelative="true"
! path="/preferences/prefpageSupervisor.do" />
! <forward name="prefpageDocumentalist" contextRelative="true"
! path="/preferences/prefpageDocumentalist.do" />
! <forward name="updateUserPage" contextRelative="true"
! path="/users/updateUserPage.do" />
! <forward name="updateDocumentalistPage" contextRelative="true"
! path="/users/updateDocumentalistPage.do" />
! <forward name="updateSupervisorPage" contextRelative="true"
! path="/users/updateSupervisorPage.do" />
! <forward name="rechercher" contextRelative="true"
! path="/recherche/rechercheSimple.do" />
! <forward name="mySubmissionsCollNat" contextRelative="true"
! path="/soumission/soumettreDocCollNat.do" />
! <forward name="naviguer" contextRelative="true"
! path="/collections/navigationPage.do" />
! <forward name="stats" path="/statistique/choixStatsPage.do"
! contextRelative="true" />
! <forward name="telechargerDocument" contextRelative="true"
! path="/visualisation/telechargerDocument.do" />
! <forward name="telechargerDocumentSource" contextRelative="true"
! path="/visualisation/telechargerDocumentSource.do" />
! <forward name="visualiserNotice" contextRelative="true"
! path="/visualisation/visualisationNotice.do" />
! <forward name="visualiserDocument" contextRelative="true"
! path="/visualisation/visualisationDocument.do" />
! <forward name="visualiserGroupe"
! path="/groupes/visualiserGroupe.do" />
! <forward name="changerProfil" contextRelative="true"
! path="/authentification/changerProfilPage.do" />
! <forward name="gererLesTypesDeDoc" contextRelative="true"
path="/administration/gererLesTypesDeDoc.do" />
<forward name="gererLesFeuillesDeStyles" contextRelative="true"
***************
*** 74,98 ****
<!-- Mappages d'action -->
<action-mappings>
! <action path="/annotationDoc" type="org.apache.struts.actions.ForwardAction" parameter="annotation.document.depot" />
! <action path="/voirAnnotationsDoc" type="org.apache.struts.actions.ForwardAction" parameter="annotation.document.voir" name="voirAnnotationsForm" />
! <action path="/annoterDoc" name="annoterDocumentForm" scope="request" type="fr.emn.castor.struts.actions.documents.AnnoterDocumentAction" input="annotation.document.depot" validate="true">
! <forward name="mesCollectionsPage" path="/profil/mesCollectionsPage.do" contextRelative="true" />
! <forward name="mesDocumentsPage" path="/profil/mesDocumentsPage.do" contextRelative="true" />
! <forward name="rechercheSimplePage" path="/recherche/rechercheSimple.do" contextRelative="true" />
! <forward name="rechercheAvanceePage" path="/recherche/rechercheAvancee.do" contextRelative="true" />
! <forward name="navigationPage" path="/collections/navigationPage.do" contextRelative="true" />
! <forward name="gestionCollectionsPage" path="/collections/gestionCollectionsPage.do" contextRelative="true" />
</action>
-
</action-mappings>
<!-- Ressources des Messages -->
! <message-resources parameter="fr.emn.castor.struts.resources.documents.annotation" />
<plug-in className="org.apache.struts.tiles.TilesPlugin">
! <set-property property="definitions-config" value="/WEB-INF/tiles-default.xml,/WEB-INF/tiles-annotation.xml" />
<set-property property="moduleAware" value="true" />
</plug-in>
-
</struts-config>
\ No newline at end of file
--- 124,163 ----
<!-- Mappages d'action -->
<action-mappings>
! <action path="/annotationDoc"
! type="org.apache.struts.actions.ForwardAction"
! parameter="annotation.document.depot" />
! <action path="/voirAnnotationsDoc"
! type="org.apache.struts.actions.ForwardAction"
! parameter="annotation.document.voir" name="voirAnnotationsForm" />
! <action path="/annoterDoc" name="annoterDocumentForm"
! scope="request"
! type="fr.emn.castor.struts.actions.documents.AnnoterDocumentAction"
! input="annotation.document.depot" validate="true">
! <forward name="mesCollectionsPage"
! path="/profil/mesCollectionsPage.do" contextRelative="true" />
! <forward name="mesDocumentsPage"
! path="/profil/mesDocumentsPage.do" contextRelative="true" />
! <forward name="rechercheSimplePage"
! path="/recherche/rechercheSimple.do" contextRelative="true" />
! <forward name="rechercheAvanceePage"
! path="/recherche/rechercheAvancee.do" contextRelative="true" />
! <forward name="navigationPage"
! path="/collections/navigationPage.do" contextRelative="true" />
! <forward name="gestionCollectionsPage"
! path="/collections/gestionCollectionsPage.do"
! contextRelative="true" />
</action>
</action-mappings>
<!-- Ressources des Messages -->
! <message-resources
! parameter="fr.emn.castor.struts.resources.documents.annotation" />
+ <!-- Plugin -->
<plug-in className="org.apache.struts.tiles.TilesPlugin">
! <set-property property="definitions-config"
! value="/WEB-INF/tiles-default.xml,/WEB-INF/tiles-annotation.xml" />
<set-property property="moduleAware" value="true" />
</plug-in>
</struts-config>
\ No newline at end of file
Index: struts-validation.xml
===================================================================
RCS file: /cvsroot/castore/castore-struts-webapp/src/webapp/WEB-INF/struts-validation.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** struts-validation.xml 19 Apr 2006 14:32:14 -0000 1.4
--- struts-validation.xml 11 May 2006 09:36:17 -0000 1.5
***************
*** 1,6 ****
<?xml version="1.0" encoding="UTF-8"?>
! <!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN" "http://struts.apache.org/dtds/struts-config_1_2.dtd">
<struts-config>
<data-sources />
<form-beans>
<form-bean name="validationContenuForm"
--- 1,12 ----
<?xml version="1.0" encoding="UTF-8"?>
! <!DOCTYPE struts-config PUBLIC
! "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
! "http://struts.apache.org/dtds/struts-config_1_2.dtd">
<struts-config>
+
+ <!-- Sources de donnees -->
<data-sources />
+
+ <!-- Beans de formulaire -->
<form-beans>
<form-bean name="validationContenuForm"
***************
*** 15,19 ****
--- 21,29 ----
type="fr.emn.castor.struts.forms.documents.RecupDocForm" />
</form-beans>
+
+ <!-- Exceptions globales -->
<global-exceptions />
+
+ <!-- References aval globales -->
<global-forwards>
<forward contextRelative="true" name="home" path="/home.do" />
***************
*** 78,82 ****
--- 88,96 ----
<forward name="gererLesFeuillesDeStyles" contextRelative="true"
path="/administration/gererLesFeuillesDeStyles.do" />
+ <forward name="visualisationDocImageAction"
+ contextRelative="true" path="/profil/visualiserDocImageAction.do" />
</global-forwards>
+
+ <!-- Mappages d'action -->
<action-mappings>
<action name="recupDocForm" parameter="validation.choixDocument"
***************
*** 174,179 ****
--- 188,197 ----
</action>
</action-mappings>
+
+ <!-- Ressources des Messages -->
<message-resources
parameter="fr.emn.castor.struts.resources.documents.validation" />
+
+ <!-- Plugin -->
<plug-in className="org.apache.struts.tiles.TilesPlugin">
<set-property property="definitions-config"
***************
*** 181,183 ****
--- 199,202 ----
<set-property property="moduleAware" value="true" />
</plug-in>
+
</struts-config>
\ No newline at end of file
Index: struts-administration.xml
===================================================================
RCS file: /cvsroot/castore/castore-struts-webapp/src/webapp/WEB-INF/struts-administration.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** struts-administration.xml 23 Jan 2006 10:31:08 -0000 1.2
--- struts-administration.xml 11 May 2006 09:36:17 -0000 1.3
***************
*** 5,9 ****
<struts-config>
! <!-- Sources de données -->
<data-sources></data-sources>
--- 5,9 ----
<struts-config>
! <!-- Sources de donnees -->
<data-sources></data-sources>
***************
*** 60,66 ****
path="/preferences/prefActionSupervisor.do" />
<forward name="prefActionDocumentalist" contextRelative="true"
! path="/preferences/prefActionDocumentalist.do" />
! <forward name="modifierMsgAccueilPage" contextRelative="true"
! path="/profil/modifMsgAccueilPage.do" />
<forward name="updateUserSubmit" contextRelative="true"
path="/users/updateUserSubmit.do" />
--- 60,66 ----
path="/preferences/prefActionSupervisor.do" />
<forward name="prefActionDocumentalist" contextRelative="true"
! path="/preferences/prefActionDocumentalist.do" />
! <forward name="modifierMsgAccueilPage" contextRelative="true"
! path="/profil/modifMsgAccueilPage.do" />
<forward name="updateUserSubmit" contextRelative="true"
path="/users/updateUserSubmit.do" />
***************
*** 138,142 ****
contextRelative="true" />
</action>
-
</action-mappings>
--- 138,141 ----
***************
*** 145,148 ****
--- 144,148 ----
parameter="fr.emn.castor.struts.resources.administration.administration" />
+ <!-- Plugin -->
<plug-in className="org.apache.struts.tiles.TilesPlugin">
<set-property property="definitions-config"
***************
*** 151,154 ****
</plug-in>
-
</struts-config>
\ No newline at end of file
--- 151,153 ----
Index: struts-soumission.xml
===================================================================
RCS file: /cvsroot/castore/castore-struts-webapp/src/webapp/WEB-INF/struts-soumission.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** struts-soumission.xml 23 Jan 2006 10:31:08 -0000 1.3
--- struts-soumission.xml 11 May 2006 09:36:17 -0000 1.4
***************
*** 5,9 ****
<struts-config>
! <!-- Sources de données -->
<data-sources></data-sources>
--- 5,9 ----
<struts-config>
! <!-- Sources de donnees -->
<data-sources></data-sources>
***************
*** 43,47 ****
<global-exceptions></global-exceptions>
! <!-- Références aval globales -->
<global-forwards>
<forward name="home" contextRelative="true" path="/home.do" />
--- 43,47 ----
<global-exceptions></global-exceptions>
! <!-- References aval globales -->
<global-forwards>
<forward name="home" contextRelative="true" path="/home.do" />
***************
*** 84,89 ****
<forward name="prefActionDocumentalist" contextRelative="true"
path="/preferences/prefActionDocumentalist.do" />
! <forward name="modifierMsgAccueilPage" contextRelative="true"
! path="/profil/modifMsgAccueilPage.do" />
<forward name="updateUserSubmit" contextRelative="true"
path="/users/updateUserSubmit.do" />
--- 84,89 ----
<forward name="prefActionDocumentalist" contextRelative="true"
path="/preferences/prefActionDocumentalist.do" />
! <forward name="modifierMsgAccueilPage" contextRelative="true"
! path="/profil/modifMsgAccueilPage.do" />
<forward name="updateUserSubmit" contextRelative="true"
path="/users/updateUserSubmit.do" />
***************
*** 270,274 ****
parameter="soumission.choixLicence"
type="org.apache.struts.actions.ForwardAction">
-
</action>
<action path="/licenceEMN"
--- 270,273 ----
***************
*** 281,285 ****
parameter="soumission.choixLicence.licenceEMN">
</action>
-
</action-mappings>
--- 280,283 ----
***************
*** 288,291 ****
--- 286,290 ----
parameter="fr.emn.castor.struts.resources.documents.soumission" />
+ <!-- Plugin -->
<plug-in className="org.apache.struts.tiles.TilesPlugin">
<set-property property="definitions-config"
Index: struts-groupes.xml
===================================================================
RCS file: /cvsroot/castore/castore-struts-webapp/src/webapp/WEB-INF/struts-groupes.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** struts-groupes.xml 23 Jan 2006 10:31:07 -0000 1.3
--- struts-groupes.xml 11 May 2006 09:36:17 -0000 1.4
***************
*** 5,19 ****
<struts-config>
! <!-- Sources de données -->
<data-sources></data-sources>
<!-- Beans de formulaire -->
<form-beans>
! <form-bean name="creerGroupeForm" type="fr.emn.castor.struts.forms.groupes.CreerGroupeForm"></form-bean>
! <form-bean name="voirGroupeForm" type="fr.emn.castor.struts.forms.groupes.VoirGroupeForm"></form-bean>
! <form-bean name="gestionGroupesForm" type="fr.emn.castor.struts.forms.groupes.GestionGroupesForm"></form-bean>
! <form-bean name="modifierMembresGroupeForm" type="fr.emn.castor.struts.forms.groupes.ModifierMembresGroupeForm"></form-bean>
! <form-bean name="modifierDonneesGroupeForm" type="fr.emn.castor.struts.forms.groupes.ModifierDonneesGroupeForm"></form-bean>
! <form-bean name="validerSuppGroupeForm" type="fr.emn.castor.struts.forms.groupes.ValiderSuppressionGroupeForm"></form-bean>
</form-beans>
--- 5,31 ----
<struts-config>
! <!-- Sources de donnees -->
<data-sources></data-sources>
<!-- Beans de formulaire -->
<form-beans>
! <form-bean name="creerGroupeForm"
! type="fr.emn.castor.struts.forms.groupes.CreerGroupeForm">
! </form-bean>
! <form-bean name="voirGroupeForm"
! type="fr.emn.castor.struts.forms.groupes.VoirGroupeForm">
! </form-bean>
! <form-bean name="gestionGroupesForm"
! type="fr.emn.castor.struts.forms.groupes.GestionGroupesForm">
! </form-bean>
! <form-bean name="modifierMembresGroupeForm"
! type="fr.emn.castor.struts.forms.groupes.ModifierMembresGroupeForm">
! </form-bean>
! <form-bean name="modifierDonneesGroupeForm"
! type="fr.emn.castor.struts.forms.groupes.ModifierDonneesGroupeForm">
! </form-bean>
! <form-bean name="validerSuppGroupeForm"
! type="fr.emn.castor.struts.forms.groupes.ValiderSuppressionGroupeForm">
! </form-bean>
</form-beans>
***************
*** 21,71 ****
<global-forwards>
<forward name="home" contextRelative="true" path="/home.do" />
! <forward name="authentification" contextRelative="true" path="/authentification/login.do" />
! <forward name="deconnexion" contextRelative="true" path="/authentification/logoff.do" />
! <forward name="groupes" contextRelative="true" path="/groupes/groupesIndex.do" />
! <forward name="gererColl" contextRelative="true" path="/collections/gestionCollectionsPage.do" />
! <forward name="creerColl" contextRelative="true" path="/collections/creerCollection.do" />
! <forward name="detruireColl" contextRelative="true" path="/collections/detruireCollection.do" />
! <forward name="renommerColl" contextRelative="true" path="/collections/renommerCollection.do" />
! <forward name="modifierColl" contextRelative="true" path="/collections/modifierCollection.do" />
! <forward name="creerCollPerso" contextRelative="true" path="/collections/creerCollectionPerso.do" />
! <forward name="detruireCollPerso" contextRelative="true" path="/collections/detruireCollectionPerso.do" />
! <forward name="renommerCollPerso" contextRelative="true" path="/collections/renommerCollectionPerso.do" />
! <forward name="modifierCollPerso" contextRelative="true" path="/collections/modifierCollectionPerso.do" />
! <forward name="creerGroupe" contextRelative="true" path="/groupes/createGroupe.do" />
! <forward name="modifierMembresGroupe" contextRelative="true" path="/groupes/modifMembresGroupe.do" />
! <forward name="soumettre" path="/soumission/soumettreDoc.do" contextRelative="true" />
! <forward name="valider" path="/validation/choisirDocument.do" contextRelative="true" />
! <forward name="visualiser" contextRelative="true" path="/soumission/validationContenu.do" />
! <forward name="prefAction" contextRelative="true" path="/preferences/prefAction.do" />
! <forward name="prefActionSupervisor" contextRelative="true" path="/preferences/prefActionSupervisor.do" />
! <forward name="prefActionDocumentalist" contextRelative="true" path="/preferences/prefActionDocumentalist.do" />
! <forward name="modifierMsgAccueilPage" contextRelative="true" path="/profil/modifMsgAccueilPage.do" />
! <forward name="updateUserSubmit" contextRelative="true" path="/users/updateUserSubmit.do" />
! <forward name="updateDocumentalistSubmit" contextRelative="true" path="/users/updateDocumentalistSubmit.do" />
! <forward name="updateSupervisorSubmit" contextRelative="true" path="/users/updateSupervisorSubmit.do" />
! <forward name="accueilUserSubmit" contextRelative="true" path="/profil/accueilUserSubmit.do" />
! <forward name="myGroupesPage" contextRelative="true" path="/profil/myGroupesPage.do" />
! <forward name="mesPreferencesPage" contextRelative="true" path="/profil/mesPreferencesPage.do" />
! <forward name="mesDocumentsPage" contextRelative="true" path="/profil/mesDocumentsPage.do" />
! <forward name="mesCollectionsPage" contextRelative="true" path="/profil/mesCollectionsPage.do" />
! <forward name="accueilUserPage" contextRelative="true" path="/profil/accueilUserPage.do" />
! <forward name="prefpage" contextRelative="true" path="/preferences/prefpage.do" />
! <forward name="prefpageSupervisor" contextRelative="true" path="/preferences/prefpageSupervisor.do" />
! <forward name="prefpageDocumentalist" contextRelative="true" path="/preferences/prefpageDocumentalist.do" />
! <forward name="updateUserPage" contextRelative="true" path="/users/updateUserPage.do" />
! <forward name="updateDocumentalistPage" contextRelative="true" path="/users/updateDocumentalistPage.do" />
! <forward name="updateSupervisorPage" contextRelative="true" path="/users/updateSupervisorPage.do" />
! <forward name="rechercher" contextRelative="true" path="/recherche/rechercheSimple.do" />
! <forward name="mySubmissionsCollNat" contextRelative="true" path="/soumission/soumettreDocCollNat.do" />
! <forward name="naviguer" contextRelative="true" path="/collections/navigationPage.do" />
! <forward name="stats" path="/statistique/choixStatsPage.do" contextRelative="true" />
! <forward name="telechargerDocument" contextRelative="true" path="/visualisation/telechargerDocument.do" />
! <forward name="telechargerDocumentSource" contextRelative="true" path="/visualisation/telechargerDocumentSource.do" />
! <forward name="visualiserNotice" contextRelative="true" path="/visualisation/visualisationNotice.do" />
! <forward name="visualiserDocument" contextRelative="true" path="/visualisation/visualisationDocument.do" />
! <forward name="visualiserGroupe" path="/groupes/visualiserGroupe.do" />
! <forward name="changerProfil" contextRelative="true" path="/authentification/changerProfilPage.do" />
! <forward name="gererLesTypesDeDoc" contextRelative="true"
path="/administration/gererLesTypesDeDoc.do" />
<forward name="gererLesFeuillesDeStyles" contextRelative="true"
--- 33,129 ----
<global-forwards>
<forward name="home" contextRelative="true" path="/home.do" />
! <forward name="authentification" contextRelative="true"
! path="/authentification/login.do" />
! <forward name="deconnexion" contextRelative="true"
! path="/authentification/logoff.do" />
! <forward name="groupes" contextRelative="true"
! path="/groupes/groupesIndex.do" />
! <forward name="gererColl" contextRelative="true"
! path="/collections/gestionCollectionsPage.do" />
! <forward name="creerColl" contextRelative="true"
! path="/collections/creerCollection.do" />
! <forward name="detruireColl" contextRelative="true"
! path="/collections/detruireCollection.do" />
! <forward name="renommerColl" contextRelative="true"
! path="/collections/renommerCollection.do" />
! <forward name="modifierColl" contextRelative="true"
! path="/collections/modifierCollection.do" />
! <forward name="creerCollPerso" contextRelative="true"
! path="/collections/creerCollectionPerso.do" />
! <forward name="detruireCollPerso" contextRelative="true"
! path="/collections/detruireCollectionPerso.do" />
! <forward name="renommerCollPerso" contextRelative="true"
! path="/collections/renommerCollectionPerso.do" />
! <forward name="modifierCollPerso" contextRelative="true"
! path="/collections/modifierCollectionPerso.do" />
! <forward name="creerGroupe" contextRelative="true"
! path="/groupes/createGroupe.do" />
! <forward name="modifierMembresGroupe" contextRelative="true"
! path="/groupes/modifMembresGroupe.do" />
! <forward name="soumettre" path="/soumission/soumettreDoc.do"
! contextRelative="true" />
! <forward name="valider" path="/validation/choisirDocument.do"
! contextRelative="true" />
! <forward name="visualiser" contextRelative="true"
! path="/soumission/validationContenu.do" />
! <forward name="prefAction" contextRelative="true"
! path="/preferences/prefAction.do" />
! <forward name="prefActionSupervisor" contextRelative="true"
! path="/preferences/prefActionSupervisor.do" />
! <forward name="prefActionDocumentalist" contextRelative="true"
! path="/preferences/prefActionDocumentalist.do" />
! <forward name="modifierMsgAccueilPage" contextRelative="true"
! path="/profil/modifMsgAccueilPage.do" />
! <forward name="updateUserSubmit" contextRelative="true"
! path="/users/updateUserSubmit.do" />
! <forward name="updateDocumentalistSubmit" contextRelative="true"
! path="/users/updateDocumentalistSubmit.do" />
! <forward name="updateSupervisorSubmit" contextRelative="true"
! path="/users/updateSupervisorSubmit.do" />
! <forward name="accueilUserSubmit" contextRelative="true"
! path="/profil/accueilUserSubmit.do" />
! <forward name="myGroupesPage" contextRelative="true"
! path="/profil/myGroupesPage.do" />
! <forward name="mesPreferencesPage" contextRelative="true"
! path="/profil/mesPreferencesPage.do" />
! <forward name="mesDocumentsPage" contextRelative="true"
! path="/profil/mesDocumentsPage.do" />
! <forward name="mesCollectionsPage" contextRelative="true"
! path="/profil/mesCollectionsPage.do" />
! <forward name="accueilUserPage" contextRelative="true"
! path="/profil/accueilUserPage.do" />
! <forward name="prefpage" contextRelative="true"
! path="/preferences/prefpage.do" />
! <forward name="prefpageSupervisor" contextRelative="true"
! path="/preferences/prefpageSupervisor.do" />
! <forward name="prefpageDocumentalist" contextRelative="true"
! path="/preferences/prefpageDocumentalist.do" />
! <forward name="updateUserPage" contextRelative="true"
! path="/users/updateUserPage.do" />
! <forward name="updateDocumentalistPage" contextRelative="true"
! path="/users/updateDocumentalistPage.do" />
! <forward name="updateSupervisorPage" contextRelative="true"
! path="/users/updateSupervisorPage.do" />
! <forward name="rechercher" contextRelative="true"
! path="/recherche/rechercheSimple.do" />
! <forward name="mySubmissionsCollNat" contextRelative="true"
! path="/soumission/soumettreDocCollNat.do" />
! <forward name="naviguer" contextRelative="true"
! path="/collections/navigationPage.do" />
! <forward name="stats" path="/statistique/choixStatsPage.do"
! contextRelative="true" />
! <forward name="telechargerDocument" contextRelative="true"
! path="/visualisation/telechargerDocument.do" />
! <forward name="telechargerDocumentSource" contextRelative="true"
! path="/visualisation/telechargerDocumentSource.do" />
! <forward name="visualiserNotice" contextRelative="true"
! path="/visualisation/visualisationNotice.do" />
! <forward name="visualiserDocument" contextRelative="true"
! path="/visualisation/visualisationDocument.do" />
! <forward name="visualiserGroupe"
! path="/groupes/visualiserGroupe.do" />
! <forward name="changerProfil" contextRelative="true"
! path="/authentification/changerProfilPage.do" />
! <forward name="gererLesTypesDeDoc" contextRelative="true"
path="/administration/gererLesTypesDeDoc.do" />
<forward name="gererLesFeuillesDeStyles" contextRelative="true"
***************
*** 73,117 ****
</global-forwards>
-
<!-- Mappages d'action -->
<action-mappings>
! <action path="/groupesIndex" type="org.apache.struts.actions.ForwardAction" parameter="groupes.default" />
! <action path="/createGroupe" type="org.apache.struts.actions.ForwardAction" parameter="groupes.creerGroupe" />
! <action path="/creerGroupeSubmit" scope="request" type="fr.emn.castor.struts.actions.groupes.CreerGroupeAction" input="groupes.creerGroupe" validate="true" name="creerGroupeForm">
! <forward name="mesGroupesPage" path="/profil/myGroupesPage.do" contextRelative="true" />
! <forward name="gestionGroupePage" path="/groupes/groupesIndex.do" contextRelative="true" />
</action>
! <action path="/modifierMembresGroupe" type="org.apache.struts.actions.ForwardAction" parameter="groupes.modifierMembresGroupe" />
! <action path="/modifMembresGroupe" scope="request" type="fr.emn.castor.struts.actions.groupes.ModifierMembresGroupeAction" input="groupes.modifierMembresGroupe" name="modifierMembresGroupeForm" validate="false">
! <forward name="mesGroupesPage" path="/profil/myGroupesPage.do" contextRelative="true" />
! <forward name="gestionGroupePage" path="/groupes/groupesIndex.do" contextRelative="true" />
</action>
! <action path="/supprimerGroupe" type="fr.emn.castor.struts.actions.groupes.SupprimerGroupeAction">
! <forward name="next" path="groupes.deleteGroupe" contextRelative="true" />
</action>
! <action path="/modifierDonneesGroupe" type="org.apache.struts.actions.ForwardAction" parameter="groupes.modifierDonneesGroupe" />
! <action path="/modifDonneesGroupe" scope="request" type="fr.emn.castor.struts.actions.groupes.ModifierDonneesGroupeAction" input="groupes.modifierDonneesGroupe" name="modifierDonneesGroupeForm">
! <forward name="mesGroupesPage" path="/profil/myGroupesPage.do" contextRelative="true" />
! <forward name="gestionGroupePage" path="/groupes/groupesIndex.do" contextRelative="true" />
</action>
! <action path="/gestionMesGroupes" name="gestionGroupesForm" scope="request" type="fr.emn.castor.struts.actions.groupes.GestionGroupesAction" input="groupes.default">
! <forward name="mesGroupesPage" path="/profil/myGroupesPage.do" contextRelative="true" />
! <forward name="gestionGroupePage" path="/groupes/groupesIndex.do" contextRelative="true" />
</action>
! <action path="/visualiserGroupe" type="org.apache.struts.actions.ForwardAction" parameter="groupes.voirGroupe"></action>
! <action path="/voirGroupe" scope="request" type="fr.emn.castor.struts.actions.groupes.VoirGroupeAction" input="groupes.voirGroupe" name="voirGroupeForm"></action>
! <action path="/validerSuppGroupe" type="fr.emn.castor.struts.actions.groupes.ValiderSuppressionGroupeAction" name="validerSuppGroupeForm" input="groupes.deleteGroupe">
! <forward name="mesGroupesPage" path="/profil/myGroupesPage.do" contextRelative="true" />
! <forward name="gestionGroupePage" path="/groupes/groupesIndex.do" contextRelative="true" />
</action>
</action-mappings>
<!-- Ressources des Messages -->
! <message-resources parameter="fr.emn.castor.struts.resources.groupes.groupes" />
!
<!-- Plugin -->
<plug-in className="org.apache.struts.tiles.TilesPlugin">
! <set-property property="definitions-config" value="/WEB-INF/tiles-default.xml,/WEB-INF/tiles-groupes.xml" />
<set-property property="moduleAware" value="true" />
</plug-in>
--- 131,214 ----
</global-forwards>
<!-- Mappages d'action -->
<action-mappings>
! <action path="/groupesIndex"
! type="org.apache.struts.actions.ForwardAction"
! parameter="groupes.default" />
! <action path="/createGroupe"
! type="org.apache.struts.actions.ForwardAction"
! parameter="groupes.creerGroupe" />
! <action path="/creerGroupeSubmit" scope="request"
! type="fr.emn.castor.struts.actions.groupes.CreerGroupeAction"
! input="groupes.creerGroupe" validate="true" name="creerGroupeForm">
! <forward name="mesGroupesPage"
! path="/profil/myGroupesPage.do" contextRelative="true" />
! <forward name="gestionGroupePage"
! path="/groupes/groupesIndex.do" contextRelative="true" />
</action>
! <action path="/modifierMembresGroupe"
! type="org.apache.struts.actions.ForwardAction"
! parameter="groupes.modifierMembresGroupe" />
! <action path="/modifMembresGroupe" scope="request"
! type="fr.emn.castor.struts.actions.groupes.ModifierMembresGroupeAction"
! input="groupes.modifierMembresGroupe"
! name="modifierMembresGroupeForm" validate="false">
! <forward name="mesGroupesPage"
! path="/profil/myGroupesPage.do" contextRelative="true" />
! <forward name="gestionGroupePage"
! path="/groupes/groupesIndex.do" contextRelative="true" />
</action>
! <action path="/supprimerGroupe"
! type="fr.emn.castor.struts.actions.groupes.SupprimerGroupeAction">
! <forward name="next" path="groupes.deleteGroupe"
! contextRelative="true" />
</action>
! <action path="/modifierDonneesGroupe"
! type="org.apache.struts.actions.ForwardAction"
! parameter="groupes.modifierDonneesGroupe" />
! <action path="/modifDonneesGroupe" scope="request"
! type="fr.emn.castor.struts.actions.groupes.ModifierDonneesGroupeAction"
! input="groupes.modifierDonneesGroupe"
! name="modifierDonneesGroupeForm">
! <forward name="mesGroupesPage"
! path="/profil/myGroupesPage.do" contextRelative="true" />
! <forward name="gestionGroupePage"
! path="/groupes/groupesIndex.do" contextRelative="true" />
</action>
! <action path="/gestionMesGroupes" name="gestionGroupesForm"
! scope="request"
! type="fr.emn.castor.struts.actions.groupes.GestionGroupesAction"
! input="groupes.default">
! <forward name="mesGroupesPage"
! path="/profil/myGroupesPage.do" contextRelative="true" />
! <forward name="gestionGroupePage"
! path="/groupes/groupesIndex.do" contextRelative="true" />
</action>
! <action path="/visualiserGroupe"
! type="org.apache.struts.actions.ForwardAction"
! parameter="groupes.voirGroupe">
! </action>
! <action path="/voirGroupe" scope="request"
! type="fr.emn.castor.struts.actions.groupes.VoirGroupeAction"
! input="groupes.voirGroupe" name="voirGroupeForm">
! </action>
! <action path="/validerSuppGroupe"
! type="fr.emn.castor.struts.actions.groupes.ValiderSuppressionGroupeAction"
! name="validerSuppGroupeForm" input="groupes.deleteGroupe">
! <forward name="mesGroupesPage"
! path="/profil/myGroupesPage.do" contextRelative="true" />
! <forward name="gestionGroupePage"
! path="/groupes/groupesIndex.do" contextRelative="true" />
</action>
</action-mappings>
<!-- Ressources des Messages -->
! <message-resources
! parameter="fr.emn.castor.struts.resources.groupes.groupes" />
<!-- Plugin -->
<plug-in className="org.apache.struts.tiles.TilesPlugin">
! <set-property property="definitions-config"
! value="/WEB-INF/tiles-default.xml,/WEB-INF/tiles-groupes.xml" />
<set-property property="moduleAware" value="true" />
</plug-in>
Index: struts-collections.xml
===================================================================
RCS file: /cvsroot/castore/castore-struts-webapp/src/webapp/WEB-INF/struts-collections.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** struts-collections.xml 23 Jan 2006 10:31:08 -0000 1.4
--- struts-collections.xml 11 May 2006 09:36:17 -0000 1.5
***************
*** 5,9 ****
<struts-config>
! <!-- Sources de données -->
<data-sources></data-sources>
--- 5,9 ----
<struts-config>
! <!-- Sources de donnees -->
<data-sources></data-sources>
***************
*** 54,58 ****
<global-exceptions></global-exceptions>
! <!-- Références aval globales -->
<global-forwards>
<forward name="home" contextRelative="true" path="/home.do" />
--- 54,58 ----
<global-exceptions></global-exceptions>
! <!-- References aval globales -->
<global-forwards>
<forward name="home" contextRelative="true" path="/home.do" />
***************
*** 97,102 ****
<forward name="prefActionDocumentalist" contextRelative="true"
path="/preferences/prefActionDocumentalist.do" />
! <forward name="modifierMsgAccueilPage" contextRelative="true"
! path="/profil/modifMsgAccueilPage.do" />
<forward name="updateUserSubmit" contextRelative="true"
path="/users/updateUserSubmit.do" />
--- 97,102 ----
<forward name="prefActionDocumentalist" contextRelative="true"
path="/preferences/prefActionDocumentalist.do" />
! <forward name="modifierMsgAccueilPage" contextRelative="true"
! path="/profil/modifMsgAccueilPage.do" />
<forward name="updateUserSubmit" contextRelative="true"
path="/users/updateUserSubmit.do" />
***************
*** 157,212 ****
<!-- /renommerCollection => dans le menu, on choisit de creer une collection (choix dans un menu)
/renameColl => action dans la jsp de renommer la collection (= renommage effectif)-->
<action-mappings>
<action path="/gererCollections"
type="org.apache.struts.actions.ForwardAction"
parameter="collections.default" />
-
<action path="/creerCollection"
type="org.apache.struts.actions.ForwardAction"
parameter="collections.creerCollection">
-
</action>
-
<action path="/modifierCollection"
type="org.apache.struts.actions.ForwardAction"
parameter="collections.modifierCollection" />
-
<action path="/renommerCollection"
type="org.apache.struts.actions.ForwardAction"
parameter="collections.renommerCollection" />
-
<action path="/detruireCollection"
type="org.apache.struts.actions.ForwardAction"
parameter="collections.detruireCollection" />
-
<action path="/creerCollectionPersoPrivee"
type="org.apache.struts.actions.ForwardAction"
parameter="collections.creerCollectionPersoPrivee" />
-
<action path="/creerCollectionPersoPublique"
type="org.apache.struts.actions.ForwardAction"
parameter="collections.creerCollectionPersoPublique" />
-
<action path="/creerCollectionNative"
type="org.apache.struts.actions.ForwardAction"
parameter="collections.creerCollectionNative" />
-
<action path="/modifierCollectionPerso"
type="org.apache.struts.actions.ForwardAction"
parameter="collections.modifierCollectionPerso" />
-
<action path="/renommerCollectionPerso"
type="org.apache.struts.actions.ForwardAction"
parameter="collections.renommerCollectionPerso" />
-
<action path="/detruireCollectionPerso"
type="or