From 4c4a8d9553878420497a2bc9ff7b66ccbbda5108 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Sun, 1 Jul 2012 20:23:18 -0300 Subject: [PATCH] Minor fixes --- distribution/package-bin.sh | 18 +++++++----------- .../WEB-INF/classes/messages_es.properties | 4 ++-- wise-webapp/src/main/webapp/jsp/footer.jsp | 11 ++++++++++- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/distribution/package-bin.sh b/distribution/package-bin.sh index 863e2d59..2a69c9aa 100755 --- a/distribution/package-bin.sh +++ b/distribution/package-bin.sh @@ -1,5 +1,6 @@ #!/bin/bash +set -x set -e set -u @@ -8,8 +9,8 @@ BASE_DIR=`pwd` TARGET_DIR=$BASE_DIR/target JETTY_DIR=$TARGET_DIR/wisemapping-$WISE_VERSION WISE_WEBAPP_DIR=$JETTY_DIR/webapps/wisemapping -JETTY_DIST_DIR=jetty-distribution-7.6.0.v20120127 -JETTY_ZIP=${JETTY_DIST_DIR}.zip +JETTY_DIST_DIR=jetty-distribution-8.1.4.v20120524.zip +JETTY_ZIP=${JETTY_DIST_DIR} # Clean ... mvn -o -f $BASE_DIR/../pom.xml clean @@ -18,12 +19,12 @@ rm -fr ${JETTY_DIR} rm -fr ${TARGET_DIR}/${JETTY_DIST_DIR} # Prepare resources .. -mvn -o -f $BASE_DIR/../pom.xml install +mvn -o -f $BASE_DIR/../pom.xml install -Dmaven.test.skip=true if [ ! -f ./target/${JETTY_ZIP} ] then echo "Download Jetty" - wget http://download.eclipse.org/jetty/stable-7/dist/${JETTY_ZIP} -P $TARGET_DIR + wget http://download.eclipse.org/jetty/8.1.4.v20120524/dist/jetty-distribution-8.1.4.v20120524.zip -P $TARGET_DIR fi echo "Unzip Jetty ...:" @@ -31,23 +32,18 @@ unzip ${TARGET_DIR}/${JETTY_ZIP} -d ${TARGET_DIR}/ > /dev/null mv ${TARGET_DIR}/${JETTY_DIST_DIR} ${JETTY_DIR} # Clean unsed files ... -rm -r $JETTY_DIR/webapps/* -rm -r $JETTY_DIR/contexts/* +rm -rf $JETTY_DIR/webapps/* +rm -rf $JETTY_DIR/contexts/* # Now, start wise-webapps customization ... echo "Unzip wisemappig.war ..." mkdir $WISE_WEBAPP_DIR unzip $BASE_DIR/../wise-webapp/target/wisemapping.war -d $WISE_WEBAPP_DIR >/dev/null -rm $WISE_WEBAPP_DIR/images/wisemapping.swf mkdir $WISE_WEBAPP_DIR/WEB-INF/database cp -r $BASE_DIR/../wise-webapp/target/db/* $WISE_WEBAPP_DIR/WEB-INF/database/ cp $BASE_DIR/wisemapping.xml $JETTY_DIR/contexts/ -# Some replacements ... -sed 's/target\/db\/wisemapping/webapps\/wisemapping\/WEB-INF\/database\/wisemapping/' $WISE_WEBAPP_DIR/WEB-INF/app.properties > $WISE_WEBAPP_DIR/WEB-INF/app.properties2 -mv $WISE_WEBAPP_DIR/WEB-INF/app.properties2 $WISE_WEBAPP_DIR/WEB-INF/app.properties - # Distribute scripts cp -r $BASE_DIR/../wise-webapp/src/test/sql $TARGET_DIR/wisemapping-$WISE_VERSION/config diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/messages_es.properties b/wise-webapp/src/main/webapp/WEB-INF/classes/messages_es.properties index d5239a74..f3cfed20 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/classes/messages_es.properties +++ b/wise-webapp/src/main/webapp/WEB-INF/classes/messages_es.properties @@ -98,7 +98,7 @@ KEYBOARD_MSG=Estos son los atajos de teclado que puede utilizar en el editor! REVERT=revertir EXPORT_FORMAT_RESTRICTIONS=Important: Exporting to Image, PDF or SVG is available only in the editor toolbar. -STARRED=Importantes +STARRED=Destacados ACCOUNT_ACTIVED=Su cuenta ha sido activada ACCOUNT_ACTIVED_FAIL=Falla al Activar Cuenta WISEMAPPING_EXPORT_FORMAT=WiseMapping @@ -138,7 +138,7 @@ NO_SEARCH_RESULT=No existen mapas disponibles para el criterio de busqueda selec GENERAL=General SECURITY=Seguridad MAP_NAME_HINT=El nombre del nuevo mapa -MAP_DESCRIPTION_HINT=Una descripción de tu mapa +MAP_DESCRIPTION_HINT=Una descripci\u00f3n de tu mapa WARNING=Cuidado DELETE_MAPS_WARNING=Una vez borrado de un mapa no puede ser recuperado. Desea continuar ? WHAT_IS_NEW=Novedades diff --git a/wise-webapp/src/main/webapp/jsp/footer.jsp b/wise-webapp/src/main/webapp/jsp/footer.jsp index 5ef15ec4..d8ab7606 100644 --- a/wise-webapp/src/main/webapp/jsp/footer.jsp +++ b/wise-webapp/src/main/webapp/jsp/footer.jsp @@ -4,7 +4,16 @@

- +
+
+ + + + +
+