Skip to end of metadata
Go to start of metadata

Le principe d'intégration adopté à Rennes 1

Utilisation d'un dépôt local subversion pour l'intégration

Principes

  • Trunk : version en cours d'intégration
  • Tag : Les versions exploitées* Version : <version-lot-ori-oai>.[<beta>|<numéro sequentiel>
    • exemples :
      • 1.4.beta : pré-version de qualification de la 1.4 de ORI-OAI
      • 1.4.1  : release locale 1 de la version 1.4 de ORI-OAI

Roles

  • L'intégrateur modifie le trunk teste et crée des versions « beta » sur le serveur de qualification, livre des versions (release) à l'exploitant
  • L'exploitant installe sur les serveurs de production une version taggée

L'installation de la configuration

.

Cas d'utilisation :

  • Installation et configuration d'une version de ORI-OAI:
    • checkout des modules ORI-OAI
    • copie du repertoire custom local (init-custom.sh)
    • commit du repertoire custom local sur le repository svn local
  • Modification de ORI-OAI:
    • modfier les modules ORI-OAI
    • copier les fichiers modifiés (par svn export des modifs) sur custom local
    • commit du repertoire custom local sur le repository svn local
  • Upgrade de version de ORI-OAI
    • switch de version (svn-switch-1.4.sh)
    • résoudre les conflits « à la main »
    • copier les fichiers modifiés (par svn export des modifs) sur custom local (update-custom.sh)
    • commit du repertoire custom local sur le repository svn local

Environnement d'intégration

Poste de travail

  • Ubuntu 8.04 - Hardy Heron
  • jdk 1.6 + tomcat 5 + eclipse + mysql + openDS

Outils

  • eclipse 3.3.2 + plugin resourceBundle
  • ldapbrowser
  • xmlCopyEditor  : éditeur xml
  • Meld  : visualisateur de différences
  • luke : éditeur lucene
  • Inspector Orbeon : inspecteur d'instances xforms
  • plugins firefox : firebug, webDeveloper

Environnement de qualification et d'exploitation

  • Les serveurs de qualification sont identiques aux serveurs d'exploitation

       

Les fichiers de configurations modifiés (ori-oai-1.4)

Le projet ori-oai-local-install  se trouve sur le svn d'intégration  :

https://subversion.univ-rennes1.fr/repos/57SI-xp-ori-oai-ur1/trunk

 

         Modifications                                                  


éditeur | ajout de métadonnées techniques dans le formulaire LOM auteur

  custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/i18n/mdeditor_categories_author_lomfr.xml
ajout de la "classification" Rameau
    custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/xforms/lom-full/case-classification.xml
    custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/xml-vocab-local/common_lom_clas_source.xml
LOM: formulaire auteur
   custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/xml-blank/lom-author-light-blank.xml
   custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/xforms/lom-author-light/main-form.xhtml
   custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/xforms/lom-author-light/content-xforms.xml
   custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/xforms/lom-author-light/entity.xml
LOM : formulaire validateur technique
    custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/xml-blank/lom-technical-blank.xml
    custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/xforms/lom-technical/main-form.xhtm
LOM : formulaire validateur d'entité
    custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/xforms/lom-entity/main-form.xhtml
     custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/xml-blank/lom-entity-blank.xml
LOM: formulaire validateur juridique
    custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/xml-blank/lom-rights-blank.xml
    custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/xforms/lom-rights/main-form.xhtml
LOM: formulaire complet
     custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/xforms/lom-full/main-form.xhtml
    custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/xforms/lom-full/case-classification.xml
LOM-FR : formulaires auteur
   custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/xforms/lomfr-author-light/main-form.xhtml
   custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/xforms/lomfr-author-light/main-model.xml
   custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/xforms/lomfr-author-light/content-xforms.xml
LOM-FR : formulaire complet
    custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/xforms/lomfr-full/main-form.xhtml
    custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/xforms/lomfr-full/case-classification.xml
    custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/xforms/lomfr-full/case-lifecycle.xml
SUP-LOM-FR : formulaire auteur
  custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/xforms/lomfr-sup-author-light/main-form.xhtml
SUPLOM-FR : formulaire complet
    custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/xforms/lomfr-sup-full/main-form.xhtml

dialogue recherche taxons 100Dewey
   custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/xforms/lom-full/dialog-taxonomy-100Dewey-search.xml
dialogue vcards
  custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/xforms/lom-full/dialog-composante-search.xml
   custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/xforms/lom-full/dialog-vcard-search.xml
   custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/xforms/lom-full/case-lifecycle.xml
prise en compte choix vcard
   custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/xforms/common/entity.xml


configuration
   custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/close.xhtml
   custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/config.xml 
   custom/ori-oai-md-editor-svn/WEB-INF/resources/apps/ori-md-editor/media/styles/collapse.css
|

Workflow

ajout du WF complexe
   custom/ori-oai-workflow-spring-svn/conf/properties/spring/osworkflow/workflows/workflow_complex.xml
   custom/ori-oai-workflow-spring-svn/conf/properties/spring/spring-metadata-types.xml
   custom/ori-oai-workflow-spring-svn/conf/properties/spring/spring-categories.xml
   custom/ori-oai-workflow-spring-svn/conf/properties/spring/common/i18n/i18n.xml
   custom/ori-oai-workflow-spring-svn/conf/properties/spring/common/i18n/bundles/messages-complex_fr.properties
   custom/ori-oai-workflow-spring-svn/conf/properties/spring/common/i18n/bundles/messages_fr.properties
modification WF simple : ajout état "correction"
   custom/ori-oai-workflow-spring-svn/conf/properties/spring/osworkflow/workflows/workflow_easy.xml
   custom/ori-oai-workflow-spring-svn/conf/properties/spring/common/i18n/bundles/messages-easy_fr.properties
   custom/ori-oai-workflow-spring-svn/conf/properties/spring/common/i18n/bundles/messages-easy.properties
modification WF DC : ajout état "correction"
   custom/ori-oai-workflow-spring-svn/conf/properties/spring/osworkflow/workflows/workflow_very_easy.xml
les groupes ldap ORI-OAI -  gestion des droits
   custom/ori-oai-workflow-spring-svn/WebContent/jsp/_navigation.jsp
   custom/ori-oai-workflow-spring-svn/conf/properties/spring/acegi/acegi-permissions.xml
   custom/ori-oai-workflow-spring-svn/conf/properties/spring/acegi/acegi-authentication-additional-groups.xml
    custom/ori-oai-workflow-spring-svn/conf/properties/spring/acegi/acegi-acls-root.xml
prototype LOM : ajout des métadonnées techniques
    custom/ori-oai-workflow-spring-svn/conf/properties/xml/lom-prototype.xml
skin  Rennes 1
  custom/ori-oai-workflow-spring-svn/WebContent/media/ori-portlet.css
  custom/ori-oai-workflow-spring-svn/WebContent/media/logo-ur1.png
configuration
   custom/ori-oai-workflow-spring-svn/conf/properties/spring/common/smtp/smtp.xml

Vocabulary

déclaration des vocabulaires locaux
    custom/ori-oai-vocabulary-svn/conf/properties/domain/domain.xml
    custom/ori-oai-vocabulary-svn/conf/properties/domain/oriVocabulary.xml
ajout de vocabulaire dynamique
    custom/ori-oai-vocabulary-svn/conf/properties/domain/rennes1_sqlVocabulary.xml
   custom/ori-oai-vocabulary-svn/conf/properties/domain/rennes1_custom.xml
ajout de Rameau
   custom/ori-oai-vocabulary-svn/conf/properties/ori_vocabularies/override/common_lom_clas_source.xml
ajout des composantes Rennes1
   custom/ori-oai-vocabulary-svn/conf/properties/ori_vocabularies/override/composantes_vcard.xml
configuration
   custom/ori-oai-vocabulary-svn/conf/properties/main-config.properties

Menu de recherche
  custom/ori-oai-search-svn/properties/config.xml
  custom/ori-oai-search-svn/properties/config-ur1.xml
  custom/ori-oai-search-svn/properties/config.UR1.xml
  custom/ori-oai-search-svn/properties/config-scd.xml
champs de recherche avancée
  custom/ori-oai-search-svn/properties/advanced/ur1-scd-dc_advanced.xml
  custom/ori-oai-search-svn/properties/advanced/ur1-scd-lom_advanced.xml
  custom/ori-oai-search-svn/properties/advanced/ur1-scd-multi_advanced.xml
  custom/ori-oai-search-svn/properties/advanced/all_advanced.xml
thème Université de Rennes1
   custom/ori-oai-search-svn/properties/themes/ur1/media/logo-ur1.jpg
   custom/ori-oai-search-svn/properties/themes/ur1/WEB-INF/xsl/lom-ur1-scd.xsl
  custom/ori-oai-search-svn/properties/themes/ur1/WEB-INF/xsl/lom1.xsl
  custom/ori-oai-search-svn/properties/themes/ur1/WEB-INF/stylesheets/notice/notice.jsp
  custom/ori-oai-search-svn/properties/themes/ur1/WEB-INF/stylesheets/results/generic-results.jsp
  custom/ori-oai-search-svn/properties/themes/ur1/WEB-INF/stylesheets/results/documents-results-ur1-scd.jsp
  custom/ori-oai-search-svn/properties/themes/ur1/WEB-INF/stylesheets/advanced/advanced-result.jsp
  custom/ori-oai-search-svn/properties/themes/ur1/WEB-INF/stylesheets/index/index_fr.jsp
  custom/ori-oai-search-svn/properties/themes/ur1/WEB-INF/stylesheets/page-head-menu.jsp
   custom/ori-oai-search-svn/properties/themes/ur1/css/ori-oai-search-portlet.css
   custom/ori-oai-search-svn/properties/themes/ur1/css/ori-oai-search.css
Messages modifiés
  custom/ori-oai-search-svn/properties/messages/forms_en.properties
  custom/ori-oai-search-svn/properties/messages/results_fr.properties
  custom/ori-oai-search-svn/properties/messages/xsl_en.properties
  custom/ori-oai-search-svn/properties/messages/menus_en.properties
  custom/ori-oai-search-svn/properties/messages/messages_en.properties
  custom/ori-oai-search-svn/properties/messages/forms_fr.properties
  custom/ori-oai-search-svn/properties/messages/xsl_fr.properties
  custom/ori-oai-search-svn/properties/messages/errors_en.properties
  custom/ori-oai-search-svn/properties/messages/menus_fr.properties
  custom/ori-oai-search-svn/properties/messages/messages_fr.properties
  custom/ori-oai-search-svn/properties/messages/errors_fr.properties
  custom/ori-oai-search-svn/properties/messages/results_en.properties
feuilles de transformation pour édition
  custom/ori-oai-search-svn/webapp/WEB-INF/xsl/lom-ur1-scd.xsl
  custom/ori-oai-search-svn/webapp/WEB-INF/xsl/lom1.xs
modifiation des pages de résultat
  custom/ori-oai-search-svn/webapp/WEB-INF/stylesheets/notice/notice.jsp
  custom/ori-oai-search-svn/webapp/WEB-INF/stylesheets/results/generic-results.jsp
  custom/ori-oai-search-svn/webapp/WEB-INF/stylesheets/results/documents-results-ur1-scd.jsp
  custom/ori-oai-search-svn/webapp/WEB-INF/stylesheets/advanced/advanced-result.jsp
  custom/ori-oai-search-svn/webapp/WEB-INF/stylesheets/index/index_fr.jsp
  

Indexing

configuration
     custom/ori-oai-indexing-svn/properties/configIndexing.xml

Quick-install

configuration générale Rennes 1
    custom/ori-oai-commons-quick-install-svn/commons-parameters.properties

 

 

 

init-custom.sh
svn-co-1.1.sh
setenv.sh
svn-switch-1.4.sh
update-custom.sh

  • No labels