Skip to content

Commit

Permalink
Remove Couchbase code #479
Browse files Browse the repository at this point in the history
  • Loading branch information
@TatianaBurek
TatianaBurek committed May 31, 2023
1 parent b5ce0c8 commit f927fe2
Show file tree
Hide file tree
Showing 12 changed files with 28 additions and 6,712 deletions.
140 changes: 15 additions & 125 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
e.g.
ant all -Dbuild.property.file=fullpath/buildMYSQL-model-vxtest.properties
or
ant all -Dbuild.property.file=fullpath/buildCB-model-vxtest.properties
ant all -Dbuild.property.file=fullpath/build-model-vxtest.properties
IMPORTANT! save your custom propertyfiles somewhere safe
use -Dlog4j2.file=fullpath/customlog4j2.xml to provide a custom log4j2.xml file to replace
the log4j2.xml file in order to customize logging.
use -Ddb.management.system=mariadb
or
-Ddb.management.system=cb
-Ddb.management.system=mariadb
to override the db.management.system property
use -Dcontext.path.suffix to define a context path suffix.
Expand All @@ -48,14 +48,14 @@
e.g -Dpython.env.path=/d1/python/METviewer_py3.6.3/
example build command...
ant -Dbuild.properties.file=$HOME/METViewer/webapp/metviewer/WEB-INF/classes/buildCB-model-vxtest.properties \
-Dlog4j2.file=$HOME/METViewer/webapp/metviewer/WEB-INF/classes/buildCB-model-vxtest.log4j2.xml \
-Ddb.management.system=cb -Dmetcalcpy.path=/d1/python/METcalcpy/ -Dmetplotpy.path=/d1/python/METplotpy/\
-Dmetdataio.path=/d1/python/METdataio/ -Dpython.env.path=/d1/python/METviewer_py3.6.3/ -Dcontext.path.suffix="-cb" clean all
ant -Dbuild.properties.file=$HOME/METViewer/webapp/metviewer/WEB-INF/classes/build-model-vxtest.properties \
-Dlog4j2.file=$HOME/METViewer/webapp/metviewer/WEB-INF/classes/build-model-vxtest.log4j2.xml \
-Ddb.management.system=mariadb -Dmetcalcpy.path=/d1/python/METcalcpy/ -Dmetplotpy.path=/d1/python/METplotpy/\
-Dmetdataio.path=/d1/python/METdataio/ -Dpython.env.path=/d1/python/METviewer_py3.6.3/ -Dcontext.path.suffix="-mariadb" clean all
will produce a war file named metviewer-cb.war with jar files appropriate for couchbase and the properties from the
$HOME/METViewer/webapp/metviewer/WEB-INF/classes/buildCB-model-vxtest.properties file, and a tar file
named metviewer-test.tar also with libraries appropriate for couchbase.
will produce a war file .war with jar files appropriate for mariadb and the properties from the
$HOME/METViewer/webapp/metviewer/WEB-INF/classes/build-model-vxtest.properties file, and a tar file
named metviewer-test.tar also with libraries appropriate for mariadb.
-->

Expand Down Expand Up @@ -109,53 +109,9 @@
<mkdir dir="${dist}"/>
</target>

<path id="cb">
<pathelement location="${lib}/log4j-api-2.17.1.jar"/>
<pathelement location="${lib}/log4j-core-2.17.1.jar"/>
<pathelement location="${lib}/log4j-iostreams-2.17.1.jar"/>
<pathelement location="${lib}/log4j-web-2.17.1.jar"/>
<pathelement location="${lib}/xercesImpl.jar"/>
<pathelement location="${lib}/xml-apis.jar"/>
<pathelement location="${lib}/javax.servlet-api-4.0.1.jar"/>
<pathelement location="${lib}/commons-fileupload-1.4.jar"/>
<pathelement location="${lib}/commons-io-2.8.0.jar"/>
<pathelement location="${lib}/j2html-1.4.0.jar"/>
<pathelement location="${lib}/jackson-core-2.12.0.jar"/>
<pathelement location="${lib}/jackson-databind-2.12.0.jar"/>
<pathelement location="${lib}/commons-lang3-3.11.jar"/>
<pathelement location="${lib}/tomcat-jdbc-8.5.61.jar"/>
<pathelement location="${lib}/juli-6.0.53.jar"/>
<pathelement location="${lib}/junit-4.11.jar"/>
<pathelement location="${lib}/couchbase-core-io-1.5.8.jar"/>
<pathelement location="${lib}/couchbase-java-client-2.5.8.jar"/>
<pathelement location="${lib}/rxjava-1.3.4.jar"/>
<pathelement location="${lib}/snakeyaml-1.27.jar"/>
</path>

