| /trunk/CoelTest-web |
|---|
| File deleted |
| /trunk/CoelTest-hosted |
|---|
| File deleted |
| /trunk/doc/bdd/coel_vocabulaire.ini |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/doc/bdd/coel_vocabulaire.ini:r1209-1382 |
| Merged /branches/v1.1-aramon/doc/bdd/coel_vocabulaire.ini:r1383-1416 |
| /trunk/doc/bdd |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/doc/bdd:r1209-1382 |
| Merged /branches/v1.1-aramon/doc/bdd:r1383-1416 |
| /trunk/Coel-debug |
|---|
| 1,13 → 1,16 |
| #!/bin/sh |
| APPDIR=`dirname $0`; |
| APPLI_NOM="Coel" |
| APPDIR_ABSOLU=`pwd`; |
| NOM_DOSSIER_COURANT=`basename $APPDIR_ABSOLU` |
| APPLI_DOMAINE="org.tela_botanica.$APPLI_NOM" |
| APPLI_LIEN="$APPLI_DOMAINE" |
| APPLI_LIEN="org.tela_botanica.$NOM_DOSSIER_COURANT" |
| # Création d'un lien symbolique si nécessaire. |
| if [ ! -h $APPDIR/../$APPLI_LIEN ]; then |
| cd $APPDIR/..; |
| ln -s $APPDIR/war $APPLI_LIEN; |
| ln -s $APPDIR_ABSOLU/war $APPLI_LIEN; |
| fi; |
| # Lancement du mode débug |
| java -Xmx2048M -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,address=3408,suspend=y -cp "$APPDIR/src:$APPDIR/bin:/opt/gwt-2.0.3/gwt-user.jar:/opt/gwt-2.0.3/gwt-dev.jar:/opt/gxt-2.1.1/gxt.jar" com.google.gwt.dev.DevMode -noserver -port 80 -startupUrl $APPLI_LIEN/$APPLI_NOM.html $APPLI_DOMAINE; |
| /trunk/mise_en_ligne.sh |
|---|
| 9,12 → 9,13 |
| ######################################################################################################################## |
| # Constante |
| APPDIR=`dirname $0`; |
| APPDIR_ABSOLU=`pwd`; |
| NBREPARAM=$# |
| APPLI_NOM="Coel" |
| FICHIER_COMPILATION="$APPLI_NOM-compile" |
| DOSSIER_COMPILATION="$APPDIR/war" |
| DOSSIER_DESTINATION="/www/eflore/coel" |
| DOSSIER_JREST="$APPDIR/../jrest" |
| DOSSIER_JREST="$APPDIR/../jrest_$NOM_DOSSIER_COURANT" |
| DOSSIER_JREST_DESTINATION="/www/eflore/coel/jrest" |
| APPLI_SERVICE_BASE_URL="http://www.tela-botanica.org/eflore/coel/jrest/" |
| 59,6 → 60,7 |
| echo "KO : fichier de compilation $FICHIER_COMPILATION inexistant!"; |
| fi; |
| # Transfert sur le serveur par FTP |
| if [ $NBREPARAM -eq 0 ]; then |
| echo "Pas de transfert sur le serveur. Utiliser --help pour voir les options de transfert." |
| else |
| /trunk/Coel-shell |
|---|
| 1,12 → 1,16 |
| #!/bin/sh |
| APPDIR=`dirname $0`; |
| APPLI_NOM="Coel" |
| APPDIR_ABSOLU=`pwd`; |
| NOM_DOSSIER_COURANT=`basename $APPDIR_ABSOLU` |
| APPLI_DOMAINE="org.tela_botanica.$APPLI_NOM" |
| APPLI_LIEN="$APPLI_DOMAINE" |
| APPLI_LIEN="org.tela_botanica.$NOM_DOSSIER_COURANT" |
| # Création d'un lien symbolique si nécessaire. |
| if [ ! -h $APPDIR/../$APPLI_LIEN ]; then |
| cd $APPDIR/..; |
| ln -s $APPDIR/war $APPLI_LIEN; |
| ln -s $APPDIR_ABSOLU/war $APPLI_LIEN; |
| fi; |
| # Lancement du mode hosted |
| java -Xmx1024M -cp "$APPDIR/src:$APPDIR/bin:/opt/gwt-2.0.3/gwt-user.jar:/opt/gwt-2.0.3/gwt-dev.jar:/opt/gxt-2.1.1/gxt.jar" com.google.gwt.dev.DevMode -whitelist http://www.tela-botanica.org -noserver -port 80 -startupUrl $APPLI_LIEN/$APPLI_NOM.html $APPLI_DOMAINE; |
| /trunk/src/org/tela_botanica/Coel.gwt.xml |
|---|
| Property changes: |
| Deleted: svn:mergeinfo |
| Reverse-merged /branches/v1.0-syrah/src/org/tela_botanica/Coel.gwt.xml:r1136-1208 |
| Reverse-merged /branches/v1.1-aramon/src/org/tela_botanica/Coel.gwt.xml:r1383-1387 |
| /trunk/src/org/tela_botanica/client/Mediateur.java |
|---|
| 153,8 → 153,11 |
| Registry.register(RegistreId.APPLI_DEVELOPPEURS, apropos.getDeveloppeurs()); |
| Registry.register(RegistreId.APPLI_TRADUCTEURS, apropos.getTraducteurs()); |
| Registry.register(RegistreId.APPLI_TESTEURS, apropos.getTesteurs()); |
| Registry.register(RegistreId.APPLI_LICENCE, apropos.getLicence()); |
| Registry.register(RegistreId.APPLI_REVISION, apropos.getRevisionGlobale()); |
| Registry.register(RegistreId.JREST_REVISION, apropos.getRevisionGlobaleJrest()); |
| Registry.register(RegistreId.APPLI_COMPILATION_JAVA_VERSION, apropos.getVersionJavaCompilation()); |
| Registry.register(RegistreId.APPLI_COMPILATION_DATE_HEURE, apropos.getDateHeureCompilation()); |
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/Mediateur.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/Mediateur.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/configuration/APropos.java |
|---|
| 17,10 → 17,12 |
| private String appliVersionCode; |
| private String developpeurs; |
| private String traducteurs; |
| private String testeurs; |
| private String licence; |
| private String dateHeureCompilation; |
| private String revisionGlobale; |
| private String revisionGlobaleJrest; |
| private String versionJavaCompilation; |
| public APropos() { |
| 31,12 → 33,13 |
| appliVersionNom = apropos.get("appliVersionNom"); |
| appliVersionCode = apropos.get("appliVersionCode"); |
| developpeurs = apropos.get("developpeurs"); |
| testeurs = apropos.get("testeurs"); |
| traducteurs = apropos.get("traducteurs"); |
| licence = apropos.get("licence"); |
| dateHeureCompilation = apropos.get("dateHeureCompilation"); |
| revisionGlobale = apropos.get("revisionGlobale"); |
| revisionGlobaleJrest = apropos.get("revisionGlobaleJrest"); |
| versionJavaCompilation = apropos.get("versionJavaCompilation"); |
| } |
| public String getAppliNom() { |
| 75,8 → 78,16 |
| return revisionGlobale; |
| } |
| public String getRevisionGlobaleJrest() { |
| return revisionGlobaleJrest; |
| } |
| public String getVersionJavaCompilation() { |
| return versionJavaCompilation; |
| } |
| public String getTesteurs() { |
| return testeurs; |
| } |
| } |
| /trunk/src/org/tela_botanica/client/configuration |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/configuration:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/configuration:r1383-1416 |
| /trunk/src/org/tela_botanica/client/ComposantClass.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/ComposantClass.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/ComposantClass.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/util |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/util:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/util:r1383-1416 |
| /trunk/src/org/tela_botanica/client/http |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/http:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/http:r1383-1416 |
| /trunk/src/org/tela_botanica/client/i18n/Constantes.properties |
|---|
| 31,7 → 31,7 |
| <p>Tela Botanica a choisi de publier par défaut son contenu sous licence libre Creative Commons (by-sa) afin d'en faciliter la divulgation.</p>\ |
| <p>Selon cette licence toutes personne sera libre :</p>\ |
| <ul>\ |
| <li>de reproduire, distribuer et communiquer les photos au public</li>\ |
| <li>de reproduire, distribuer et communiquer les données au public</li>\ |
| <li>de les modifier</li>\ |
| </ul>\ |
| <p>Selon les conditions suivantes :</p>\ |
| 124,6 → 124,7 |
| aproposVersion = Numéro de version |
| aproposVersionNom = Nom de la version |
| aproposRevision = Révision |
| aproposRevisionJrest = Révision de Jrest |
| aproposLicence = Licence |
| aproposTitreCompilation = Compilation |
| aproposCompilationDate = Date |
| 136,6 → 137,8 |
| aproposTitreContributeur = Contributeurs |
| aproposDeveloppeur = Développeurs |
| aproposTraducteur = Traducteurs |
| aproposTesteur = Testeurs |
| aproposTitreLicence = Conditions d'utilisation |
| # +--------------------------------------------------------------------------------------------------------------------+ |
| # Accueil |
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/i18n/Constantes.properties:r1383-1416 |
| Merged /trunk/src/org/tela_botanica/client/i18n/Constantes.properties:r1209-1382 |
| /trunk/src/org/tela_botanica/client/i18n/ErrorMessages.properties |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/i18n/ErrorMessages.properties:r1383-1416 |
| Merged /trunk/src/org/tela_botanica/client/i18n/ErrorMessages.properties:r1209-1382 |
| /trunk/src/org/tela_botanica/client/i18n/Constantes.java |
|---|
| 114,6 → 114,7 |
| String aproposVersion(); |
| String aproposVersionNom(); |
| String aproposRevision(); |
| String aproposRevisionJrest(); |
| String aproposLicence(); |
| String aproposTitreCompilation(); |
| String aproposCompilationDate(); |
| 126,6 → 127,8 |
| String aproposTitreContributeur(); |
| String aproposDeveloppeur(); |
| String aproposTraducteur(); |
| String aproposTesteur(); |
| String aproposTitreLicence(); |
| // +---------------------------------------------------------------------------------------------------------------+ |
| // Accueil |
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/i18n/Constantes.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/i18n/Constantes.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/i18n/ErrorMessages.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/i18n/ErrorMessages.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/i18n/ErrorMessages.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/i18n |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/i18n:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/i18n:r1383-1416 |
| /trunk/src/org/tela_botanica/client/RegistreId.java |
|---|
| 5,7 → 5,8 |
| public static final String APPLI_CODE = "Code de l'Application"; |
| public static final String APPLI_VERSION = "Version"; |
| public static final String APPLI_VERSION_NOM = "Version nom"; |
| public static final String APPLI_REVISION = "Revision"; |
| public static final String APPLI_REVISION = "Révision"; |
| public static final String JREST_REVISION = "Révision du Jrest"; |
| public static final String CONFIG = "Configuration"; |
| public static final String MEDIATEUR = "Médiateur"; |
| public static final String MODELE = "Modèle"; |
| 13,8 → 14,8 |
| public static final String PANNEAU_OUEST = "Panneau ouest"; |
| public static final String PANNEAU_CENTRE = "Panneau central"; |
| public static final String PANNEAU_INSTITUTION_DETAIL = "Panneau Institution détail"; |
| public static final String PANNEAU_PUBLICATION_DETAIL = "panneau Publication détail"; |
| public static final String PANNEAU_PERSONNE_DETAIL = "panneau Personne détail"; |
| public static final String PANNEAU_PUBLICATION_DETAIL = "Panneau Publication détail"; |
| public static final String PANNEAU_PERSONNE_DETAIL = "Panneau Personne détail"; |
| public static final String UTILISATEUR_COURANT = "Utilisateur courant"; |
| public static final String PROJET_COURANT = "Objet Projet courant"; |
| public static final String POPUP_CHARGEMENT = "Popup chargement"; |
| 24,5 → 25,6 |
| public static final String APPLI_COMPILATION_DATE_HEURE = "Date et heure de la compilation de l'application"; |
| public static final String APPLI_DEVELOPPEURS = "Développeurs de l'application"; |
| public static final String APPLI_TRADUCTEURS = "Traducteurs de l'application"; |
| public static final String APPLI_TESTEURS = "Testeur de l'application"; |
| public static final String APPLI_LICENCE = "Licence du code source de l'application"; |
| } |
| /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormContenu.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormContenu.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/collection/CollectionFormContenu.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/collection/CollectionVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/collection/CollectionVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/collection/CollectionListeVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionListeVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/collection/CollectionListeVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormGeneral.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/collection/CollectionFormGeneral.java:r1383-1416 |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormGeneral.java:r1209-1382 |
| /trunk/src/org/tela_botanica/client/vues/collection/CollectionDetailVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/collection/CollectionDetailVue.java:r1383-1416 |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionDetailVue.java:r1209-1382 |
| /trunk/src/org/tela_botanica/client/vues/collection/CollectionForm.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionForm.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/collection/CollectionForm.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormCommentaire.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormCommentaire.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/collection/CollectionFormCommentaire.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormDescription.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormDescription.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/collection/CollectionFormDescription.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormInventaire.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormInventaire.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/collection/CollectionFormInventaire.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormPersonne.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormPersonne.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/collection/CollectionFormPersonne.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormPublication.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormPublication.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/collection/CollectionFormPublication.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/collection |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/collection:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/FenetreForm.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/FenetreForm.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/FenetreForm.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/FormulaireOnglet.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/FormulaireOnglet.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/FormulaireOnglet.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/NavigationVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/NavigationVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/NavigationVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/structure/StructureVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/structure/StructureVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/structure/StructureVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/structure/StructureListeVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/structure/StructureListeVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/structure/StructureListeVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/structure/StructureDetailVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/structure/StructureDetailVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/structure/StructureDetailVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/structure/StructureForm.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/structure/StructureForm.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/structure/StructureForm.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/structure |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/structure:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/structure:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/DetailVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/DetailVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/DetailVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/projet/ProjetVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/projet/ProjetVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/projet/ProjetVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/projet/ProjetListeVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/projet/ProjetListeVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/projet/ProjetListeVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/projet/ProjetDetailVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/projet/ProjetDetailVue.java:r1383-1416 |
| Merged /trunk/src/org/tela_botanica/client/vues/projet/ProjetDetailVue.java:r1209-1382 |
| /trunk/src/org/tela_botanica/client/vues/projet/ProjetForm.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/projet/ProjetForm.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/projet/ProjetForm.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/projet |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/projet:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/projet:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/commentaire/CommentaireVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/commentaire/CommentaireVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/commentaire/CommentaireVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/commentaire/CommentaireListeVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/commentaire/CommentaireListeVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/commentaire/CommentaireListeVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/commentaire/CommentaireDetailVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/commentaire/CommentaireDetailVue.java:r1383-1416 |
| Merged /trunk/src/org/tela_botanica/client/vues/commentaire/CommentaireDetailVue.java:r1209-1382 |
| /trunk/src/org/tela_botanica/client/vues/commentaire/CommentaireForm.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/commentaire/CommentaireForm.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/commentaire/CommentaireForm.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/commentaire |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/commentaire:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/commentaire:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/FenetreJournal.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/FenetreJournal.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/FenetreJournal.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/MenuVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/MenuVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/MenuVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/BarrePaginationVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/BarrePaginationVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/BarrePaginationVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/accueil |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/accueil:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/accueil:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/publication/PublicationVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/publication/PublicationVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/publication/PublicationVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/publication/PublicationListeVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/publication/PublicationListeVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/publication/PublicationListeVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/publication/PublicationDetailVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/publication/PublicationDetailVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/publication/PublicationDetailVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/publication/PublicationForm.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/publication/PublicationForm.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/publication/PublicationForm.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/publication |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/publication:r1383-1416 |
| Merged /trunk/src/org/tela_botanica/client/vues/publication:r1209-1382 |
| /trunk/src/org/tela_botanica/client/vues/ContenuVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/ContenuVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/ContenuVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/FormulaireBarreValidation.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/FormulaireBarreValidation.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/FormulaireBarreValidation.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/PopupChargement.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/PopupChargement.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/PopupChargement.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/EnteteVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/EnteteVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/EnteteVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/StatutVue.java |
|---|
| 54,6 → 54,10 |
| }); |
| toolBar.add(messageErreur); |
| Status version = new Status(); |
| String infoVersionAppli = Registry.get(RegistreId.APPLI_CODE)+" v"+Registry.get(RegistreId.APPLI_VERSION)+" - "+Registry.get(RegistreId.APPLI_VERSION_NOM); |
| version.setText(infoVersionAppli); |
| toolBar.add(version); |
| add(toolBar); |
| } |
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/StatutVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/StatutVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/FiltreVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/FiltreVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/FiltreVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/Formulaire.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/Formulaire.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/Formulaire.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/personne/PersonneFormPublication.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/personne/PersonneFormPublication.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/personne/PersonneFormPublication.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/personne/PersonneVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/personne/PersonneVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/personne/PersonneVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/personne/PersonneListeVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/personne/PersonneListeVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/personne/PersonneListeVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/personne/PersonneDetailVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/personne/PersonneDetailVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/personne/PersonneDetailVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/personne/PersonneForm.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/personne/PersonneForm.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/personne/PersonneForm.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/interfaces |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/interfaces:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/interfaces:r1383-1416 |
| /trunk/src/org/tela_botanica/client/Modele.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/Modele.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/Modele.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/composants/ChampComboBoxListeValeurs.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampComboBoxListeValeurs.java:r1383-1416 |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampComboBoxListeValeurs.java:r1209-1382 |
| /trunk/src/org/tela_botanica/client/composants/HashMapComposants.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/HashMapComposants.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/HashMapComposants.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/composants/ChampSliderPourcentage.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampSliderPourcentage.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampSliderPourcentage.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/composants/InfoLogger.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/InfoLogger.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/InfoLogger.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/composants/AproposFenetre.java |
|---|
| 27,11 → 27,13 |
| private Params aproposParams = null; |
| private String contributeurTpl = null; |
| private Params contributeurParams = null; |
| private String licenceTpl = null; |
| private Params licenceParams = null; |
| public AproposFenetre() { |
| i18nC = Mediateur.i18nC; |
| setSize(500, 300); |
| setSize(600, 500); |
| setPlain(true); |
| setHeading(i18nC.aproposTitre()); |
| setIcon(Images.ICONES.information()); |
| 42,6 → 44,7 |
| HtmlContainer aproposConteneurDuHtml = formaterSquelette(aproposTpl, aproposParams); |
| HtmlContainer contributeurConteneurDuHtml = formaterSquelette(contributeurTpl, contributeurParams); |
| HtmlContainer licenceConteneurDuHtml = formaterSquelette(licenceTpl, licenceParams); |
| TabPanel aproposOnglets = new TabPanel(); |
| 57,6 → 60,12 |
| contributeurOnglet.setScrollMode(Scroll.AUTO); |
| aproposOnglets.add(contributeurOnglet); |
| TabItem licenceOnglet = new TabItem(i18nC.aproposTitreLicence()); |
| licenceOnglet.add(licenceConteneurDuHtml); |
| licenceOnglet.setBorders(false); |
| licenceOnglet.setScrollMode(Scroll.AUTO); |
| aproposOnglets.add(licenceOnglet); |
| add(aproposOnglets, new FitData(4)); |
| } |
| 76,6 → 85,7 |
| private void initialiserSquelettes() { |
| initialiserSqueletteApropos(); |
| initialiserSqueletteContributeur(); |
| initialiserSqueletteLicence(); |
| } |
| private void initialiserSqueletteApropos() { |
| 87,6 → 97,7 |
| " <span class='{css_label}'>{i18n_version}{label_separateur}</span> {version}<br />"+ |
| " <span class='{css_label}'>{i18n_version_nom}{label_separateur}</span> {version_nom}<br />"+ |
| " <span class='{css_label}'>{i18n_revision}{label_separateur}</span> {revision}<br />"+ |
| " <span class='{css_label}'>{i18n_revision_jrest}{label_separateur}</span> {revision_jrest}<br />"+ |
| " <span class='{css_label}'>{i18n_licence}{label_separateur}</span> {licence}"+ |
| " </p>"+ |
| " <hr />"+ |
| 116,13 → 127,23 |
| " <p>"+ |
| " <span class='{css_label}'>{i18n_developpeur}{label_separateur}</span> {developpeur}<br />"+ |
| " <span class='{css_label}'>{i18n_traducteur}{label_separateur}</span> {traducteur}<br />"+ |
| " <span class='{css_label}'>{i18n_testeur}{label_separateur}</span> {testeur}"+ |
| " </p>"+ |
| "</div>"; |
| } |
| private void initialiserSqueletteLicence() { |
| licenceTpl = |
| "<div class='{css_corps}'>"+ |
| " <h2>{i18n_titre_licence}</h2>"+ |
| " <div>{licence}</div>"+ |
| "</div>"; |
| } |
| private void initialiserParams() { |
| initialiserParamApropos(); |
| initialiserParamContributeur(); |
| initialiserParamLicence(); |
| } |
| private void initialiserParamApropos() { |
| 132,6 → 153,7 |
| aproposParams.set("i18n_version", i18nC.aproposVersion()); |
| aproposParams.set("i18n_version_nom", i18nC.aproposVersionNom()); |
| aproposParams.set("i18n_revision", i18nC.aproposRevision()); |
| aproposParams.set("i18n_revision_jrest", i18nC.aproposRevisionJrest()); |
| aproposParams.set("i18n_licence", i18nC.aproposLicence()); |
| aproposParams.set("i18n_titre_compilation", i18nC.aproposTitreCompilation()); |
| aproposParams.set("i18n_compilation_date", i18nC.aproposCompilationDate()); |
| 147,6 → 169,7 |
| aproposParams.set("version", (String) Registry.get(RegistreId.APPLI_VERSION)); |
| aproposParams.set("version_nom", (String) Registry.get(RegistreId.APPLI_VERSION_NOM)); |
| aproposParams.set("revision", (String) Registry.get(RegistreId.APPLI_REVISION)); |
| aproposParams.set("revision_jrest", (String) Registry.get(RegistreId.JREST_REVISION)); |
| aproposParams.set("licence", (String) Registry.get(RegistreId.APPLI_LICENCE)); |
| aproposParams.set("compilation_date", (String) Registry.get(RegistreId.APPLI_COMPILATION_DATE_HEURE)); |
| aproposParams.set("version_java", (String) Registry.get(RegistreId.APPLI_COMPILATION_JAVA_VERSION)); |
| 161,8 → 184,18 |
| contributeurParams.set("i18n_titre_contributeur", i18nC.aproposTitreContributeur()); |
| contributeurParams.set("i18n_developpeur", i18nC.aproposDeveloppeur()); |
| contributeurParams.set("i18n_traducteur", i18nC.aproposTraducteur()); |
| contributeurParams.set("i18n_testeur", i18nC.aproposTesteur()); |
| contributeurParams.set("developpeur", (String) Registry.get(RegistreId.APPLI_DEVELOPPEURS)); |
| contributeurParams.set("traducteur", (String) Registry.get(RegistreId.APPLI_TRADUCTEURS)); |
| contributeurParams.set("testeur", (String) Registry.get(RegistreId.APPLI_TESTEURS)); |
| } |
| private void initialiserParamLicence() { |
| licenceParams = new Params(); |
| licenceParams.set("i18n_titre_licence", i18nC.aproposTitreLicence()); |
| licenceParams.set("licence", i18nC.licence()); |
| } |
| } |
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/AproposFenetre.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/AproposFenetre.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/composants/ChampComboBoxMultiSelect.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampComboBoxMultiSelect.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampComboBoxMultiSelect.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/composants/IdentificationFenetre.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/IdentificationFenetre.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/IdentificationFenetre.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/composants/ChampMultiValeurs.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampMultiValeurs.java:r1383-1416 |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampMultiValeurs.java:r1209-1382 |
| /trunk/src/org/tela_botanica/client/composants/ChampMultiValeursMultiTypes.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampMultiValeursMultiTypes.java:r1383-1416 |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampMultiValeursMultiTypes.java:r1209-1382 |
| /trunk/src/org/tela_botanica/client/composants/ChampMultiValeursImage.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampMultiValeursImage.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampMultiValeursImage.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/composants/ChampMultiValeursMultiTypesPaginable.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampMultiValeursMultiTypesPaginable.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/composants/ChampMultiValeursPaginable.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampMultiValeursPaginable.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/composants/pagination/ProxyValeur.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/pagination/ProxyValeur.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/composants/pagination/ChargeurListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/pagination/ChargeurListe.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/composants/pagination/Proxy.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/pagination/Proxy.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/composants/pagination/TransformateurJSONaModelData.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/pagination/TransformateurJSONaModelData.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/composants/ChampCaseACocher.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampCaseACocher.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampCaseACocher.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/composants/ConteneurMultiChamps.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ConteneurMultiChamps.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ConteneurMultiChamps.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/composants/LicenceFenetre.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/LicenceFenetre.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/LicenceFenetre.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/composants/AideFenetre.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/AideFenetre.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/AideFenetre.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/composants/ChampComboBoxRechercheTempsReelPaginable.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampComboBoxRechercheTempsReelPaginable.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/Menu.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/Menu.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/Menu.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/MenuApplicationId.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/MenuApplicationId.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/MenuApplicationId.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/aDonnee.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/aDonnee.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/aDonnee.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/personne/Personne.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/personne/Personne.java:r1383-1416 |
| Merged /trunk/src/org/tela_botanica/client/modeles/personne/Personne.java:r1209-1382 |
| /trunk/src/org/tela_botanica/client/modeles/personne/PersonneListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/personne/PersonneListe.java:r1383-1416 |
| Merged /trunk/src/org/tela_botanica/client/modeles/personne/PersonneListe.java:r1209-1382 |
| /trunk/src/org/tela_botanica/client/modeles/personne/PersonneAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/personne/PersonneAsyncDao.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/personne/PersonneAsyncDao.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/Utilisateur.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/Utilisateur.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/Utilisateur.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/aDonneeListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/aDonneeListe.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/aDonneeListe.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/collection/UniteRangement.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/UniteRangement.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/collection/UniteRangement.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPersonne.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPersonne.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/collection/CollectionAPersonne.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPublication.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPublication.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/collection/CollectionAPublication.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneListe.java:r1383-1416 |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneListe.java:r1209-1382 |
| /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationListe.java:r1383-1416 |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationListe.java:r1209-1382 |
| /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneAsyncDao.java:r1383-1416 |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneAsyncDao.java:r1209-1382 |
| /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationAsyncDao.java:r1383-1416 |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationAsyncDao.java:r1209-1382 |
| /trunk/src/org/tela_botanica/client/modeles/collection/Collection.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/Collection.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/collection/Collection.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/collection/CollectionListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionListe.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/collection/CollectionListe.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAsyncDao.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/collection/CollectionAsyncDao.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/collection/UniteBase.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/UniteBase.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/collection/UniteBase.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/collection/CollectionACommentaire.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionACommentaire.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/collection/CollectionACommentaire.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireListe.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireListe.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireAsyncDao.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireAsyncDao.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/collection/CollectionBotanique.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionBotanique.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/collection/CollectionBotanique.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/structure/StructureAPersonne.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureAPersonne.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/structure/StructureAPersonne.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/structure/StructureConservation.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureConservation.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/structure/StructureConservation.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/structure/StructureValorisation.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureValorisation.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/structure/StructureValorisation.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/structure/StructureAPersonneListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureAPersonneListe.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/structure/StructureAPersonneListe.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/structure/StructureAPersonneAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureAPersonneAsyncDao.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/structure/StructureAPersonneAsyncDao.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/structure/Structure.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/Structure.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/structure/Structure.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/structure/StructureListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureListe.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/structure/StructureListe.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/structure/StructureAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/structure/StructureAsyncDao.java:r1383-1416 |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureAsyncDao.java:r1209-1382 |
| /trunk/src/org/tela_botanica/client/modeles/ValeurListeAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/ValeurListeAsyncDao.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/ValeurListeAsyncDao.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/projet/Projet.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/projet/Projet.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/projet/Projet.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/projet/ProjetListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/projet/ProjetListe.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/projet/ProjetListe.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/projet/ProjetAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/projet/ProjetAsyncDao.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/projet/ProjetAsyncDao.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/projet/ProjetVersion.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/projet/ProjetVersion.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/projet/ProjetVersion.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/InterneValeur.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/InterneValeur.java:r1383-1416 |
| Merged /trunk/src/org/tela_botanica/client/modeles/InterneValeur.java:r1209-1382 |
| /trunk/src/org/tela_botanica/client/modeles/commentaire/Commentaire.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/commentaire/Commentaire.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/commentaire/Commentaire.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/commentaire/CommentaireListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/commentaire/CommentaireListe.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/commentaire/CommentaireListe.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/commentaire/CommentaireAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/commentaire/CommentaireAsyncDao.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/commentaire/CommentaireAsyncDao.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/InterneValeurListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/InterneValeurListe.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/InterneValeurListe.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/Information.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/Information.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/Information.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/publication/PublicationAPersonne.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/publication/PublicationAPersonne.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/publication/PublicationAPersonne.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneListe.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneListe.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneAsyncDao.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneAsyncDao.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/publication/Publication.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/publication/Publication.java:r1383-1416 |
| Merged /trunk/src/org/tela_botanica/client/modeles/publication/Publication.java:r1209-1382 |
| /trunk/src/org/tela_botanica/client/modeles/publication/PublicationListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/publication/PublicationListe.java:r1383-1416 |
| Merged /trunk/src/org/tela_botanica/client/modeles/publication/PublicationListe.java:r1209-1382 |
| /trunk/src/org/tela_botanica/client/modeles/publication/PublicationAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/publication/PublicationAsyncDao.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/publication/PublicationAsyncDao.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/UtilisateurAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/UtilisateurAsyncDao.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/UtilisateurAsyncDao.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/Valeur.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/Valeur.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/Valeur.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/ValeurListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/ValeurListe.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/ValeurListe.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/modeles/Aide.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/Aide.java:r1383-1416 |
| Merged /trunk/src/org/tela_botanica/client/modeles/Aide.java:r1209-1382 |
| /trunk/src/org/tela_botanica/client/modeles |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles:r1383-1416 |
| /trunk/src |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src:r1209-1382 |
| Merged /branches/v1.1-aramon/src:r1383-1416 |
| /trunk/Coel-compile |
|---|
| 1,6 → 1,8 |
| #!/bin/sh |
| APPDIR=`dirname $0`; |
| APPDIR_ABSOLU=`pwd`; |
| NOM_DOSSIER_COURANT=`basename $APPDIR_ABSOLU` |
| DOSSIER_JREST="$APPDIR/../jrest_$NOM_DOSSIER_COURANT" |
| APPLI_NOM="Coel" |
| APPLI_DOMAINE="org.tela_botanica.$APPLI_NOM" |
| APPLI_LIEN="$APPLI_DOMAINE" |
| 10,25 → 12,33 |
| ln -s $APPDIR_ABSOLU/war ../$APPLI_LIEN; |
| fi; |
| # Création du fichier apropos.js si nécessaire |
| if [ ! -f $APPDIR/war/apropos.js ]; then |
| cp $APPDIR/war/apropos.defaut.js $APPDIR/war/apropos.js; |
| fi; |
| # Création du fichier config.js si nécessaire |
| if [ ! -f $APPDIR/war/config.js ]; then |
| cp $APPDIR/war/config.defaut.js $APPDIR/war/config.js; |
| fi; |
| # Re-Création du fichier apropos.js systématique à partir du fichier defaut |
| cp $APPDIR/war/apropos.defaut.js $APPDIR/war/apropos.js; |
| # Mise en place de la date de compilation dans le fichier apropos.js |
| export COEL_COMPILATION_DATE=`date`; |
| export COEL_REVISION_GLOBAL=`svnversion -n`; |
| perl -e 'print "Date:".$ENV{COEL_COMPILATION_DATE},"\n"' |
| perl -pi -e 's/dateHeureCompilation:"[^"]*"/dateHeureCompilation:"$ENV{COEL_COMPILATION_DATE}"/g' $APPDIR/war/apropos.js |
| # Mise en place de la version de Java utilisé pour la compilation de l'appli dans le fichier apropos.js |
| export COEL_JAVA_VERSION=`java -version 2>&1 | sed -e :a -e '/$/N; s/\n/ - /; ta' | sed 's/"//g'`; |
| perl -e 'print "Date:".$ENV{COEL_COMPILATION_DATE},"\n"' |
| perl -e 'print "Révision globale:".$ENV{COEL_REVISION_GLOBAL},"\n"' |
| perl -e 'print "Java version:".$ENV{COEL_JAVA_VERSION},"\n"' |
| perl -pi -e 's/versionJavaCompilation:"[^"]*"/versionJavaCompilation:"$ENV{COEL_JAVA_VERSION}"/g' $APPDIR/war/apropos.js |
| perl -pi -e 's/dateHeureCompilation:"[^"]*"/dateHeureCompilation:"$ENV{COEL_COMPILATION_DATE}"/g' $APPDIR/war/apropos.js |
| # Mise en place de la révision globale du svn de l'appli dans le fichier apropos.js |
| export COEL_REVISION_GLOBAL=`svnversion -n`; |
| perl -e 'print "Révision globale:".$ENV{COEL_REVISION_GLOBAL},"\n"' |
| perl -pi -e 's/revisionGlobale:"[^"]*"/revisionGlobale:"$ENV{COEL_REVISION_GLOBAL}"/g' $APPDIR/war/apropos.js |
| perl -pi -e 's/versionJavaCompilation:"[^"]*"/versionJavaCompilation:"$ENV{COEL_JAVA_VERSION}"/g' $APPDIR/war/apropos.js |
| # Mise en place de la révision globale de Jrest dans le fichier apropos.js |
| export COEL_REVISION_GLOBAL_JREST=`svnversion -n $DOSSIER_JREST`; |
| perl -e 'print "Révision globale Jrest :".$ENV{COEL_REVISION_GLOBAL_JREST},"\n"' |
| perl -pi -e 's/revisionGlobaleJrest:"[^"]*"/revisionGlobaleJrest:"$ENV{COEL_REVISION_GLOBAL_JREST}"/g' $APPDIR/war/apropos.js |
| # Lancement de la compilation |
| java -Xmx1024M -cp "$APPDIR/src:$APPDIR/bin:/opt/gwt-2.0.3/gwt-user.jar:/opt/gwt-2.0.3/gwt-dev.jar:/opt/gxt-2.1.1/gxt.jar" com.google.gwt.dev.Compiler $APPLI_DOMAINE; |
| /trunk/war/.htaccess |
|---|
| Property changes: |
| Deleted: svn:mergeinfo |
| Reverse-merged /branches/v1.0-syrah/war/.htaccess:r1136-1179 |
| Reverse-merged /trunk/war/.htaccess:r1376-1382 |
| Reverse-merged /branches/v1.1-aramon/war/.htaccess:r1383-1387 |
| /trunk/war/Coel.html |
|---|
| 24,7 → 24,7 |
| <div id="loading"> |
| <div class="loading-indicator"> |
| <img src="images/large-loading.gif" width="32" height="32" style="margin-right:8px;float:left;vertical-align:top;"/> |
| COEL v1.0 |
| <script type="text/javascript" language="javascript">document.write(apropos.appliCode+' v'+apropos.appliVersionCode+' - '+apropos.appliVersionNom);</script><br /> |
| <span id="loading-msg">Chargement de l'application Collections en Ligne...</span> |
| <noscript> |
| <p> |
| Property changes: |
| Deleted: svn:mergeinfo |
| Reverse-merged /trunk/war/Coel.html:r1376-1382 |
| Reverse-merged /branches/v1.1-aramon/war/Coel.html:r1383-1387 |
| Reverse-merged /branches/v1.0-syrah/war/Coel.html:r1136-1179 |
| /trunk/war/apropos.defaut.js |
|---|
| 1,12 → 1,14 |
| var apropos = { |
| appliNom:"Collections en ligne", |
| appliCode:"COEL", |
| appliVersionCode:"1.1.0", |
| appliVersionCode:"1.1.1", |
| appliVersionNom:"Aramon", |
| developpeurs:"Jean-Pascal MILCENT, Grégoire DUCHÉ, Aurélien PERONNET", |
| traducteurs:"", |
| testeurs:"Andrine FAURE, Véronique SCHÄFER, Danièle DOMEYNE", |
| licence:"GPL v3 et CECILL v2", |
| dateHeureCompilation:"", |
| revisionGlobale:"", |
| revisionGlobaleJrest:"", |
| versionJavaCompilation:"" |
| }; |
| /trunk |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk:r1209-1382 |
| Merged /branches/v1.1-aramon:r1383-1416 |