updated jars;

set Escape Unicode false at Backend;

git-svn-id: https://svn.coded.pt/svn/SIPRP@1732 bb69d46d-e84e-40c8-a05a-06db0d633741

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.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.18
+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

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

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 ) )
 		{

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
     };
 
 

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
+	}
+
+}

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{
+public class CustomViewHandler extends ViewHandler
-  protected ViewHandler baseViewHandler;
+{
+
+	protected ViewHandler baseViewHandler;
+
+	public CustomViewHandler( ViewHandler viewHandler )
+	{
+		super();
+		this.baseViewHandler = viewHandler;
+	}
 
-  public CustomViewHandler(ViewHandler viewHandler) {
+	@Override
-    super();
+	public Locale calculateLocale( FacesContext facesContext )
-    this.baseViewHandler = viewHandler;
+	{
-  }
+		return baseViewHandler.calculateLocale( facesContext );
+	}
 
-  public Locale calculateLocale(FacesContext facesContext) {
+	@Override
-    return baseViewHandler.calculateLocale(facesContext);
+	public String calculateRenderKitId( FacesContext facesContext )
-  }
+	{
+		return baseViewHandler.calculateRenderKitId( facesContext );
+	}
 
-  public String calculateRenderKitId(FacesContext facesContext) {
+	@Override
-    return baseViewHandler.calculateRenderKitId(facesContext);
+	public UIViewRoot createView( FacesContext facesContext, String arg1 )
-  }
+	{
+		setPostback( facesContext, false );
+		return baseViewHandler.createView( facesContext, arg1 );
+	}
 
-  public UIViewRoot createView(FacesContext facesContext, String arg1) {
+	@Override
-    setPostback(facesContext, false);
+	public String getActionURL( FacesContext facesContext, String arg1 )
-    return baseViewHandler.createView(facesContext, arg1);
+	{
-  }
+		return baseViewHandler.getActionURL( facesContext, arg1 );
+	}
 
-  public String getActionURL(FacesContext facesContext, String arg1) {
+	@Override
-    return baseViewHandler.getActionURL(facesContext, arg1);
+	public String getResourceURL( FacesContext facesContext, String arg1 )
-  }
+	{
+		return baseViewHandler.getResourceURL( facesContext, arg1 );
+	}
 
-  public String getResourceURL(FacesContext facesContext, String arg1) {
+	@Override
-    return baseViewHandler.getResourceURL(facesContext, arg1);
+	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) {
+	@Override
-    setPostback(facesContext, true);
+	public UIViewRoot restoreView( FacesContext facesContext, String arg1 )
-    return baseViewHandler.restoreView(facesContext, arg1);
+	{
-  }
+		setPostback( facesContext, true );
+		return baseViewHandler.restoreView( facesContext, arg1 );
+	}
 
-  public void writeState(FacesContext facesContext) throws IOException {
+	@Override
-    baseViewHandler.writeState(facesContext);
+	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));
-  }
 
+	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 ) );
+	}
 }