<path id="cb-all">
<pathelement location="${lib}/log4j-api-2.17.1.jar"/>
<pathelement location="${lib}/log4j-core-2.17.1.jar"/>
<pathelement location="${lib}/log4j-iostreams-2.17.1.jar"/>
<pathelement location="${lib}/log4j-web-2.17.1.jar"/>
<pathelement location="${lib}/xercesImpl.jar"/>
<pathelement location="${lib}/xml-apis.jar"/>
<pathelement location="${lib}/javax.servlet-api-4.0.1.jar"/>
<pathelement location="${lib}/commons-fileupload-1.4.jar"/>
<pathelement location="${lib}/commons-io-2.8.0.jar"/>
<pathelement location="${lib}/junit-4.11.jar"/>
<pathelement location="${lib}/hamcrest-core-1.3.jar"/>
<pathelement location="${lib}/mockito-all-1.9.5.jar"/>
<pathelement location="${lib}/j2html-1.4.0.jar"/>
<pathelement location="${lib}/jackson-core-2.12.0.jar"/>
<pathelement location="${lib}/jackson-databind-2.12.0.jar"/>
<pathelement location="${lib}/commons-lang3-3.11.jar"/>
<pathelement location="${lib}/tomcat-jdbc-8.5.61.jar"/>
<pathelement location="${lib}/juli-6.0.53.jar"/>
<pathelement location="${lib}/couchbase-core-io-1.5.8.jar"/>
<pathelement location="${lib}/couchbase-java-client-2.5.8.jar"/>
<pathelement location="${lib}/rxjava-1.3.4.jar"/>
<pathelement location="${lib}/snakeyaml-1.27.jar"/>
</path>



<path id="mysql">
<pathelement location="${lib}/log4j-api-2.17.1.jar"/>
Expand Down Expand Up @@ -299,9 +255,7 @@
<condition property="db.management.system.aurora">
<equals arg1="${db.management.system}" arg2="aurora"/>
</condition>
<condition property="db.management.system.cb">
<equals arg1="${db.management.system}" arg2="cb"/>
</condition>

</target>


Expand All @@ -313,18 +267,12 @@
<include name="**/*.java"/>
<exclude name="**/test/**"/>
<!-- aurora-->
<exclude name="edu/ucar/metviewer/db/couchbase/**" if="db.management.system.aurora"/>
<exclude name="edu/ucar/metviewer/db/mariadb/**" if="db.management.system.aurora"/>
<!-- mysql-->
<exclude name="edu/ucar/metviewer/db/aurora/**" if="db.management.system.mysql"/>
<exclude name="edu/ucar/metviewer/db/couchbase/**" if="db.management.system.mysql"/>
<exclude name="edu/ucar/metviewer/db/mariadb/**" if="db.management.system.mysql"/>
<!-- cb-->
<exclude name="edu/ucar/metviewer/db/aurora/**" if="db.management.system.cb"/>
<exclude name="edu/ucar/metviewer/db/mariadb/**" if="db.management.system.cb"/>
<!-- mariadb-->
<exclude name="edu/ucar/metviewer/db/aurora/**" if="db.management.system.mariadb"/>
<exclude name="edu/ucar/metviewer/db/couchbase/**" if="db.management.system.mariadb"/>
<!-- set the refid -->
<classpath refid="${db.management.system}" />
</javac>
Expand All @@ -335,33 +283,21 @@
<!-- Compile the project java files -->
<javac sourcepath="" srcdir="${src}" destdir="${build}" includeantruntime="false">
<include name="**/*.java"/>
<exclude name="edu/ucar/metviewer/db/couchbase/**" if="db.management.system.aurora"/>
<exclude name="**/TestCBDatabaseManager.java" if="db.management.system.aurora"/>
<exclude name="edu/ucar/metviewer/db/mariadb/**" if="db.management.system.aurora"/>
<exclude name="**/TestMariaDbDatabaseManager.java" if="db.management.system.aurora"/>
<exclude name="**/TestMysqlDatabaseManager.java" if="db.management.system.aurora"/>

<exclude name="/edu/ucar/metviewer/db/aurora/**" if="db.management.system.cb"/>
<exclude name="**/TestAuroraDatabaseManager.java" if="db.management.system.cb"/>
<exclude name="edu/ucar/metviewer/db/mariadb/**" if="db.management.system.cb"/>
<exclude name="**/TestMariaDbDatabaseManager.java" if="db.management.system.cb"/>
<exclude name="**/TestMysqlDatabaseManager.java" if="db.management.system.cb"/>

