Skip to content

Commit

Permalink
FIX xml
Browse files Browse the repository at this point in the history
  • Loading branch information
@mspasiano
mspasiano committed Sep 28, 2018
1 parent 27dabd9 commit 0486934
Show file tree
Hide file tree
Showing 11 changed files with 331 additions and 188 deletions.
90 changes: 90 additions & 0 deletions sigla-backend/src/main/resources/liquibase/db.changelog-5.0.0.xml
View file
Expand Up @@ -718,6 +718,96 @@
<column header="pg_ver_rec" name="pg_ver_rec" type="NUMERIC"/>
</loadData>
</changeSet>
<changeSet author="marco.spasiano" id="accessi_tipo_finanziamento">
<insert tableName="accesso">
<column name="cd_accesso" type="VARCHAR(20)" value="CFGTIPOFINANZIAM"/>
<column name="ti_accesso" type="CHAR(1)" value="C"/>
<column name="ds_accesso" type="VARCHAR(200)" value="Gestione Tipo Finanziamento"/>
<column name="duva" type="${date.type}" valueDate="${now}"/>
<column name="utuv" type="VARCHAR(20)" value="SIGLA"/>
<column name="dacr" type="${date.type}" valueDate="${now}"/>
<column name="utcr" type="VARCHAR(20)" value="SIGLA"/>
<column name="pg_ver_rec" type="BIGINT" value="0"/>
</insert>
<insert tableName="accesso">
<column name="cd_accesso" type="VARCHAR(20)" value="CFGTIPOFINANZIAV"/>
<column name="ti_accesso" type="CHAR(1)" value="C"/>
<column name="ds_accesso" type="VARCHAR(200)" value="Visualizzazione Tipo Finanziamento"/>
<column name="duva" type="${date.type}" valueDate="${now}"/>
<column name="utuv" type="VARCHAR(20)" value="SIGLA"/>
<column name="dacr" type="${date.type}" valueDate="${now}"/>
<column name="utcr" type="VARCHAR(20)" value="SIGLA"/>
<column name="pg_ver_rec" type="BIGINT" value="0"/>
</insert>
<insert tableName="ass_bp_accesso">
<column name="cd_accesso" type="VARCHAR(20)" value="CFGTIPOFINANZIAM"/>
<column name="business_process" type="VARCHAR(200)" value="CRUDTipoFinanziamentoBP"/>
<column name="ti_funzione" type="CHAR(1)" value="M"/>
<column name="duva" type="${date.type}" valueDate="${now}"/>
<column name="utuv" type="VARCHAR(20)" value="SIGLA"/>
<column name="dacr" type="${date.type}" valueDate="${now}"/>
<column name="utcr" type="VARCHAR(20)" value="SIGLA"/>
<column name="pg_ver_rec" type="BIGINT" value="0"/>
</insert>
<insert tableName="ass_bp_accesso">
<column name="cd_accesso" type="VARCHAR(20)" value="CFGTIPOFINANZIAV"/>
<column name="business_process" type="VARCHAR(200)" value="CRUDTipoFinanziamentoBP"/>
<column name="ti_funzione" type="CHAR(1)" value="V"/>
<column name="duva" type="${date.type}" valueDate="${now}"/>
<column name="utuv" type="VARCHAR(20)" value="SIGLA"/>
<column name="dacr" type="${date.type}" valueDate="${now}"/>
<column name="utcr" type="VARCHAR(20)" value="SIGLA"/>
<column name="pg_ver_rec" type="BIGINT" value="0"/>
</insert>

