diff options
Diffstat (limited to 'storage/connect/javaconn.cpp')
| -rw-r--r-- | storage/connect/javaconn.cpp | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/storage/connect/javaconn.cpp b/storage/connect/javaconn.cpp index e3f64d17064..cdf925d63a7 100644 --- a/storage/connect/javaconn.cpp +++ b/storage/connect/javaconn.cpp @@ -1,7 +1,7 @@ /************ Javaconn C++ Functions Source Code File (.CPP) ***********/ -/* Name: JAVAConn.CPP Version 1.0 */ +/* Name: JAVAConn.CPP Version 1.1 */ /* */ -/* (C) Copyright to the author Olivier BERTRAND 2017 */ +/* (C) Copyright to the author Olivier BERTRAND 2017 - 2021 */ /* */ /* This file contains the JAVA connection classes functions. */ /***********************************************************************/ @@ -400,24 +400,35 @@ bool JAVAConn::Open(PGLOBAL g) jpop->Append(ClassPath); } // endif ClassPath - // Java source will be compiled as a jar file installed in the plugin dir +#if 0 + // Java source will be compiled as a jar file installed in the plugin dir jpop->Append(sep); jpop->Append(GetPluginDir()); jpop->Append("JdbcInterface.jar"); +#endif // 0 // All wrappers are pre-compiled in JavaWrappers.jar in the plugin dir jpop->Append(sep); jpop->Append(GetPluginDir()); jpop->Append("JavaWrappers.jar"); +#if defined(MONGO_SUPPORT) + jpop->Append(sep); + jpop->Append(GetPluginDir()); + jpop->Append("Mongo3.jar"); + jpop->Append(sep); + jpop->Append(GetPluginDir()); + jpop->Append("Mongo2.jar"); +#endif // MONGO_SUPPORT + if ((cp = getenv("CLASSPATH"))) { jpop->Append(sep); jpop->Append(cp); } // endif cp if (trace(1)) { - htrc("ClassPath=%s\n", ClassPath); - htrc("CLASSPATH=%s\n", cp); + htrc("ClassPath=%s\n", ClassPath ? ClassPath : "null"); + htrc("CLASSPATH=%s\n", cp ? cp : "null"); htrc("%s\n", jpop->GetStr()); } // endif trace |