<exclude name="edu/ucar/metviewer/db/aurora/**" if="db.management.system.mariadb"/>
<exclude name="**/TestAuroraDatabaseManager.java" if="db.management.system.mariadb"/>
<exclude name="edu/ucar/metviewer/db/couchbase/**" if="db.management.system.mariadb"/>
<exclude name="**/TestCBDatabaseManager.java" if="db.management.system.mariadb"/>
<exclude name="**/TestMysqlDatabaseManager.java" if="db.management.system.mariadb"/>

<exclude name="edu/ucar/metviewer/db/aurora/**" if="db.management.system.mysql"/>
<exclude name="**/TestAuroraDatabaseManager.java" if="db.management.system.mysql"/>
<exclude name="edu/ucar/metviewer/db/couchbase/**" if="db.management.system.mysql"/>
<exclude name="**/TestCBDatabaseManager.java" if="db.management.system.mysql"/>
<exclude name="edu/ucar/metviewer/db/mariadb/**" if="db.management.system.mysql"/>
<exclude name="**/TestMariaDbDatabaseManager.java" if="db.management.system.mysql"/>

<!-- This includes the db sprecific jar files based on the
path elements specified by refid i.e. mysql, mysql-all, cb, cb-all-->
path elements specified by refid i.e. mysql, mysql-all-->
<classpath refid="${db.management.system}-all"/>
</javac>
</target>
Expand Down Expand Up @@ -411,7 +347,6 @@
<exclude name="**/*.noaa"/>
<exclude name="**/*.dev"/>
<exclude name="webapp/metviewer/WEB-INF/classes/mvservlet_psql.properties"/>
<exclude name="**/buildCB*"/>
<exclude name="**/buildMYSQL*"/>
<exclude name="**/buildMARIADB*"/>
<exclude name="**/buildAURORA*"/>
Expand Down Expand Up @@ -441,18 +376,6 @@
<include name="*.jar"/>
<exclude name="javax.servlet-api-4.0.1.jar"/>

<exclude name="couchbase-core-io-1.5.8.jar" if="db.management.system.mysql"/>
<exclude name="couchbase-java-client-2.5.8.jar" if="db.management.system.mysql"/>
<exclude name="rxjava-1.3.4.jar" if="db.management.system.mysql"/>

<exclude name="couchbase-core-io-1.5.8.jar" if="db.management.system.mariadb"/>
<exclude name="couchbase-java-client-2.5.8.jar" if="db.management.system.mariadb"/>
<exclude name="rxjava-1.3.4.jar" if="db.management.system.mariadb"/>

<exclude name="couchbase-core-io-1.5.8.jar" if="db.management.system.aurora"/>
<exclude name="couchbase-java-client-2.5.8.jar" if="db.management.system.aurora"/>
<exclude name="rxjava-1.3.4.jar" if="db.management.system.aurora"/>

<exclude name="junit-4.11.jar"/>
<exclude name="hamcrest-core-1.3.jar"/>
<exclude name="mockito-all-1.9.5.jar"/>
Expand Down Expand Up @@ -482,7 +405,6 @@
<exclude name="**/*.noaa"/>
<exclude name="**/*.dev"/>
<exclude name="webapp/metviewer/WEB-INF/classes/mvservlet_psql.properties"/>
<exclude name="**/buildCB*"/>
<exclude name="**/buildMYSQL*"/>
<exclude name="**/buildMARIADB*"/>
<exclude name="**/buildAURORA*"/>
Expand Down Expand Up @@ -512,18 +434,6 @@
<include name="*.jar"/>
<exclude name="javax.servlet-api-4.0.1.jar"/>

<exclude name="couchbase-core-io-1.5.8.jar" if="db.management.system.mysql"/>
<exclude name="couchbase-java-client-2.5.8.jar" if="db.management.system.mysql"/>
<exclude name="rxjava-1.3.4.jar" if="db.management.system.mysql"/>

<exclude name="couchbase-core-io-1.5.8.jar" if="db.management.system.mariadb"/>
<exclude name="couchbase-java-client-2.5.8.jar" if="db.management.system.mariadb"/>
<exclude name="rxjava-1.3.4.jar" if="db.management.system.mariadb"/>

<exclude name="couchbase-core-io-1.5.8.jar" if="db.management.system.aurora"/>
<exclude name="couchbase-java-client-2.5.8.jar" if="db.management.system.aurora"/>
<exclude name="rxjava-1.3.4.jar" if="db.management.system.aurora"/>

