diff --git a/trunk/log4j.properties b/trunk/log4j.properties new file mode 100644 index 00000000..fd0d296f --- /dev/null +++ b/trunk/log4j.properties @@ -0,0 +1,3 @@ +log4j.rootCategory=DEBUG, dest1 +log4j.appender.dest1=org.apache.log4j.ConsoleAppender +log4j.appender.dest1.layout=org.apache.log4j.PatternLayout diff --git a/trunk/siprp/FichaDataProvider.java b/trunk/siprp/FichaDataProvider.java index 491da526..726bc533 100644 --- a/trunk/siprp/FichaDataProvider.java +++ b/trunk/siprp/FichaDataProvider.java @@ -455,7 +455,7 @@ public class FichaDataProvider extends MetaProvider implements SearchExecuter { new String[]{ "id" }, new Field( "trabalhador_id" ).isEqual( trabalhadorID ).and( new Field( "data" ).isGreater( new Date() ) ).and( - new Field( "tipo" ).isEqual( new Integer( siprp.data.MarcacaoTrabalhador.TIPO_EXAMES ) ) ) ); + new Field( "tipo" ).isEqual( new Integer( siprp.data.MarcacaoTrabalhadorData.TIPO_EXAMES ) ) ) ); Virtual2DArray array = executer.executeQuery( select ); if( array.columnLength() == 0 ) { diff --git a/trunk/siprp/Main.java b/trunk/siprp/Main.java index 534a1dc2..a123990a 100644 --- a/trunk/siprp/Main.java +++ b/trunk/siprp/Main.java @@ -98,17 +98,15 @@ public class Main implements Connector StatementExecuterFactory.initialize( new DBStatementExecuter( dbm.getSharedExecuter() ) ); - - Properties props = new Properties(); - props.load( classLoader.getResourceAsStream( "speedo.properties" ) ); - props.setProperty( "javax.jdo.option.ConnectionURL", url ); - PersistenceManagerFactory pmf = JDOHelper.getPersistenceManagerFactory( props ); -// Collection c = pmf.supportedOptions(); -// System.out.println( "Options: " + c ); - Singleton.setInstance( Singleton.DEFAULT_PERSISTENCE_MANAGER_FACTORY, pmf ); - PersistenceManager pm = pmf.getPersistenceManager(); - Singleton.setInstance( SingletonConstants.PERSISTENCE_MANAGER, pm ); - com.evolute.utils.jdo.JDOObject.setPersistentManager( pm ); + initializeJPOX( url, user, passwd ); +//// Properties props = new Properties(); +//// props.load( classLoader.getResourceAsStream( "speedo.properties" ) ); +//// props.setProperty( "javax.jdo.option.ConnectionURL", url ); +//// PersistenceManagerFactory pmf = JDOHelper.getPersistenceManagerFactory( props ); +//// Singleton.setInstance( Singleton.DEFAULT_PERSISTENCE_MANAGER_FACTORY, pmf ); +//// PersistenceManager pm = pmf.getPersistenceManager(); +//// Singleton.setInstance( SingletonConstants.PERSISTENCE_MANAGER, pm ); +//// com.evolute.utils.jdo.JDOObject.setPersistentManager( pm ); //for( int i = 0; i < 5; ++i ) //{ @@ -236,5 +234,58 @@ public class Main implements Connector { return siprpTracker.getRoot(); } - + + public void initializeJPOX(String url, String user, String password) + { + Date d = new Date(); +System.out.println( "INIT: " + d ); + + + Properties jpoxProps; + jpoxProps = System.getProperties();//new Properties(); + // Set the PersistenceManagerFactoryClass to the TJDO class. + jpoxProps.setProperty( "javax.jdo.PersistenceManagerFactoryClass", + "org.jpox.PersistenceManagerFactoryImpl" ); + // Set the JDBC driver name. + jpoxProps.setProperty( "javax.jdo.option.ConnectionDriverName", "com.mysql.jdbc.Driver" ); + jpoxProps.setProperty( "org.jpox.identifier.fullyQualifiedNames", "false" ); + // props.setProperty("com.triactive.jdo.transactionIsolation", + // "read-uncommitted" ); + + // Set the connection URL +// jpoxProps.setProperty( "javax.jdo.option.ConnectionURL", "jdbc:informix-sqli://192.168.0.3:6666" +// + "/apdp_db:informixserver=server" ); + jpoxProps.setProperty( "javax.jdo.option.ConnectionURL", url ); + jpoxProps.setProperty( "javax.jdo.option.ConnectionUserName", user ); + jpoxProps.setProperty( "javax.jdo.option.ConnectionPassword", password ); + jpoxProps.setProperty( "javax.jdo.option.IgnoreCache", "true" ); + jpoxProps.setProperty( "javax.jdo.option.NonTransactionalRead", "true" ); + jpoxProps.setProperty( "javax.jdo.option.RetainValues", "true" ); + + jpoxProps.setProperty( "org.jpox.autoCreateTables", "false" ); + jpoxProps.setProperty( "org.jpox.autoCreateSchema", "false" ); + jpoxProps.setProperty( "org.jpox.autoCreateConstraints", "false" ); + jpoxProps.setProperty( "org.jpox.validateTables", "false" ); + jpoxProps.setProperty( "org.jpox.validateConstraints", "false" ); + jpoxProps.setProperty( "org.jpox.autoStartMechanismMode", "Ignored" ); + jpoxProps.setProperty( "org.jpox.autoStartMechanism", "None" ); + + jpoxProps.setProperty( "javax.jdo.option.RetainValues", "true" ); +// jpoxProps.setProperty( "javax.jdo.option.Optimistic", "true" ); + +// jpoxProps.setProperty( "org.jpox.identifier.defaultSchemaName", "informix" ); + jpoxProps.setProperty( "org.jpox.rdbms.CheckExistTablesOrViews", "false" ); + + System.setProperty( "org.jpox.catalogName", "siprp" ); + System.setProperty( "org.jpox.schemaName", "" ); + + PersistenceManagerFactory pmf = JDOHelper.getPersistenceManagerFactory( jpoxProps ); +// pmf.setOptimistic( true ); +System.out.print( "Loading PM: " + new Date() ); + // ( ( PersistenceManagerFactoryImpl )pmf ).setTransactionIsolation( Connection.TRANSACTION_READ_UNCOMMITTED ); + // Retrieve a PersistenceManager from the PersistenceManagerFactory. + PersistenceManager pm = pmf.getPersistenceManager(); + JDOObject.setPersistentManager( pm ); +System.out.println( "PM done " + new Date() ); + } } \ No newline at end of file