diff --git a/trunk/PlanosActuacao/lib/evologger.jar b/trunk/PlanosActuacao/lib/evologger.jar index 73530e6a..bf2ef5f2 100644 Binary files a/trunk/PlanosActuacao/lib/evologger.jar and b/trunk/PlanosActuacao/lib/evologger.jar differ diff --git a/trunk/PlanosActuacao/lib/evolute.jar b/trunk/PlanosActuacao/lib/evolute.jar index 7e02e230..d68c41b6 100644 Binary files a/trunk/PlanosActuacao/lib/evolute.jar and b/trunk/PlanosActuacao/lib/evolute.jar differ diff --git a/trunk/PlanosActuacao/nbproject/private/private.properties b/trunk/PlanosActuacao/nbproject/private/private.properties index 5296ab8b..2c21679d 100644 --- a/trunk/PlanosActuacao/nbproject/private/private.properties +++ b/trunk/PlanosActuacao/nbproject/private/private.properties @@ -4,8 +4,8 @@ auxiliary.org-netbeans-modules-web-client-tools-api.FIREFOX=true auxiliary.org-netbeans-modules-web-client-tools-api.INTERNET_5f_EXPLORER=false auxiliary.org-netbeans-modules-web-client-tools-api.serverdebug=true deploy.ant.properties.file=/home/dneves/.netbeans/6.7/tomcat60.properties -j2ee.platform.classpath=/home/dneves/Software/apache-tomcat-6.0.18/lib/jasper.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/jsp-api.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/catalina-ant.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/tomcat-i18n-es.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/tomcat-i18n-ja.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/catalina-ha.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/servlet-api.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/tomcat-i18n-fr.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/catalina.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/tomcat-coyote.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/el-api.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/annotations-api.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/tomcat-dbcp.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/jasper-el.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/catalina-tribes.jar:/home/dneves/Software/apache-tomcat-6.0.18/bin/tomcat-juli.jar -j2ee.server.instance=tomcat60:home=/home/dneves/Software/apache-tomcat-6.0.18 +j2ee.platform.classpath=/home/dneves/Software/apache-tomcat-6.0.33/lib/jasper-el.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/ecj-3.3.1.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/el-api.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/tomcat-i18n-fr.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/tomcat-dbcp.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/tomcat-i18n-ja.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/catalina-ant.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/jsp-api.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/servlet-api.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/annotations-api.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/catalina-tribes.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/catalina-ha.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/tomcat-i18n-es.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/jasper.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/catalina.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/tomcat-coyote.jar:/home/dneves/Software/apache-tomcat-6.0.33/bin/tomcat-juli.jar +j2ee.server.instance=tomcat60:home=/home/dneves/Software/apache-tomcat-6.0.33 javac.debug=true javadoc.preview=true jaxws.endorsed.dir=/home/dneves/Software/netbeans-6.7.1/java2/modules/ext/jaxws21/api:/home/dneves/Software/netbeans-6.7.1/ide11/modules/ext/jaxb/api diff --git a/trunk/PlanosActuacao/src/java/app.properties b/trunk/PlanosActuacao/src/java/app.properties index 8e644a92..23e568bf 100644 --- a/trunk/PlanosActuacao/src/java/app.properties +++ b/trunk/PlanosActuacao/src/java/app.properties @@ -6,35 +6,35 @@ app.resources.j2se.max-heap-size = 512M # production -server.siprp = localhost -port.siprp = 5436 -database.siprp = siprp -username.siprp = postgres -#password.siprp = - -server.siprp_local = localhost -port.siprp_local = 5436 -database.siprp_local = siprp_local_3 -username.siprp_local = postgres -#password.siprp_local = - -debug = false - - -# tests #server.siprp = localhost -#port.siprp = 5432 +#port.siprp = 5436 #database.siprp = siprp #username.siprp = postgres -#password.siprp = Typein +##password.siprp = # #server.siprp_local = localhost -#port.siprp_local = 5432 +#port.siprp_local = 5436 #database.siprp_local = siprp_local_3 #username.siprp_local = postgres -#password.siprp_local = Typein +##password.siprp_local = # -#debug = true +#debug = false + + +# tests +server.siprp = localhost +port.siprp = 5432 +database.siprp = siprp +username.siprp = postgres +password.siprp = Typein + +server.siprp_local = localhost +port.siprp_local = 5432 +database.siprp_local = siprp_local_3 +username.siprp_local = postgres +password.siprp_local = Typein + +debug = true #server.siprp = www.evolute.pt diff --git a/trunk/PlanosActuacao/src/java/db/providers/EvoBaseProvider.java b/trunk/PlanosActuacao/src/java/db/providers/EvoBaseProvider.java index 91deff27..e5cd20e0 100644 --- a/trunk/PlanosActuacao/src/java/db/providers/EvoBaseProvider.java +++ b/trunk/PlanosActuacao/src/java/db/providers/EvoBaseProvider.java @@ -21,6 +21,7 @@ import com.evolute.utils.error.ErrorLogger; import com.evolute.utils.jdbc.DBStatementExecuter; import com.evolute.utils.jdbc.StatementExecuterFactory; import com.evolute.utils.sql.SQLQuery; +import com.evolute.utils.sql.backend.BackendProvider; import com.evolute.utils.strings.UnicodeChecker; import db.DBConstants; import db.DBPropertiesLoader; @@ -154,6 +155,7 @@ public class EvoBaseProvider { String dbUrl = ( String ) Singleton.getInstance( DBConstants.CONNECTION_URL ); providerInterface = createInstance( db, dbUrl, username, password ); + BackendProvider.getBackend( dbUrl ).setEscapeUnicode( false ); } else if ( DBConstants.DB.SIPRP_LOCAL.equals( db ) ) { diff --git a/trunk/PlanosActuacao/src/java/updates/PAUpdatesListProvider.java b/trunk/PlanosActuacao/src/java/updates/PAUpdatesListProvider.java index de8589be..74de8f44 100644 --- a/trunk/PlanosActuacao/src/java/updates/PAUpdatesListProvider.java +++ b/trunk/PlanosActuacao/src/java/updates/PAUpdatesListProvider.java @@ -4,6 +4,7 @@ import com.evolute.module.updater.AbstractUpdate; import com.evolute.module.updater.UpdaterListProvider; import updates.updates.Update1; import updates.updates.Update2; +import updates.updates.Update3; /** * User: dneves @@ -15,6 +16,7 @@ public class PAUpdatesListProvider extends UpdaterListProvider private static final AbstractUpdate[] UPDATES_LIST = new AbstractUpdate[] { new Update1( 0, 1 ), // support for valor qualitativo (@ riscos) new Update2( 1, 2 ), // update valor qualitativo +// new Update3( 2, 3 ), // corrigir enconde planos importados }; diff --git a/trunk/PlanosActuacao/src/java/updates/updates/Update3.java b/trunk/PlanosActuacao/src/java/updates/updates/Update3.java new file mode 100644 index 00000000..fdc261a9 --- /dev/null +++ b/trunk/PlanosActuacao/src/java/updates/updates/Update3.java @@ -0,0 +1,28 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package updates.updates; + +import com.evolute.module.updater.AbstractUpdate; + +/** + * + * @author dneves + */ +public class Update3 extends AbstractUpdate +{ + + public Update3( double start, double end ) + { + super( start, end, "Corrigir encoding de planos importados" ); + } + + @Override + public void doUpdate() throws Exception + { + // TODO : fix db unicode + } + +} diff --git a/trunk/PlanosActuacao/src/java/viewhandler/CustomViewHandler.java b/trunk/PlanosActuacao/src/java/viewhandler/CustomViewHandler.java index 83199b57..ff74c1bb 100644 --- a/trunk/PlanosActuacao/src/java/viewhandler/CustomViewHandler.java +++ b/trunk/PlanosActuacao/src/java/viewhandler/CustomViewHandler.java @@ -2,13 +2,11 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ - package viewhandler; import java.io.IOException; import java.util.Locale; import java.util.Map; -import javax.el.ValueExpression; import javax.faces.FacesException; import javax.faces.application.ViewHandler; import javax.faces.component.UIViewRoot; @@ -18,58 +16,77 @@ import javax.faces.context.FacesContext; * * @author lluis */ -public class CustomViewHandler extends ViewHandler{ - protected ViewHandler baseViewHandler; +public class CustomViewHandler extends ViewHandler +{ + + protected ViewHandler baseViewHandler; + + public CustomViewHandler( ViewHandler viewHandler ) + { + super(); + this.baseViewHandler = viewHandler; + } - public CustomViewHandler(ViewHandler viewHandler) { - super(); - this.baseViewHandler = viewHandler; - } + @Override + public Locale calculateLocale( FacesContext facesContext ) + { + return baseViewHandler.calculateLocale( facesContext ); + } - public Locale calculateLocale(FacesContext facesContext) { - return baseViewHandler.calculateLocale(facesContext); - } + @Override + public String calculateRenderKitId( FacesContext facesContext ) + { + return baseViewHandler.calculateRenderKitId( facesContext ); + } - public String calculateRenderKitId(FacesContext facesContext) { - return baseViewHandler.calculateRenderKitId(facesContext); - } + @Override + public UIViewRoot createView( FacesContext facesContext, String arg1 ) + { + setPostback( facesContext, false ); + return baseViewHandler.createView( facesContext, arg1 ); + } - public UIViewRoot createView(FacesContext facesContext, String arg1) { - setPostback(facesContext, false); - return baseViewHandler.createView(facesContext, arg1); - } + @Override + public String getActionURL( FacesContext facesContext, String arg1 ) + { + return baseViewHandler.getActionURL( facesContext, arg1 ); + } - public String getActionURL(FacesContext facesContext, String arg1) { - return baseViewHandler.getActionURL(facesContext, arg1); - } + @Override + public String getResourceURL( FacesContext facesContext, String arg1 ) + { + return baseViewHandler.getResourceURL( facesContext, arg1 ); + } - public String getResourceURL(FacesContext facesContext, String arg1) { - return baseViewHandler.getResourceURL(facesContext, arg1); - } + @Override + public void renderView( FacesContext facesContext, UIViewRoot arg1 ) throws IOException, FacesException + { + baseViewHandler.renderView( facesContext, arg1 ); - public void renderView(FacesContext facesContext, UIViewRoot arg1) throws IOException, FacesException { - baseViewHandler.renderView(facesContext, arg1); - - } + } - public UIViewRoot restoreView(FacesContext facesContext, String arg1) { - setPostback(facesContext, true); - return baseViewHandler.restoreView(facesContext, arg1); - } + @Override + public UIViewRoot restoreView( FacesContext facesContext, String arg1 ) + { + setPostback( facesContext, true ); + return baseViewHandler.restoreView( facesContext, arg1 ); + } - public void writeState(FacesContext facesContext) throws IOException { - baseViewHandler.writeState(facesContext); - } - - public Map getRequestScope(FacesContext facesContext) { - //return (Map)facesContext.getApplication().createValueBinding(?#{requestScope}?).getValue(facesContext); - //return (Map)facesContext.getApplication(). - return (Map) facesContext.getApplication().getExpressionFactory().createValueExpression(facesContext.getELContext(), "#{requestScope}", Map.class).getValue(facesContext.getELContext()); - } - - public void setPostback(FacesContext facesContext, boolean value) { - getRequestScope(facesContext).put("ispostback", new Boolean(value)); - } + @Override + public void writeState( FacesContext facesContext ) throws IOException + { + baseViewHandler.writeState( facesContext ); + } + public Map getRequestScope( FacesContext facesContext ) + { + //return (Map)facesContext.getApplication().createValueBinding(?#{requestScope}?).getValue(facesContext); + //return (Map)facesContext.getApplication(). + return ( Map ) facesContext.getApplication().getExpressionFactory().createValueExpression( facesContext.getELContext(), "#{requestScope}", Map.class ).getValue( facesContext.getELContext() ); + } + public void setPostback( FacesContext facesContext, boolean value ) + { + getRequestScope( facesContext ).put( "ispostback", new Boolean( value ) ); + } }