<exclude name="junit-4.11.jar"/>
<exclude name="hamcrest-core-1.3.jar"/>
<exclude name="mockito-all-1.9.5.jar"/>
Expand Down Expand Up @@ -666,17 +576,7 @@
<tarfileset dir="." prefix="METviewer/">
<exclude name="**/*.war"/>
<exclude name="**/*.tar"/>
<exclude name="lib/couchbase-core-io-1.5.8.jar" if="db.management.system.mysql"/>
<exclude name="couchbase-core-io-1.5.8.jar" if="db.management.system.mysql"/>
<exclude name="couchbase-java-client-2.5.8.jar" if="db.management.system.mysql"/>
<exclude name="rxjava-1.3.4.jar" if="db.management.system.mysql"/>
<exclude name="couchbase-core-io-1.5.8.jar" if="db.management.system.mariadb"/>
<exclude name="couchbase-java-client-2.5.8.jar" if="db.management.system.mariadb"/>
<exclude name="rxjava-1.3.4.jar" if="db.management.system.mariadb"/>
<exclude name="couchbase-core-io-1.5.8.jar" if="db.management.system.aurora"/>
<exclude name="couchbase-java-client-2.5.8.jar" if="db.management.system.aurora"/>
<exclude name="rxjava-1.3.4.jar" if="db.management.system.aurora"/>
<exclude name="mariadb-java-client-2.7.1.jar" if="db.management.system.cb"/>

<include name="bin/**"/>
<include name="dist/lib/metviewer.jar"/>
<include name="R_work/**"/>
Expand Down Expand Up @@ -710,17 +610,7 @@
<tarfileset dir="." prefix="METviewer/">
<exclude name="**/*.war"/>
<exclude name="**/*.tar"/>
<exclude name="lib/couchbase-core-io-1.5.8.jar" if="db.management.system.mysql"/>
<exclude name="couchbase-core-io-1.5.8.jar" if="db.management.system.mysql"/>
<exclude name="couchbase-java-client-2.5.8.jar" if="db.management.system.mysql"/>
<exclude name="rxjava-1.3.4.jar" if="db.management.system.mysql"/>
<exclude name="couchbase-core-io-1.5.8.jar" if="db.management.system.mariadb"/>
<exclude name="couchbase-java-client-2.5.8.jar" if="db.management.system.mariadb"/>
<exclude name="rxjava-1.3.4.jar" if="db.management.system.mariadb"/>
<exclude name="couchbase-core-io-1.5.8.jar" if="db.management.system.aurora"/>
<exclude name="couchbase-java-client-2.5.8.jar" if="db.management.system.aurora"/>
<exclude name="rxjava-1.3.4.jar" if="db.management.system.aurora"/>
<exclude name="mariadb-java-client-2.7.1.jar" if="db.management.system.cb"/>

<include name="bin/**"/>
<include name="dist/lib/metviewer.jar"/>
<include name="R_work/**"/>
Expand Down
23 changes: 3 additions & 20 deletions java/edu/ucar/metviewer/db/DatabaseManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ public abstract class DatabaseManager {

public static final String MYSQL = "mysql";
public static final String MARIADB = "mariadb";
public static final String CB = "cb";
public static final String AURORA = "aurora";

public DatabaseManager(DatabaseInfo databaseInfo) {
Expand Down Expand Up @@ -71,13 +70,7 @@ public static DatabaseManager getLoadManager(
String.class)
.newInstance(databaseInfo, password);
break;
case CB:
databaseManager = (DatabaseManager) Class.forName(
"edu.ucar.metviewer.db.couchbase.CBLoadDatabaseManager")
.getDeclaredConstructor(DatabaseInfo.class,
String.class)
.newInstance(databaseInfo, password);
break;

case MARIADB:
databaseManager = (DatabaseManager) Class.forName(
"edu.ucar.metviewer.db.mariadb.MariaDbLoadDatabaseManager")
Expand Down Expand Up @@ -107,11 +100,7 @@ public static DatabaseManager getAppManager(
DatabaseInfo databaseInfo = new DatabaseInfo(host, user);
databaseInfo.setDbName(database);
DatabaseManager databaseManager;
// NOTE: the contstuctor using reflection is to enable us to build
// a mysql version without a couchbase dependency
// and a CB version without a mysql dependency.
// The build.xml will conditionally leave out the unwanted
// dependencies (jar files) based on db.management.system

switch (dbType) {
case MYSQL:
databaseManager = (DatabaseManager) Class.forName(
Expand All @@ -120,13 +109,7 @@ public static DatabaseManager getAppManager(
String.class)
.newInstance(databaseInfo, password);
break;
case CB:
databaseManager = (DatabaseManager) Class.forName(
"edu.ucar.metviewer.db.couchbase.CBAppDatabaseManager")
.getDeclaredConstructor(DatabaseInfo.class,
String.class)
.newInstance(databaseInfo, password);
break;

case MARIADB:
databaseManager = (DatabaseManager) Class.forName(
"edu.ucar.metviewer.db.mariadb.MariaDbAppDatabaseManager")
Expand Down
Loading

0 comments on commit f927fe2

Please sign in to comment.