<insert tableName="albero_main">
<column name="cd_nodo" type="VARCHAR(100)" value="0.CFG.TIPO_FINANZIAMENTO"/>
<column name="ds_nodo" type="VARCHAR(200)" value="Tipo Finanziamento"/>
<column name="pg_ordinamento" type="BIGINT" value="146"/>
<column name="fl_terminale" type="CHAR(1)" value="N"/>
<column name="livello" type="SMALLINT" value="3"/>
<column name="cd_proprio_nodo" type="VARCHAR(100)" value="TIPO_FINANZIAMENTO"/>
<column name="cd_nodo_padre" type="VARCHAR(100)" value="0.CFG"/>
<column name="url_icona" type="VARCHAR(200)" value="leaf.gif"/>
<column name="duva" type="${date.type}" valueDate="${now}"/>
<column name="utuv" type="VARCHAR(20)" value="SIGLA"/>
<column name="dacr" type="${date.type}" valueDate="${now}"/>
<column name="utcr" type="VARCHAR(20)" value="SIGLA"/>
<column name="pg_ver_rec" type="BIGINT" value="0"/>
</insert>
<insert tableName="albero_main">
<column name="cd_nodo" type="VARCHAR(100)" value="0.CFG.TIPO_FINANZIAMENTO.M"/>
<column name="ds_nodo" type="VARCHAR(200)" value="gestione"/>
<column name="cd_accesso" type="VARCHAR(20)" value="CFGTIPOFINANZIAM"/>
<column name="business_process" type="VARCHAR(200)" value="CRUDTipoFinanziamentoBP"/>
<column name="pg_ordinamento" type="BIGINT" value="10"/>
<column name="fl_terminale" type="CHAR(1)" value="Y"/>
<column name="livello" type="SMALLINT" value="4"/>
<column name="cd_proprio_nodo" type="VARCHAR(100)" value="M"/>
<column name="cd_nodo_padre" type="VARCHAR(100)" value="0.CFG.TIPO_FINANZIAMENTO"/>
<column name="duva" type="${date.type}" valueDate="${now}"/>
<column name="utuv" type="VARCHAR(20)" value="SIGLA"/>
<column name="dacr" type="${date.type}" valueDate="${now}"/>
<column name="utcr" type="VARCHAR(20)" value="SIGLA"/>
<column name="pg_ver_rec" type="BIGINT" value="0"/>
</insert>
<insert tableName="albero_main">
<column name="cd_nodo" type="VARCHAR(100)" value="0.CFG.TIPO_FINANZIAMENTO.V"/>
<column name="ds_nodo" type="VARCHAR(200)" value="visualizzazione"/>
<column name="cd_accesso" type="VARCHAR(20)" value="CFGTIPOFINANZIAM"/>
<column name="business_process" type="VARCHAR(200)" value="CRUDTipoFinanziamentoBP"/>
<column name="pg_ordinamento" type="BIGINT" value="20"/>
<column name="fl_terminale" type="CHAR(1)" value="Y"/>
<column name="livello" type="SMALLINT" value="4"/>
<column name="cd_proprio_nodo" type="VARCHAR(100)" value="V"/>
<column name="cd_nodo_padre" type="VARCHAR(100)" value="0.CFG.TIPO_FINANZIAMENTO"/>
<column name="duva" type="${date.type}" valueDate="${now}"/>
<column name="utuv" type="VARCHAR(20)" value="SIGLA"/>
<column name="dacr" type="${date.type}" valueDate="${now}"/>
<column name="utcr" type="VARCHAR(20)" value="SIGLA"/>
<column name="pg_ver_rec" type="BIGINT" value="0"/>
</insert>
</changeSet>
</databaseChangeLog>


28 changes: 28 additions & 0 deletions sigla-backend/src/test/java/it/cnr/contab/generator/Generator.java
View file
@@ -0,0 +1,28 @@
package it.cnr.contab.generator;

import it.cnr.contab.generator.artifacts.ArtifactGenerator;
import it.cnr.contab.generator.model.GeneratorBean;
import it.cnr.contab.generator.util.DatabaseUtil;

public class Generator {
public static void main(String[] args) {
GeneratorBean bean = new GeneratorBean();
bean.setPackageName("it.cnr.contab.progettiric00.core.bulk");
bean.setSourceFolder("/home/mspasiano/");
bean.setTargetXMLFolder("/home/mspasiano/");
bean.setPrefix("TipoFinanziamento");
bean.setTable("TIPO_FINANZIAMENTO");
bean.setDriver("oracle.jdbc.driver.OracleDriver");
bean.setUrl("jdbc:oracle:thin:@dbtest.cedrc.cnr.it:1521:SIGLAF");
bean.setSchema("PCIR009");
bean.setUser("PCIR009");
bean.setPassword("dbform");
ArtifactGenerator artifactGenerator = new ArtifactGenerator(bean);
try {
DatabaseUtil.getInstance().openConnection(bean);
artifactGenerator.generate();
} catch (Exception e) {
e.printStackTrace();
}
}
}
21 changes: 0 additions & 21 deletions sigla-backend/src/test/java/it/cnr/contab/generator/artifacts/ArtifactGenerator.java
View file
Expand Up @@ -27,27 +27,6 @@ public ArtifactGenerator(GeneratorBean bean) {
this.bean = bean;
}

public static void main(String[] args) {
GeneratorBean bean = new GeneratorBean();
bean.setPackageName("it.cnr.contab.progettiric00.core.bulk");
bean.setSourceFolder("/home/mspasiano/");
bean.setTargetXMLFolder("/home/mspasiano/");
bean.setPrefix("TipoFinanziamento");
bean.setTable("TIPO_FINANZIAMENTO");
bean.setDriver("oracle.jdbc.driver.OracleDriver");
bean.setUrl("jdbc:oracle:thin:@dbtest.cedrc.cnr.it:1521:SIGLAF");
bean.setSchema("PCIR009");
bean.setUser("PCIR009");
bean.setPassword("dbform");
ArtifactGenerator artifactGenerator = new ArtifactGenerator(bean);
try {
DatabaseUtil.getInstance().openConnection(bean);
artifactGenerator.generate();
} catch (Exception e) {
e.printStackTrace();
}
}

