1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

- MDEV-11067 suggested to add configuration support to the Apache wrapper.

Directly install a precompiled JavaWrappers.jar file.
  modified:   storage/connect/CMakeLists.txt
  added:      storage/connect/JavaWrappers.jar
  removed:    storage/connect/ApacheInterface.class
  removed:    storage/connect/JdbcInterface.class
  removed:    storage/connect/MariadbInterface.class
  removed:    storage/connect/MysqlInterface.class
  removed:    storage/connect/OracleInterface.class
  removed:    storage/connect/PostgresqlInterface.class
This commit is contained in:
Olivier Bertrand
2016-11-13 23:41:58 +01:00
parent bc65996b82
commit db926c385e
8 changed files with 3 additions and 6 deletions

View File

@@ -265,17 +265,14 @@ IF(CONNECT_WITH_JDBC)
jdbconn.cpp tabjdbc.cpp jdbconn.h tabjdbc.h jdbccat.h
JdbcInterface.java ApacheInterface.java MariadbInterface.java
MysqlInterface.java OracleInterface.java PostgresqlInterface.java
JdbcInterface.class ApacheInterface.class MariadbInterface.class
MysqlInterface.class OracleInterface.class PostgresqlInterface.class)
JavaWrappers.jar)
# TODO: Find how to compile and install the java wrapper classes
# Find required libraries and include directories
SET (JAVA_SOURCES JdbcInterface.java)
add_jar(JdbcInterface ${JAVA_SOURCES})
install_jar(JdbcInterface DESTINATION ${INSTALL_PLUGINDIR} COMPONENT connect-engine)
SET (JAVA_CLASSES JdbcInterface.class ApacheInterface.class MariadbInterface.class
MysqlInterface.class OracleInterface.class PostgresqlInterface.class)
add_jar(JavaWrappers ${JAVA_CLASSES})
install_jar(JavaWrappers DESTINATION ${INSTALL_PLUGINDIR} COMPONENT connect-engine)
INSTALL(FILES ${CURRENT_SOURCE_DIR}/JavaWrappers.jar
DESTINATION ${INSTALL_PLUGINDIR} COMPONENT connect-engine)
add_definitions(-DJDBC_SUPPORT)
ELSE()
SET(JDBC_LIBRARY "")

Binary file not shown.

Binary file not shown.

Binary file not shown.