just for sync

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

trunk/SiprpWebFichasClinicas/.classpath

@@ -24,7 +24,6 @@
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-fileupload-1.3.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-io-2.4.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-lang-2.6.jar"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-validator-1.4.0.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/dom4j-1.6.1.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/evologgerclient.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/evolute.jar"/>
@@ -40,9 +39,6 @@
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/httpcore-4.3.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/httpmime-4.3.1.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/icu4j-52.1.jar"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jackson-annotations-2.3.0.jar"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jackson-core-2.3.0.jar"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jackson-databind-2.3.0.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/javassist-3.16.1-GA.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/javax.inject-1.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jaxb-core.jar"/>
@@ -50,7 +46,6 @@
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jaxws-rt.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jcl-over-slf4j-1.7.5.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jempbox-1.8.3.jar"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/json-lib-2.4-jdk15.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jstl-1.2.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jta-1.1.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/log4j-over-slf4j-1.7.5.jar"/>
@@ -113,25 +108,14 @@
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/tiles-template-3.0.3.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/xmlgraphics-commons-1.5.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jdom-1.1.3.jar"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jaxws-json-1.2.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jaxws-spring-1.9.jar"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/json-20140107.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/poi-3.6-20091214.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/xbean-spring-3.16.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/cglib-nodep-2.2.jar"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jaxws-spring-1.10-20130630.113250-1.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jdom2-2.0.5.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/joda-time-1.6.jar"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/json-20080701.jar"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/kxml2-2.3.0.jar"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/kxml2-min-2.3.0.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/stax-1.2.0.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/stax-api-1.0.1.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/wstx-asl-3.2.7.jar"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/xbean-spring-3.9.jar"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/xmlpull-1.1.3.1.jar"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/xom-1.1.jar"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/xpp3_min-1.1.4c.jar"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/xstream-1.4.7.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>

trunk/SiprpWebFichasClinicas/build/siprp_fichasclinicas.properties

@@ -1,4 +1,4 @@
-#Wed, 16 Apr 2014 10:29:39 +0100
+#Thu, 17 Apr 2014 13:08:18 +0100
 
-timestamp=2014/04/16 10\:29
+timestamp=2014/04/17 13\:08
 user=rsantos

trunk/SiprpWebFichasClinicas/src/pt/evolute/data/ProviderSpringBean.java

@@ -102,7 +102,7 @@ public class ProviderSpringBean {
 		}
 		setupProperties();
 
-		DBMANAGER = new JDBCManager( url, username, password, 100, 75, 25, new SQLQuery[]{} );
+		DBMANAGER = new JDBCManager( url, username, password, 50,10, new SQLQuery[]{} );
 		
 		ConnectionIdentity conn = new ConnectionIdentity( url, username );
 		conn.setPassword( password );

trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/webservice/FichasClinicasWSImpl.java

@@ -2,10 +2,8 @@ package shst.medicina.fichasclinicas.webservice;
 
 import java.util.Collection;
 import java.util.LinkedList;
-import java.util.Random;
 
 import javax.jws.WebService;
-import javax.xml.ws.BindingType;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -19,6 +17,8 @@ import shst.medicina.fichasclinicas.data.shst.EstabelecimentosData;
 import shst.medicina.fichasclinicas.data.shst.TrabalhadoresData;
 
 import com.evolute.utils.arrays.Virtual2DArray;
+import com.evolute.utils.db.Executer;
+import com.evolute.utils.db.SQLExecuter;
 import com.evolute.utils.error.ErrorLogger;
 import com.evolute.utils.sql.Expression;
 import com.evolute.utils.sql.Field;
@@ -37,48 +37,43 @@ public class FichasClinicasWSImpl implements FichasClinicasWS
 	@Qualifier("siprpProvider")
 	ProviderSpringBean siprpProvidersBean;
 	
-	static final Object[] tokens = {new Object(),new Object(),new Object()};
-	static final Random r5 = new Random(System.currentTimeMillis());
-	
 	public Collection<EmpresasBeanData> getAllEmpresas()
 	{
-		
-		
 		Collection<EmpresasBeanData> result = new LinkedList<EmpresasBeanData>();
 		
 		Expression dataFilter  = new Field(EmpresasData.INACTIVO).isDifferent("y").and(new Field(EmpresasData.DATA_CANCELAMENTO).isEqual(null));
 		
 		try
-		{
+		{		
-			
+			Collection<EmpresasData> bdLoad = siprpProvidersBean
-			Select2 sel = new Select2(EmpresasData.TABLENAME, dataFilter, new String[]{EmpresasData.ID,EmpresasData.DESIGNACAO_SOCIAL});
+					.getENTITY_PROVIDER()
+					.listLoad(EmpresasData.class, dataFilter, new String[]{EmpresasData.DESIGNACAO_SOCIAL}, null);
 			
-//			Collection<EmpresasData> bdLoad = siprpProvidersBean
+			for(EmpresasData bdElem : bdLoad)
-//					.getENTITY_PROVIDER()
+			{
-//					.listLoad(EmpresasData.class, dataFilter, new String[]{EmpresasData.DESIGNACAO_SOCIAL}, null);
+				EmpresasBeanData resultElem = new EmpresasBeanData();
+				resultElem.setMapData(bdElem.getPropertiesValues(new String[]{EmpresasData.ID,EmpresasData.DESIGNACAO_SOCIAL}));
+				
+				result.add(resultElem);
+			}
+//			Select2 sel = new Select2(EmpresasData.TABLENAME, dataFilter, new String[]{EmpresasData.ID,EmpresasData.DESIGNACAO_SOCIAL});
 //			
-//			for(EmpresasData bdElem : bdLoad)
+//			Executer EXECUTER = siprpProvidersBean.getDBMANAGER().getSharedExecuter( Thread.currentThread().getId() % 190 );
+//			Virtual2DArray queryResult = EXECUTER.executeQuery(sel);
+//			for(int i=0 ; i < queryResult.rowCount(); i++)
 //			{
 //				EmpresasBeanData resultElem = new EmpresasBeanData();
-//				resultElem.setMapData(bdElem.getPropertiesValues(new String[]{EmpresasData.ID,EmpresasData.DESIGNACAO_SOCIAL}));
+//				resultElem.setId((Integer) queryResult.get(i, 0));
-//				
+//				resultElem.setDesignacao_social((String) queryResult.get(i, 1));
 //				result.add(resultElem);
 //			}
-			Virtual2DArray queryResult = siprpProvidersBean.getDBMANAGER().getSharedExecuter(tokens[r5.nextInt()%3]).executeQuery(sel);
-			for(int i=0 ; i < queryResult.rowCount(); i++)
-			{
-				EmpresasBeanData resultElem = new EmpresasBeanData();
-				resultElem.setId((Integer) queryResult.get(i, 0));
-				resultElem.setDesignacao_social((String) queryResult.get(i, 1));
-				result.add(resultElem);
-			}
 		} 
 		catch (Exception ex)
 		{
 			ErrorLogger.logException(ex);
 		}
 		
-		result.add(new EmpresasBeanData());
+		//System.out.println("TH:"+Thread.getAllStackTraces().size());
 		return result;
 	}