Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<runtime name="Apache Tomcat v10.0"/>
<fixed facet="wst.jsdt.web"/>
<installed facet="java" version="12"/>
<installed facet="jst.web" version="5.0"/>
Expand Down
67 changes: 41 additions & 26 deletions appcontainerapp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@
<url>https://github.com/rtdi/AppContainer</url>
</scm>
<properties>
<jersey>3.1.0</jersey>
<swagger>2.2.7</swagger>
<tomcatversion>10.0.13</tomcatversion>
<jersey>3.1.8</jersey>
<swagger>2.2.22</swagger>
</properties>
<repositories>
<repository>
Expand All @@ -29,7 +28,7 @@
</repository>
<repository>
<id>github</id>
<url>https://maven.pkg.github.com/rtdi/*</url>
<url>https://maven.pkg.github.com/rtdi</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
Expand All @@ -53,19 +52,24 @@
<warSourceDirectory>src/main/webapp</warSourceDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.17.1</version>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.0.0</version>
<version>6.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.rtdi.appcontainer</groupId>
<artifactId>JDBCoData</artifactId>
<version>0.2.1</version>
<version>0.2.2</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
Expand All @@ -78,9 +82,9 @@
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
<version>2.0.6</version>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
<version>2.1.0-alpha1</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
Expand All @@ -100,7 +104,7 @@
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>4.0.1</version>
<version>4.0.5</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
Expand All @@ -113,9 +117,9 @@
<version>${jersey}</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.4.0-b180830.0359</version>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.4.0-b180830.0359</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down Expand Up @@ -151,9 +155,9 @@
<version>${swagger}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>5.2.1</version>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>5.4.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -171,6 +175,11 @@
<artifactId>dbactivationhana</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>io.rtdi.appcontainer</groupId>
<artifactId>dbactivationabap</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>io.rtdi.appcontainer</groupId>
<artifactId>dbactivationsqlserver</artifactId>
Expand All @@ -189,7 +198,7 @@
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
<version>6.4.0.202211300538-r</version>
<version>7.1.0.202411261347-r</version>
</dependency>
<dependency>
<groupId>io.rtdi.appcontainer</groupId>
Expand All @@ -206,7 +215,13 @@
<dependency>
<groupId>net.snowflake</groupId>
<artifactId>snowflake-jdbc</artifactId>
<version>3.13.29</version>
<version>3.21.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.rtdi.appcontainer</groupId>
<artifactId>abaprealm</artifactId>
<version>${appcontainerrealm}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -218,7 +233,7 @@
<dependency>
<groupId>com.sap.cloud.db.jdbc</groupId>
<artifactId>ngdbc</artifactId>
<version>2.15.10</version>
<version>2.23.7</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -230,7 +245,7 @@
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>11.2.2.jre17</version>
<version>12.9.0.jre11-preview</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -242,7 +257,7 @@
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>8.0.31</version>
<version>9.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -254,14 +269,14 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.5.1</version>
<version>42.7.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>${tomcatversion}</version>
<scope>test</scope>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>${tomcatversion}</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@
import io.rtdi.appcontainer.databaseloginrealm.IDatabaseLoginPrincipal;
import io.rtdi.appcontainer.db.rest.entity.SQLQueryResult;
import io.rtdi.appcontainer.dbactivationbase.AppContainerSQLException;
import io.rtdi.appcontainer.plugins.database.IDatabaseProvider;
import io.rtdi.appcontainer.rest.RestService;
import io.rtdi.appcontainer.rest.entity.CustomSuccessMessage;
import io.rtdi.appcontainer.rest.entity.ErrorMessage;
import io.rtdi.appcontainer.servlets.DatabaseServlet;
import io.rtdi.appcontainer.utils.DatabaseProvider;
import io.rtdi.appcontainer.utils.Util;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
Expand Down Expand Up @@ -114,8 +116,8 @@ public Response readTable(
if (limit < 1) {
limit = 1000;
}
StringBuffer sql = new StringBuffer();
sql.append("select top ").append(limit).append(" ");
StringBuilder sql = new StringBuilder();
sql.append("select ");
if (select != null) {
String[] projections = select.split("\\,");
boolean first = true;
Expand All @@ -141,7 +143,8 @@ public Response readTable(
if (where != null && where.length() != 0) {
sql.append("where ").append(where);
}

IDatabaseProvider provider = DatabaseProvider.getDatabaseProvider(servletContext, dbprincipal.getDriver());
provider.addLimitClause(sql, limit, null);
try (PreparedStatement stmt = conn.prepareStatement(sql.toString());) {
SQLQueryResult result = new SQLQueryResult(sql.toString());
try (ResultSet rs = stmt.executeQuery(); ) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@
import io.rtdi.appcontainer.databaseloginrealm.IDatabaseLoginPrincipal;
import io.rtdi.appcontainer.db.rest.entity.SQLResultSet;
import io.rtdi.appcontainer.dbactivationbase.AppContainerSQLException;
import io.rtdi.appcontainer.plugins.database.IDatabaseProvider;
import io.rtdi.appcontainer.rest.RestService;
import io.rtdi.appcontainer.rest.entity.CustomSuccessMessage;
import io.rtdi.appcontainer.rest.entity.ErrorMessage;
import io.rtdi.appcontainer.servlets.DatabaseServlet;
import io.rtdi.appcontainer.utils.DatabaseProvider;
import io.rtdi.appcontainer.utils.Util;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
Expand Down Expand Up @@ -105,8 +107,8 @@ public Response lookupRecord(
try (Connection conn = dbprincipal.getConnection();) {
String schema = Util.decodeURIfull(schemaraw);
schema = Util.getSchema(schema, request);
StringBuffer sql = new StringBuffer();
sql.append("select top 1 ");
StringBuilder sql = new StringBuilder();
sql.append("select ");
if (select != null) {
String[] projections = select.split("\\,");
boolean first = true;
Expand All @@ -132,7 +134,8 @@ public Response lookupRecord(
if (where != null && where.length() != 0) {
sql.append("where ").append(where);
}

IDatabaseProvider provider = DatabaseProvider.getDatabaseProvider(servletContext, dbprincipal.getDriver());
sql = provider.addLimitClause(sql, 1, null);
try (PreparedStatement stmt = conn.prepareStatement(sql.toString());) {
try (ResultSet rs = stmt.executeQuery(); ) {
SQLResultSet rootnode = new SQLResultSet(rs, sql.toString());
Expand Down
4 changes: 2 additions & 2 deletions appcontainerapp/src/main/webapp/ui5libs/amcharts/base/Line.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ sap.ui.define([
return Graphics.extend("ui5libs.amcharts.base.Line", {
metadata: {
properties: {
points : {type: "ui5libs.amcharts.IPoint[]"},
segments : {type: "ui5libs.amcharts.IPoint[]"},
points : {type: "ui5libs.amcharts.base.IPoint[]"},
segments : {type: "ui5libs.amcharts.base.IPoint[]"},
},
},
_buildSettings : function() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ sap.ui.define([
},
aggregations: {
colors: {type: "ui5libs.amcharts.base.ColorSet", multiple: false },
labels: {type: "ui5libs.amcharts.base.RadialLabel", multiple: false },
ticks: {type: "ui5libs.amcharts.base.Tick", multiple: false },
slices: {type: "ui5libs.amcharts.base.Tick", multiple: false },
}
},
_buildSettings : function() {
Expand All @@ -34,5 +37,16 @@ sap.ui.define([
getDefaultTemplate : function() {
return this.container.slices.template;
},
applyTemplates : function() {
Series.prototype.applyTemplates.apply(this);
var labels = this.getLabels();
if (labels) {
this.container.labels.template.setAll(labels._buildSettings());
}
var ticks = this.getTicks();
if (ticks) {
this.container.ticks.template.setAll(ticks._buildSettings());
}
},
});
});
20 changes: 20 additions & 0 deletions dbactivationabap/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.rtdi.appcontainer</groupId>
<artifactId>appcontainerbase</artifactId>
<version>${revision}</version>
</parent>
<artifactId>dbactivationabap</artifactId>
<build>
<plugins>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>io.rtdi.appcontainer</groupId>
<artifactId>dbactivationbase</artifactId>
<version>${revision}</version>
</dependency>
</dependencies>
</project>
3 changes: 3 additions & 0 deletions dbactivationabap/src/main/java/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Manifest-Version: 1.0
Class-Path:

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
io.rtdi.appcontainer.plugins.databaseabap.ABAPProvider
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package io.rtdi.appcontainer.plugins.databaseabap;

import java.nio.file.Path;

import io.rtdi.appcontainer.plugins.database.ActivationServiceDirectory;

public class AbapActivationServiceDirectory extends ActivationServiceDirectory {

protected AbapActivationServiceDirectory(Path rootpath) {
super(rootpath);
}

@Override
protected void addServices() {
}


}
Loading
Loading