diff --git a/src/main/java/de/tvo/database/DBHandler.java b/src/main/java/de/tvo/database/DBHandler.java
index 68b8566..f5792e4 100644
--- a/src/main/java/de/tvo/database/DBHandler.java
+++ b/src/main/java/de/tvo/database/DBHandler.java
@@ -715,7 +715,7 @@ public class DBHandler {
public Connection getConnection() {
try {
Connection con = ((DataSource) new InitialContext().lookup(DBTools.getJNDIConnectionString(SCHEMA))).getConnection();
- if (!SCHEMA.equals(SchemataENUM.GTMS) && !SCHEMA.equals(SchemataENUM.GTMS5)) {
+ if (!SCHEMA.equals(SchemataENUM.MARIADBNL)) {
con.setSchema(SCHEMA.name());
}
return con;
diff --git a/src/main/java/de/tvo/database/tables/NLCONNECT/Nlconnect.java b/src/main/java/de/tvo/database/tables/NLCONNECT/Nlconnect.java
index 608ed0a..e729b7b 100644
--- a/src/main/java/de/tvo/database/tables/NLCONNECT/Nlconnect.java
+++ b/src/main/java/de/tvo/database/tables/NLCONNECT/Nlconnect.java
@@ -1,19 +1,60 @@
package de.tvo.database.tables.NLCONNECT;
import java.io.Serializable;
+import java.math.BigInteger;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
public class Nlconnect implements Serializable {
private static final long serialVersionUID = 1L;
- private Integer m_ncid = null;
- private String m_nchostname = null;
- private String m_ncipadress = null;
- private Integer m_ncport = null;
- private String m_nctoken = null;
- private String m_nctype = null;
- private Integer m_nccountpanel = null;
- private Integer m_ncactiv = 0;
+ @Id
+ @GeneratedValue(strategy=GenerationType.IDENTITY)
+ @Column(unique=true, nullable=false)
+ private BigInteger ncid = null;
+ public BigInteger getNcid() { return ncid; }
+ public void setNcid(final BigInteger ncid) { this.ncid = ncid; }
+
+ @Column(length=255, nullable = false)
+ private String nchostname = null;
+ public String getNchostname() { return nchostname; }
+ public void setNchostname(String nchostname) { this.nchostname = nchostname; }
+
+ @Column(length=16, nullable = false)
+ private String ncipadress = null;
+
+ @Column(precision=9, nullable = false)
+ private Integer ncport = null;
+ public Integer getNcport() { return ncport; }
+ public void setNcport(Integer ncport) { this.ncport = ncport; }
+
+
+ @Column(length=50, nullable = false)
+ private String nctoken = null;
+ public String getNctoken() { return nctoken; }
+ public void setNctoken(String nctoken) { this.nctoken = nctoken; }
+
+ @Column(length=40, nullable = false)
+ private String nctype = null;
+ public String getNctype() { return nctype; }
+ public void setNctype(String nctype) { this.nctype = nctype; }
+
+ @Column(precision=9, nullable = false)
+ private Integer nccountpanel = null;
+ public Integer getNccountpanel() { return nccountpanel; }
+ public void setNccountpanel(Integer nccountpanel) { this.nccountpanel = nccountpanel; }
+
+ @Column(precision=9, nullable = false)
+ private Integer ncactiv = null;
+ public Integer getNcactiv() { return ncactiv; }
+ public void setNcactiv(Integer ncactiv) { this.ncactiv = ncactiv; }
+
+
+
public Nlconnect() {
diff --git a/src/main/java/de/tvo/database/tables/NLPANEL/Nlpanel.java b/src/main/java/de/tvo/database/tables/NLPANEL/Nlpanel.java
index 13ebf12..b919ba0 100644
--- a/src/main/java/de/tvo/database/tables/NLPANEL/Nlpanel.java
+++ b/src/main/java/de/tvo/database/tables/NLPANEL/Nlpanel.java
@@ -1,16 +1,47 @@
package de.tvo.database.tables.NLPANEL;
import java.io.Serializable;
+import java.math.BigInteger;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+
+@Entity
+@Table(name="NLPANEL")
+//@NamedQuery(name="Nlpanel.findAll", query="SELECT g FROM NLPANEL")
public class Nlpanel implements Serializable {
private static final long serialVersionUID = 1L;
- private Integer m_npid = null;
- private Integer m_npnanopanelid = null;
- private Integer m_npmatrixx = null;
- private Integer m_npmatrixy = null;
+
+ @Id
+ @GeneratedValue(strategy=GenerationType.IDENTITY)
+ @Column(unique=true, nullable=false)
+ private BigInteger npid = null;
+ public BigInteger getNpid() { return npid; }
+ public void setNpid(final BigInteger npid) { this.npid = npid; }
+
+
+ @Column(precision=9, nullable = false)
+ private Integer npnanopanelid = null;
+ public Integer getNpnanopanelid() { return npnanopanelid; }
+ public void setNpnanopanelid(Integer npnanopanelid) { this.npnanopanelid = npnanopanelid; }
+ @Column(precision=9, nullable = false)
+ private Integer npmatrixx = null;
+ public Integer getNpmatrixx() { return npmatrixx; }
+ public void setNpmatrixx(Integer npmatrixx) { this.npmatrixx = npmatrixx; }
+
+ @Column(precision=9, nullable = false)
+ private Integer npmatrixy = null;
+ public Integer getNpmatrixy() { return npmatrixy; }
+ public void setNpmatrixy(Integer npmatrixy) { this.npmatrixy = npmatrixy; }
+
+
public Nlpanel() {
}
diff --git a/src/main/java/de/tvo/toolset/DBTools.java b/src/main/java/de/tvo/toolset/DBTools.java
index c343a77..349a853 100644
--- a/src/main/java/de/tvo/toolset/DBTools.java
+++ b/src/main/java/de/tvo/toolset/DBTools.java
@@ -13,107 +13,39 @@ import org.hibernate.engine.jdbc.internal.BasicFormatterImpl;
public class DBTools {
public enum SchemataENUM{
- GEISV8E, GEICOMV5, GEICOMV8, GEIDATV5, GEIDATV8, GEISDTA, GEISDTT, GEISZBV, GEISZBVT, LWIS12DTA, LWIS12DTT, GEISV8T, TSTCOMV5, TSTCOMV8, TSTDATV5, TSTDATV8, GEISWPT, GEISWPE, GEISPGM, IMGTST, IMGPRD , DWH_CORE, TESTV8, ECHTV8, GTMS, GTMS5, MARIADBCRM, DWH_ROADMAP, GEISTBT, GEISTBE,
+ MARIADBNL,
}
public static DbENUM getDBName(SchemataENUM schema){
switch (schema) {
/* DB2 / AS400 Schematas */
- case GEISV8E:
- case GEICOMV5:
- case GEICOMV8:
- case GEIDATV8:
- case GEIDATV5:
- case GEISDTA:
- case GEISDTT:
- case GEISZBV:
- case GEISZBVT:
- case LWIS12DTA:
- case LWIS12DTT:
- case GEISV8T:
- case TSTCOMV5:
- case TSTCOMV8:
- case TSTDATV5:
- case TSTDATV8:
- case GEISPGM:
- case IMGTST:
- case IMGPRD:
- case TESTV8:
- case ECHTV8:
- case GEISTBT:
- case GEISTBE:
- return DbENUM.DB2;
-
- case GEISWPE:
- case GEISWPT:
- return DbENUM.DB2SYS;
-
- case GTMS:
- return DbENUM.DB2GTMS;
-
- case GTMS5:
- return DbENUM.DB2GTMS5;
-
-// MSSQL DWH Schematas
- case DWH_CORE:
- return DbENUM.MSSQL_DWH;
-
- case DWH_ROADMAP:
- return DbENUM.MSSQL_DWH_ROADMAP;
-
+ case MARIADBNL:
+
+ return DbENUM.MARIADBNL;
- case MARIADBCRM:
- return DbENUM.MARIADBCRM;
-
- /* MYSQL Schematas
- return DbENUM.MYSQL;
+
- Default Rückfall */
+ //Default Rückfall */
default:
- return DbENUM.DB2;
+ return DbENUM.MARIADBNL;
}
}
public static String getJNDIConnectionString(SchemataENUM schema){
switch (getDBName(schema)) {
/* DB2 / AS400 Schematas */
- case DB2:
- return "java:comp/env/jdbc/db2";
-
- /* DB2 / AS400 Schematas SYSTEM */
- case DB2SYS:
- return "java:comp/env/jdbc/db2sys";
-
- /* DB2 GTMS / AS400 Schematas */
- case DB2GTMS:
- return "java:comp/env/jdbc/db2gtms";
-
- /* DB2 GTMS / AS400 Schematas GEISAS05 */
- case DB2GTMS5:
- return "java:comp/env/jdbc/db2gtms5";
- /* MSSQL Schematas */
- case MSSQL_DWH:
- return "java:comp/env/jdbc/mssqldwh";
-
- case MSSQL_DWH_ROADMAP:
- return "java:comp/env/jdbc/mssqldwhroadmap";
-
- /* MYSQL Schematas */
- case MYSQL:
- return "java:comp/env/jdbc/mysql";
-
- case MARIADBCRM:
- return "java:comp/env/jdbc/mariadbcrm";
+ case MARIADBNL:
+ return "java:comp/env/jdbc/mariadbnl";
/* Default Rückfall */
default:
- return "java:comp/env/jdbc/db2sys";
+ return "java:comp/env/jdbc/mariadbnl";
}
}
public enum DbENUM{
- DB2,DB2SYS,DB2GTMS,DB2GTMS5,MSSQL_DWH,MYSQL,MSSQL,MARIADBCRM,MSSQL_DWH_ROADMAP
+ MARIADBNL, ;
}
/**
diff --git a/src/main/resources/META-INF/MARIADBNL.cfg.xml b/src/main/resources/META-INF/MARIADBNL.cfg.xml
new file mode 100644
index 0000000..45099bc
--- /dev/null
+++ b/src/main/resources/META-INF/MARIADBNL.cfg.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+ vtigercrm
+ org.hibernate.dialect.MariaDBDialect
+ java:comp/env/jdbc/mariadbnl
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
new file mode 100644
index 0000000..b2095f6
--- /dev/null
+++ b/src/main/resources/META-INF/persistence.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ org.hibernate.ejb.HibernatePersistence
+
+
+
+
+
+
+
diff --git a/src/main/resources/META-INF/services/javax.xml.soap.MetaFactory b/src/main/resources/META-INF/services/javax.xml.soap.MetaFactory
new file mode 100644
index 0000000..fbf3f5c
--- /dev/null
+++ b/src/main/resources/META-INF/services/javax.xml.soap.MetaFactory
@@ -0,0 +1 @@
+com.sun.xml.messaging.saaj.soap.SAAJMetaFactoryImpl
\ No newline at end of file
diff --git a/src/main/resources/META-INF/services/javax.xml.soap.SAAJMetaFactory b/src/main/resources/META-INF/services/javax.xml.soap.SAAJMetaFactory
new file mode 100644
index 0000000..fbf3f5c
--- /dev/null
+++ b/src/main/resources/META-INF/services/javax.xml.soap.SAAJMetaFactory
@@ -0,0 +1 @@
+com.sun.xml.messaging.saaj.soap.SAAJMetaFactoryImpl
\ No newline at end of file
diff --git a/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider b/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider
new file mode 100644
index 0000000..22547fd
--- /dev/null
+++ b/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider
@@ -0,0 +1 @@
+org.apache.cxf.jaxws.spi.ProviderImpl
\ No newline at end of file
diff --git a/src/main/webapp/META-INF/context.xml b/src/main/webapp/META-INF/context.xml
index a4415d9..13b3f43 100644
--- a/src/main/webapp/META-INF/context.xml
+++ b/src/main/webapp/META-INF/context.xml
@@ -13,7 +13,7 @@ consequence.