- MDEV-11067 suggested to add configuration support to the Apache wra…

…pper. 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
MariaDB · Nov 13, 2016 · db926c3 · db926c3
1 parent bc65996
commit db926c3
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 6 deletions.
diff --git a/storage/connect/ApacheInterface.class b/storage/connect/ApacheInterface.class
diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt
@@ -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 "")

diff --git a/storage/connect/JavaWrappers.jar b/storage/connect/JavaWrappers.jar
diff --git a/storage/connect/JdbcInterface.class b/storage/connect/JdbcInterface.class
diff --git a/storage/connect/MariadbInterface.class b/storage/connect/MariadbInterface.class
diff --git a/storage/connect/MysqlInterface.class b/storage/connect/MysqlInterface.class
diff --git a/storage/connect/OracleInterface.class b/storage/connect/OracleInterface.class
diff --git a/storage/connect/PostgresqlInterface.class b/storage/connect/PostgresqlInterface.class