public void generate() throws InvocationTargetException, InterruptedException {
try {
doGeneration();
Expand Down
17 changes: 12 additions & 5 deletions sigla-backend/src/test/java/it/cnr/contab/generator/model/TableMetaData.java
View file
Expand Up @@ -8,14 +8,13 @@
import it.cnr.contab.generator.artifacts.Tags;
import it.cnr.contab.generator.properties.Preferences;
import it.cnr.contab.generator.util.DatabaseUtil;
import oracle.jdbc.driver.OracleConnection;
import oracle.jdbc.driver.T4CXAConnection;

import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Vector;
import java.util.*;


/**
Expand All @@ -40,8 +39,16 @@ public List getTableMetaData() throws Exception {
if (dbUtil == null) {
throw new Exception("TableMetaData: la database utility e' NULL");
}
// senza questo setting il commento alle colonne � null
// senza questo setting il commento alle colonne è null
Connection oc = (Connection) dbUtil.getConnection();

Optional.ofNullable(oc)
.filter(OracleConnection.class::isInstance)
.map(OracleConnection.class::cast)
.ifPresent(oracleConnection -> {
oracleConnection.setRemarksReporting(true);
});

//oc.setRemarksReporting(true);

String schema = bean.getSchema();
Expand Down
61 changes: 44 additions & 17 deletions sigla-ejb/src/main/java/it/cnr/contab/progettiric00/core/bulk/TipoFinanziamentoBulk.java
View file
Expand Up @@ -3,22 +3,49 @@
* Date 27/09/2018
*/
package it.cnr.contab.progettiric00.core.bulk;
import it.cnr.jada.action.ActionContext;
import it.cnr.jada.bulk.OggettoBulk;
import it.cnr.jada.util.action.CRUDBP;

import java.util.Dictionary;

public class TipoFinanziamentoBulk extends TipoFinanziamentoBase {
/**
* Created by BulkGenerator 2.0 [07/12/2009]
* Table name: TIPO_FINANZIAMENTO
**/
public TipoFinanziamentoBulk() {
super();
}
/**
* Created by BulkGenerator 2.0 [07/12/2009]
* Table name: TIPO_FINANZIAMENTO
**/
public TipoFinanziamentoBulk(Long id) {
super(id);
}

public static final String CODICE_FOE = "FOE";
public static final String CODICE_FOE_PRO = "FOE_PRO";
public static final String CODICE_AUT = "AUT";
public static final String CODICE_AUT_AREE = "AUT_AREE";
public static final String CODICE_RIM = "RIM";
public static final String CODICE_COF = "COF";
public static final String CODICE_FIN = "FIN";
public static final String CODICE_ATT_COM = "ATT_COM";
public static final String CODICE_ATT_COMM_TAR = "ATT_COMM_TAR";

public final static Dictionary codiceKeys;

static {
codiceKeys = new it.cnr.jada.util.OrderedHashtable();
codiceKeys.put(CODICE_FOE, "FOE");
codiceKeys.put(CODICE_FOE_PRO, "FOE Progetti");
codiceKeys.put(CODICE_AUT, "Autofinanziamento");
codiceKeys.put(CODICE_AUT_AREE, "Autofinanziamento AREE");
codiceKeys.put(CODICE_RIM, "Rimborsi da soggetti terzi");
codiceKeys.put(CODICE_COF, "Cofinanziamento");
codiceKeys.put(CODICE_FIN, "Finanziamento");
codiceKeys.put(CODICE_ATT_COM, "Attività Commerciale pura");
codiceKeys.put(CODICE_ATT_COMM_TAR, "Attività commerciale a tariffario");
};

/**
* Created by BulkGenerator 2.0 [07/12/2009]
* Table name: TIPO_FINANZIAMENTO
**/
public TipoFinanziamentoBulk() {
super();
}

/**
* Created by BulkGenerator 2.0 [07/12/2009]
* Table name: TIPO_FINANZIAMENTO
**/
public TipoFinanziamentoBulk(Long id) {
super(id);
}
}
6 changes: 3 additions & 3 deletions ...n/resources/it/cnr/contab/progettiric00/core/bulk/TipoFinanziamentoBasePersistentInfo.xml
View file
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<SQLPersistentInfo
persistentClassName="TipoFinanziamentoBase"
keyClassName="TipoFinanziamentoKey"
homeClassName="TipoFinanziamentoHome">
persistentClassName="it.cnr.contab.progettiric00.core.bulk.TipoFinanziamentoBase"
keyClassName="it.cnr.contab.progettiric00.core.bulk.TipoFinanziamentoKey"
homeClassName="it.cnr.contab.progettiric00.core.bulk.TipoFinanziamentoHome">
<defaultColumnMap
tableName="TIPO_FINANZIAMENTO">
<columnMapping
Expand Down

0 comments on commit 0486934

Please sign in to comment.