From: Arthur Martella Date: Mon, 29 Oct 2018 14:35:33 +0000 (-0400) Subject: Migrate MDBC code to org.onap.music X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6b1bf7d48b3e0c0f775a1a13c082ee52cfda4756;p=music%2Fmdbc.git Migrate MDBC code to org.onap.music Patch set 2 now includes moving files in src/test/java Change-Id: Ic722bed9574f75d90b5b582247fec61084772cb8 Issue-ID: MUSIC-155 Signed-off-by: Arthur Martella --- diff --git a/README.md b/README.md index 2d21c3b..8f21f2e 100755 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ mvn install:install-file -Dfile=target/MUSIC.jar -DpomFile=./pom.xml 1) Create a configuration file using as a template: -src/main/java/com/att/research/mdbc/configurations/tableConfiguration.json +src/main/java/org/onap/music/mdbc/configurations/tableConfiguration.json The meaning of the fields is as follows: @@ -45,11 +45,11 @@ o replicationFactor: indicates the needs of replication for this partition (the 2) Create the configuration for each node using the command line program in the following location: -src/main/java/com/att/research/mdbc/tools/CreateNodeConfiguration.java +src/main/java/org/onap/music/mdbc/tools/CreateNodeConfiguration.java To run it, use the following parameters: --t ../ETDB/src/main/java/com/att/research/mdbc/configurations/tableConfiguration.json -b base -o /Users/quique/Desktop/ +-t ../ETDB/src/main/java/org/onap/music/mdbc/configurations/tableConfiguration.json -b base -o /Users/quique/Desktop/ This program is going to generate all the required configuration json for each ETDB node in the system and additionally initialize all the corresponding rows and tables for the system to correctly work. The meaning of the parameters is: • -t: the tableConfiguration.json explained in the step 1 @@ -63,11 +63,11 @@ Some notes about the limitations of this command line program: 3) Run each of the server in its corresponding node: The ETDB server can be found in the file: -src/main/java/com/att/research/mdbc/MdbcServer.java +src/main/java/org/onap/music/mdbc/MdbcServer.java It requires three parameters: - -c ../ETDB/src/main/java/com/att/research/mdbc/configurations/config-0.json -u jdbc:mysql://localhost -p 30000 + -c ../ETDB/src/main/java/org/onap/music/mdbc/configurations/config-0.json -u jdbc:mysql://localhost -p 30000 -c is a json with the configuration created in step 2. • -u is where the local mysql database is located (without the database name, just the url, see example) @@ -75,7 +75,7 @@ It requires three parameters: 4) Run the clients. A client example can be found in this folder: -src/main/java/com/att/research/mdbc/examples +src/main/java/org/onap/music/mdbc/examples ## Building METRIC @@ -113,7 +113,7 @@ Dirty rows will be copied, as needed back into the database from Cassandra befor 3. If you supply properties to the DriverManager.getConnection(String, Properties) call, use the properties defined below to control behavior of the proxy. 4. Load the driver using the following call: - Class.forName("com.att.research.mdbc.ProxyDriver"); + Class.forName("org.onap.music.mdbc.ProxyDriver"); The following properties can be passed to the JDBC DriverManager.getConnection(String, Properties) call to influence how METRIC works. @@ -160,14 +160,14 @@ these tags. - - com.att.research.mdbc.ProxyDriver + + org.onap.music.mdbc.ProxyDriver ``` -Note: This assumes that you have built and installed the com.att.research.mdbc module within JBoss. +Note: This assumes that you have built and installed the org.onap.music.mdbc module within JBoss. ### To Define a Tomcat DataSource Resource @@ -181,7 +181,7 @@ probably need to make changes to the _connectionProperties_ attribute. type="javax.sql.DataSource" factory="org.apache.tomcat.jdbc.pool.DataSourceFactory" uniqueResourceName="process-engine" - driverClassName="com.att.research.mdbc.ProxyDriver" + driverClassName="org.onap.music.mdbc.ProxyDriver" url="jdbc:mdbc:./camunda-h2-dbs/process-engine;MVCC=TRUE;TRACE_LEVEL_FILE=0;DB_CLOSE_ON_EXIT=FALSE" connectionProperties="myid=0;replicas=0,1,2;music_keyspace=camunda;music_address=localhost" username="sa" @@ -205,7 +205,7 @@ or local file based (`jdbc:h2:path_to_file`) database. ## Testing Mixin Combinations -The files under `src/main/java/com/att/research/mdbc/tests` can be used to test various METRIC +The files under `src/main/java/org/onap/music/mdbc/tests` can be used to test various METRIC operations with various combinations of Mixins. The tests are controlled via the file `src/main/resources/tests.json`. More details are available in the javadoc for this package. diff --git a/pom.xml b/pom.xml index d1f3ef7..05994f5 100755 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - com.att.research.mdbc + org.onap.music.mdbc mdbc 0.0.1-SNAPSHOT mdbc diff --git a/src/main/java/com/att/research/exceptions/MDBCServiceException.java b/src/main/java/org/onap/music/exceptions/MDBCServiceException.java similarity index 98% rename from src/main/java/com/att/research/exceptions/MDBCServiceException.java rename to src/main/java/org/onap/music/exceptions/MDBCServiceException.java index 46cc1f7..9be84e5 100644 --- a/src/main/java/com/att/research/exceptions/MDBCServiceException.java +++ b/src/main/java/org/onap/music/exceptions/MDBCServiceException.java @@ -20,7 +20,7 @@ * ==================================================================== */ -package com.att.research.exceptions; +package org.onap.music.exceptions; /** * @author inam diff --git a/src/main/java/com/att/research/exceptions/QueryException.java b/src/main/java/org/onap/music/exceptions/QueryException.java similarity index 98% rename from src/main/java/com/att/research/exceptions/QueryException.java rename to src/main/java/org/onap/music/exceptions/QueryException.java index 77445e5..72a7cee 100644 --- a/src/main/java/com/att/research/exceptions/QueryException.java +++ b/src/main/java/org/onap/music/exceptions/QueryException.java @@ -19,7 +19,7 @@ * ============LICENSE_END============================================= * ==================================================================== */ -package com.att.research.exceptions; +package org.onap.music.exceptions; diff --git a/src/main/java/com/att/research/logging/EELFLoggerDelegate.java b/src/main/java/org/onap/music/logging/EELFLoggerDelegate.java similarity index 99% rename from src/main/java/com/att/research/logging/EELFLoggerDelegate.java rename to src/main/java/org/onap/music/logging/EELFLoggerDelegate.java index 4e29a75..16a70dd 100644 --- a/src/main/java/com/att/research/logging/EELFLoggerDelegate.java +++ b/src/main/java/org/onap/music/logging/EELFLoggerDelegate.java @@ -1,5 +1,5 @@ -package com.att.research.logging; +package org.onap.music.logging; import static com.att.eelf.configuration.Configuration.MDC_SERVER_FQDN; import static com.att.eelf.configuration.Configuration.MDC_SERVER_IP_ADDRESS; diff --git a/src/main/java/com/att/research/logging/format/AppMessages.java b/src/main/java/org/onap/music/logging/format/AppMessages.java similarity index 99% rename from src/main/java/com/att/research/logging/format/AppMessages.java rename to src/main/java/org/onap/music/logging/format/AppMessages.java index a5de413..304719c 100644 --- a/src/main/java/com/att/research/logging/format/AppMessages.java +++ b/src/main/java/org/onap/music/logging/format/AppMessages.java @@ -20,7 +20,7 @@ * ==================================================================== */ -package com.att.research.logging.format; +package org.onap.music.logging.format; /** * @author inam diff --git a/src/main/java/com/att/research/logging/format/ErrorSeverity.java b/src/main/java/org/onap/music/logging/format/ErrorSeverity.java similarity index 96% rename from src/main/java/com/att/research/logging/format/ErrorSeverity.java rename to src/main/java/org/onap/music/logging/format/ErrorSeverity.java index dbe3e54..49cc2f4 100644 --- a/src/main/java/com/att/research/logging/format/ErrorSeverity.java +++ b/src/main/java/org/onap/music/logging/format/ErrorSeverity.java @@ -19,7 +19,7 @@ * ============LICENSE_END============================================= * ==================================================================== */ -package com.att.research.logging.format; +package org.onap.music.logging.format; /** * @author inam diff --git a/src/main/java/com/att/research/logging/format/ErrorTypes.java b/src/main/java/org/onap/music/logging/format/ErrorTypes.java similarity index 96% rename from src/main/java/com/att/research/logging/format/ErrorTypes.java rename to src/main/java/org/onap/music/logging/format/ErrorTypes.java index 620528d..89dd5f8 100644 --- a/src/main/java/com/att/research/logging/format/ErrorTypes.java +++ b/src/main/java/org/onap/music/logging/format/ErrorTypes.java @@ -19,7 +19,7 @@ * ============LICENSE_END============================================= * ==================================================================== */ -package com.att.research.logging.format; +package org.onap.music.logging.format; import com.att.eelf.i18n.EELFResolvableErrorEnum; diff --git a/src/main/java/com/att/research/mdbc/ArchiveProcess.java b/src/main/java/org/onap/music/mdbc/ArchiveProcess.java similarity index 93% rename from src/main/java/com/att/research/mdbc/ArchiveProcess.java rename to src/main/java/org/onap/music/mdbc/ArchiveProcess.java index 8290d66..26a1ef3 100644 --- a/src/main/java/com/att/research/mdbc/ArchiveProcess.java +++ b/src/main/java/org/onap/music/mdbc/ArchiveProcess.java @@ -1,9 +1,9 @@ -package com.att.research.mdbc; +package org.onap.music.mdbc; import org.json.JSONObject; -import com.att.research.mdbc.mixins.DBInterface; -import com.att.research.mdbc.mixins.MusicInterface; +import org.onap.music.mdbc.mixins.DBInterface; +import org.onap.music.mdbc.mixins.MusicInterface; public class ArchiveProcess { protected MusicInterface mi; diff --git a/src/main/java/com/att/research/mdbc/Configuration.java b/src/main/java/org/onap/music/mdbc/Configuration.java similarity index 96% rename from src/main/java/com/att/research/mdbc/Configuration.java rename to src/main/java/org/onap/music/mdbc/Configuration.java index 23aa6af..a4516dd 100644 --- a/src/main/java/com/att/research/mdbc/Configuration.java +++ b/src/main/java/org/onap/music/mdbc/Configuration.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc; +package org.onap.music.mdbc; public class Configuration { /** The property name to use to connect to cassandra*/ diff --git a/src/main/java/com/att/research/mdbc/DatabaseOperations.java b/src/main/java/org/onap/music/mdbc/DatabaseOperations.java similarity index 99% rename from src/main/java/com/att/research/mdbc/DatabaseOperations.java rename to src/main/java/org/onap/music/mdbc/DatabaseOperations.java index c896b84..b9412b7 100644 --- a/src/main/java/com/att/research/mdbc/DatabaseOperations.java +++ b/src/main/java/org/onap/music/mdbc/DatabaseOperations.java @@ -1,7 +1,7 @@ -package com.att.research.mdbc; +package org.onap.music.mdbc; -import com.att.research.exceptions.MDBCServiceException; -import com.att.research.logging.EELFLoggerDelegate; +import org.onap.music.exceptions.MDBCServiceException; +import org.onap.music.logging.EELFLoggerDelegate; import org.onap.music.datastore.PreparedQueryObject; import org.onap.music.exceptions.MusicLockingException; import org.onap.music.exceptions.MusicQueryException; diff --git a/src/main/java/com/att/research/mdbc/DatabasePartition.java b/src/main/java/org/onap/music/mdbc/DatabasePartition.java similarity index 98% rename from src/main/java/com/att/research/mdbc/DatabasePartition.java rename to src/main/java/org/onap/music/mdbc/DatabasePartition.java index a9b4f3e..79abd3b 100644 --- a/src/main/java/com/att/research/mdbc/DatabasePartition.java +++ b/src/main/java/org/onap/music/mdbc/DatabasePartition.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc; +package org.onap.music.mdbc; import java.io.BufferedReader; import java.io.FileNotFoundException; @@ -6,7 +6,7 @@ import java.io.FileReader; import java.util.HashSet; import java.util.Set; -import com.att.research.logging.EELFLoggerDelegate; +import org.onap.music.logging.EELFLoggerDelegate; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/src/main/java/com/att/research/mdbc/LockId.java b/src/main/java/org/onap/music/mdbc/LockId.java similarity index 97% rename from src/main/java/com/att/research/mdbc/LockId.java rename to src/main/java/org/onap/music/mdbc/LockId.java index a1de21a..9401f26 100644 --- a/src/main/java/com/att/research/mdbc/LockId.java +++ b/src/main/java/org/onap/music/mdbc/LockId.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc; +package org.onap.music.mdbc; public class LockId { private String primaryKey; diff --git a/src/main/java/com/att/research/mdbc/MDBCUtils.java b/src/main/java/org/onap/music/mdbc/MDBCUtils.java similarity index 86% rename from src/main/java/com/att/research/mdbc/MDBCUtils.java rename to src/main/java/org/onap/music/mdbc/MDBCUtils.java index 34f4b10..2e150bd 100644 --- a/src/main/java/com/att/research/mdbc/MDBCUtils.java +++ b/src/main/java/org/onap/music/mdbc/MDBCUtils.java @@ -1,16 +1,16 @@ -package com.att.research.mdbc; +package org.onap.music.mdbc; import java.io.*; import java.util.Base64; import java.util.Deque; import java.util.HashMap; -import com.att.research.logging.EELFLoggerDelegate; -import com.att.research.logging.format.AppMessages; -import com.att.research.logging.format.ErrorSeverity; -import com.att.research.logging.format.ErrorTypes; -import com.att.research.mdbc.tables.Operation; -import com.att.research.mdbc.tables.StagingTable; +import org.onap.music.logging.EELFLoggerDelegate; +import org.onap.music.logging.format.AppMessages; +import org.onap.music.logging.format.ErrorSeverity; +import org.onap.music.logging.format.ErrorTypes; +import org.onap.music.mdbc.tables.Operation; +import org.onap.music.mdbc.tables.StagingTable; import javassist.bytecode.Descriptor.Iterator; diff --git a/src/main/java/com/att/research/mdbc/MdbcCallableStatement.java b/src/main/java/org/onap/music/mdbc/MdbcCallableStatement.java similarity index 99% rename from src/main/java/com/att/research/mdbc/MdbcCallableStatement.java rename to src/main/java/org/onap/music/mdbc/MdbcCallableStatement.java index fefce21..95a49a8 100644 --- a/src/main/java/com/att/research/mdbc/MdbcCallableStatement.java +++ b/src/main/java/org/onap/music/mdbc/MdbcCallableStatement.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc; +package org.onap.music.mdbc; import java.io.InputStream; import java.io.Reader; @@ -21,7 +21,7 @@ import java.sql.Timestamp; import java.util.Calendar; import java.util.Map; -import com.att.research.logging.EELFLoggerDelegate; +import org.onap.music.logging.EELFLoggerDelegate; /** * ProxyStatement is a proxy Statement that front ends Statements from the underlying JDBC driver. It passes all operations through, diff --git a/src/main/java/com/att/research/mdbc/MdbcConnection.java b/src/main/java/org/onap/music/mdbc/MdbcConnection.java similarity index 96% rename from src/main/java/com/att/research/mdbc/MdbcConnection.java rename to src/main/java/org/onap/music/mdbc/MdbcConnection.java index 1e845fd..b553fb5 100644 --- a/src/main/java/com/att/research/mdbc/MdbcConnection.java +++ b/src/main/java/org/onap/music/mdbc/MdbcConnection.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc; +package org.onap.music.mdbc; import java.sql.Array; import java.sql.Blob; @@ -19,14 +19,14 @@ import java.util.Map; import java.util.Properties; import java.util.concurrent.Executor; -import com.att.research.exceptions.MDBCServiceException; -import com.att.research.exceptions.QueryException; -import com.att.research.logging.EELFLoggerDelegate; -import com.att.research.logging.format.AppMessages; -import com.att.research.logging.format.ErrorSeverity; -import com.att.research.logging.format.ErrorTypes; -import com.att.research.mdbc.mixins.MusicInterface; -import com.att.research.mdbc.tables.TxCommitProgress; +import org.onap.music.exceptions.MDBCServiceException; +import org.onap.music.exceptions.QueryException; +import org.onap.music.logging.EELFLoggerDelegate; +import org.onap.music.logging.format.AppMessages; +import org.onap.music.logging.format.ErrorSeverity; +import org.onap.music.logging.format.ErrorTypes; +import org.onap.music.mdbc.mixins.MusicInterface; +import org.onap.music.mdbc.tables.TxCommitProgress; /** diff --git a/src/main/java/com/att/research/mdbc/MdbcPreparedStatement.java b/src/main/java/org/onap/music/mdbc/MdbcPreparedStatement.java similarity index 99% rename from src/main/java/com/att/research/mdbc/MdbcPreparedStatement.java rename to src/main/java/org/onap/music/mdbc/MdbcPreparedStatement.java index d35a20a..e781b4b 100644 --- a/src/main/java/com/att/research/mdbc/MdbcPreparedStatement.java +++ b/src/main/java/org/onap/music/mdbc/MdbcPreparedStatement.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc; +package org.onap.music.mdbc; import java.io.InputStream; import java.io.Reader; @@ -27,7 +27,7 @@ import java.util.Calendar; import org.apache.commons.lang3.StringUtils; -import com.att.research.logging.EELFLoggerDelegate; +import org.onap.music.logging.EELFLoggerDelegate; /** * ProxyStatement is a proxy Statement that front ends Statements from the underlying JDBC driver. It passes all operations through, diff --git a/src/main/java/com/att/research/mdbc/MdbcServer.java b/src/main/java/org/onap/music/mdbc/MdbcServer.java similarity index 97% rename from src/main/java/com/att/research/mdbc/MdbcServer.java rename to src/main/java/org/onap/music/mdbc/MdbcServer.java index 54accaa..4f83a54 100644 --- a/src/main/java/com/att/research/mdbc/MdbcServer.java +++ b/src/main/java/org/onap/music/mdbc/MdbcServer.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc; +package org.onap.music.mdbc; /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,13 +17,13 @@ package com.att.research.mdbc; * limitations under the License. */ -import com.att.research.mdbc.configurations.NodeConfiguration; +import org.onap.music.mdbc.configurations.NodeConfiguration; import org.apache.calcite.avatica.remote.Driver.Serialization; import org.apache.calcite.avatica.remote.LocalService; import org.apache.calcite.avatica.server.HttpServer; import org.apache.calcite.avatica.util.Unsafe; -import com.att.research.logging.EELFLoggerDelegate; +import org.onap.music.logging.EELFLoggerDelegate; import com.beust.jcommander.IStringConverter; import com.beust.jcommander.JCommander; import com.beust.jcommander.Parameter; diff --git a/src/main/java/com/att/research/mdbc/MdbcServerLogic.java b/src/main/java/org/onap/music/mdbc/MdbcServerLogic.java similarity index 96% rename from src/main/java/com/att/research/mdbc/MdbcServerLogic.java rename to src/main/java/org/onap/music/mdbc/MdbcServerLogic.java index 72cc73c..a1984c2 100644 --- a/src/main/java/com/att/research/mdbc/MdbcServerLogic.java +++ b/src/main/java/org/onap/music/mdbc/MdbcServerLogic.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc; +package org.onap.music.mdbc; import java.sql.Connection; import java.sql.SQLException; @@ -8,8 +8,8 @@ import java.util.Properties; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; -import com.att.research.exceptions.MDBCServiceException; -import com.att.research.mdbc.configurations.NodeConfiguration; +import org.onap.music.exceptions.MDBCServiceException; +import org.onap.music.mdbc.configurations.NodeConfiguration; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.cache.RemovalListener; @@ -19,10 +19,10 @@ import org.apache.calcite.avatica.NoSuchStatementException; import org.apache.calcite.avatica.jdbc.JdbcMeta; import org.apache.calcite.avatica.remote.TypedValue; -import com.att.research.logging.EELFLoggerDelegate; -import com.att.research.logging.format.AppMessages; -import com.att.research.logging.format.ErrorSeverity; -import com.att.research.logging.format.ErrorTypes; +import org.onap.music.logging.EELFLoggerDelegate; +import org.onap.music.logging.format.AppMessages; +import org.onap.music.logging.format.ErrorSeverity; +import org.onap.music.logging.format.ErrorTypes; public class MdbcServerLogic extends JdbcMeta{ diff --git a/src/main/java/com/att/research/mdbc/MdbcStatement.java b/src/main/java/org/onap/music/mdbc/MdbcStatement.java similarity index 97% rename from src/main/java/com/att/research/mdbc/MdbcStatement.java rename to src/main/java/org/onap/music/mdbc/MdbcStatement.java index e03fbda..93fe80a 100644 --- a/src/main/java/com/att/research/mdbc/MdbcStatement.java +++ b/src/main/java/org/onap/music/mdbc/MdbcStatement.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc; +package org.onap.music.mdbc; import java.sql.Connection; import java.sql.ResultSet; @@ -6,11 +6,11 @@ import java.sql.SQLException; import java.sql.SQLWarning; import java.sql.Statement; -import com.att.research.exceptions.QueryException; -import com.att.research.logging.EELFLoggerDelegate; -import com.att.research.logging.format.AppMessages; -import com.att.research.logging.format.ErrorSeverity; -import com.att.research.logging.format.ErrorTypes; +import org.onap.music.exceptions.QueryException; +import org.onap.music.logging.EELFLoggerDelegate; +import org.onap.music.logging.format.AppMessages; +import org.onap.music.logging.format.ErrorSeverity; +import org.onap.music.logging.format.ErrorTypes; /** * ProxyStatement is a proxy Statement that front ends Statements from the underlying JDBC driver. It passes all operations through, diff --git a/src/main/java/com/att/research/mdbc/MusicSqlManager.java b/src/main/java/org/onap/music/mdbc/MusicSqlManager.java similarity index 94% rename from src/main/java/com/att/research/mdbc/MusicSqlManager.java rename to src/main/java/org/onap/music/mdbc/MusicSqlManager.java index f73bdb6..741ee9e 100755 --- a/src/main/java/com/att/research/mdbc/MusicSqlManager.java +++ b/src/main/java/org/onap/music/mdbc/MusicSqlManager.java @@ -1,22 +1,22 @@ -package com.att.research.mdbc; +package org.onap.music.mdbc; import java.sql.Connection; import java.util.*; import org.json.JSONObject; -import com.att.research.mdbc.mixins.DBInterface; -import com.att.research.mdbc.mixins.MixinFactory; -import com.att.research.mdbc.mixins.MusicInterface; -import com.att.research.mdbc.mixins.Utils; -import com.att.research.mdbc.tables.StagingTable; -import com.att.research.mdbc.tables.TxCommitProgress; -import com.att.research.exceptions.MDBCServiceException; -import com.att.research.exceptions.QueryException; -import com.att.research.logging.*; -import com.att.research.logging.format.AppMessages; -import com.att.research.logging.format.ErrorSeverity; -import com.att.research.logging.format.ErrorTypes; +import org.onap.music.mdbc.mixins.DBInterface; +import org.onap.music.mdbc.mixins.MixinFactory; +import org.onap.music.mdbc.mixins.MusicInterface; +import org.onap.music.mdbc.mixins.Utils; +import org.onap.music.mdbc.tables.StagingTable; +import org.onap.music.mdbc.tables.TxCommitProgress; +import org.onap.music.exceptions.MDBCServiceException; +import org.onap.music.exceptions.QueryException; +import org.onap.music.logging.*; +import org.onap.music.logging.format.AppMessages; +import org.onap.music.logging.format.ErrorSeverity; +import org.onap.music.logging.format.ErrorTypes; /** *

diff --git a/src/main/java/com/att/research/mdbc/ProxyStatement.java b/src/main/java/org/onap/music/mdbc/ProxyStatement.java similarity index 99% rename from src/main/java/com/att/research/mdbc/ProxyStatement.java rename to src/main/java/org/onap/music/mdbc/ProxyStatement.java index 0b5edd8..e84dc7b 100755 --- a/src/main/java/com/att/research/mdbc/ProxyStatement.java +++ b/src/main/java/org/onap/music/mdbc/ProxyStatement.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc; +package org.onap.music.mdbc; import java.io.InputStream; import java.io.Reader; @@ -28,7 +28,7 @@ import java.util.Map; import org.apache.log4j.Logger; -import com.att.research.exceptions.QueryException; +import org.onap.music.exceptions.QueryException; /** * ProxyStatement is a proxy Statement that front ends Statements from the underlying JDBC driver. It passes all operations through, diff --git a/src/main/java/com/att/research/mdbc/Range.java b/src/main/java/org/onap/music/mdbc/Range.java similarity index 95% rename from src/main/java/com/att/research/mdbc/Range.java rename to src/main/java/org/onap/music/mdbc/Range.java index 4d80a51..b33fb1c 100644 --- a/src/main/java/com/att/research/mdbc/Range.java +++ b/src/main/java/org/onap/music/mdbc/Range.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc; +package org.onap.music.mdbc; import java.io.Serializable; diff --git a/src/main/java/com/att/research/mdbc/RedoRow.java b/src/main/java/org/onap/music/mdbc/RedoRow.java similarity index 95% rename from src/main/java/com/att/research/mdbc/RedoRow.java rename to src/main/java/org/onap/music/mdbc/RedoRow.java index c024fe7..db17e60 100644 --- a/src/main/java/com/att/research/mdbc/RedoRow.java +++ b/src/main/java/org/onap/music/mdbc/RedoRow.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc; +package org.onap.music.mdbc; public class RedoRow { private String redoTableName; diff --git a/src/main/java/com/att/research/mdbc/StateManager.java b/src/main/java/org/onap/music/mdbc/StateManager.java similarity index 94% rename from src/main/java/com/att/research/mdbc/StateManager.java rename to src/main/java/org/onap/music/mdbc/StateManager.java index 0a4a409..b2c2adb 100644 --- a/src/main/java/com/att/research/mdbc/StateManager.java +++ b/src/main/java/org/onap/music/mdbc/StateManager.java @@ -1,14 +1,14 @@ -package com.att.research.mdbc; - -import com.att.research.exceptions.MDBCServiceException; -import com.att.research.logging.EELFLoggerDelegate; -import com.att.research.logging.format.AppMessages; -import com.att.research.logging.format.ErrorSeverity; -import com.att.research.logging.format.ErrorTypes; -import com.att.research.mdbc.mixins.MixinFactory; -import com.att.research.mdbc.mixins.MusicInterface; -import com.att.research.mdbc.mixins.MusicMixin; -import com.att.research.mdbc.tables.TxCommitProgress; +package org.onap.music.mdbc; + +import org.onap.music.exceptions.MDBCServiceException; +import org.onap.music.logging.EELFLoggerDelegate; +import org.onap.music.logging.format.AppMessages; +import org.onap.music.logging.format.ErrorSeverity; +import org.onap.music.logging.format.ErrorTypes; +import org.onap.music.mdbc.mixins.MixinFactory; +import org.onap.music.mdbc.mixins.MusicInterface; +import org.onap.music.mdbc.mixins.MusicMixin; +import org.onap.music.mdbc.tables.TxCommitProgress; import java.sql.Connection; import java.sql.DriverManager; diff --git a/src/main/java/com/att/research/mdbc/TableInfo.java b/src/main/java/org/onap/music/mdbc/TableInfo.java similarity index 98% rename from src/main/java/com/att/research/mdbc/TableInfo.java rename to src/main/java/org/onap/music/mdbc/TableInfo.java index 583ba73..ee272d8 100755 --- a/src/main/java/com/att/research/mdbc/TableInfo.java +++ b/src/main/java/org/onap/music/mdbc/TableInfo.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc; +package org.onap.music.mdbc; import java.sql.Types; import java.util.ArrayList; diff --git a/src/main/java/com/att/research/mdbc/configurations/NodeConfiguration.java b/src/main/java/org/onap/music/mdbc/configurations/NodeConfiguration.java similarity index 90% rename from src/main/java/com/att/research/mdbc/configurations/NodeConfiguration.java rename to src/main/java/org/onap/music/mdbc/configurations/NodeConfiguration.java index d74dafb..02de1b8 100644 --- a/src/main/java/com/att/research/mdbc/configurations/NodeConfiguration.java +++ b/src/main/java/org/onap/music/mdbc/configurations/NodeConfiguration.java @@ -1,9 +1,9 @@ -package com.att.research.mdbc.configurations; +package org.onap.music.mdbc.configurations; -import com.att.research.logging.EELFLoggerDelegate; -import com.att.research.mdbc.DatabasePartition; -import com.att.research.mdbc.MDBCUtils; -import com.att.research.mdbc.Range; +import org.onap.music.logging.EELFLoggerDelegate; +import org.onap.music.mdbc.DatabasePartition; +import org.onap.music.mdbc.MDBCUtils; +import org.onap.music.mdbc.Range; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/src/main/java/com/att/research/mdbc/configurations/TablesConfiguration.java b/src/main/java/org/onap/music/mdbc/configurations/TablesConfiguration.java similarity index 96% rename from src/main/java/com/att/research/mdbc/configurations/TablesConfiguration.java rename to src/main/java/org/onap/music/mdbc/configurations/TablesConfiguration.java index b86d058..07f87cf 100644 --- a/src/main/java/com/att/research/mdbc/configurations/TablesConfiguration.java +++ b/src/main/java/org/onap/music/mdbc/configurations/TablesConfiguration.java @@ -1,10 +1,10 @@ -package com.att.research.mdbc.configurations; +package org.onap.music.mdbc.configurations; -import com.att.research.exceptions.MDBCServiceException; -import com.att.research.logging.EELFLoggerDelegate; -import com.att.research.mdbc.DatabaseOperations; -import com.att.research.mdbc.RedoRow; -import com.att.research.mdbc.mixins.CassandraMixin; +import org.onap.music.exceptions.MDBCServiceException; +import org.onap.music.logging.EELFLoggerDelegate; +import org.onap.music.mdbc.DatabaseOperations; +import org.onap.music.mdbc.RedoRow; +import org.onap.music.mdbc.mixins.CassandraMixin; import com.google.gson.Gson; import org.onap.music.datastore.PreparedQueryObject; import org.onap.music.exceptions.MusicServiceException; diff --git a/src/main/java/com/att/research/mdbc/configurations/config-0.json b/src/main/java/org/onap/music/mdbc/configurations/config-0.json similarity index 100% rename from src/main/java/com/att/research/mdbc/configurations/config-0.json rename to src/main/java/org/onap/music/mdbc/configurations/config-0.json diff --git a/src/main/java/com/att/research/mdbc/configurations/ranges.json b/src/main/java/org/onap/music/mdbc/configurations/ranges.json similarity index 100% rename from src/main/java/com/att/research/mdbc/configurations/ranges.json rename to src/main/java/org/onap/music/mdbc/configurations/ranges.json diff --git a/src/main/java/com/att/research/mdbc/configurations/tableConfiguration.json b/src/main/java/org/onap/music/mdbc/configurations/tableConfiguration.json similarity index 100% rename from src/main/java/com/att/research/mdbc/configurations/tableConfiguration.json rename to src/main/java/org/onap/music/mdbc/configurations/tableConfiguration.json diff --git a/src/main/java/com/att/research/mdbc/examples/EtdbTestClient.java b/src/main/java/org/onap/music/mdbc/examples/EtdbTestClient.java similarity index 98% rename from src/main/java/com/att/research/mdbc/examples/EtdbTestClient.java rename to src/main/java/org/onap/music/mdbc/examples/EtdbTestClient.java index cb43efe..2a25667 100644 --- a/src/main/java/com/att/research/mdbc/examples/EtdbTestClient.java +++ b/src/main/java/org/onap/music/mdbc/examples/EtdbTestClient.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc.examples; +package org.onap.music.mdbc.examples; import java.sql.*; import org.apache.calcite.avatica.remote.Driver; diff --git a/src/main/java/com/att/research/mdbc/mixins/Cassandra2Mixin.java b/src/main/java/org/onap/music/mdbc/mixins/Cassandra2Mixin.java similarity index 97% rename from src/main/java/com/att/research/mdbc/mixins/Cassandra2Mixin.java rename to src/main/java/org/onap/music/mdbc/mixins/Cassandra2Mixin.java index 1e57e60..372224d 100755 --- a/src/main/java/com/att/research/mdbc/mixins/Cassandra2Mixin.java +++ b/src/main/java/org/onap/music/mdbc/mixins/Cassandra2Mixin.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc.mixins; +package org.onap.music.mdbc.mixins; import java.sql.Types; import java.util.ArrayList; @@ -15,16 +15,16 @@ import org.onap.music.exceptions.MusicServiceException; import org.onap.music.main.MusicCore; import org.onap.music.main.ReturnType; -import com.att.research.logging.EELFLoggerDelegate; -import com.att.research.mdbc.DatabasePartition; -import com.att.research.mdbc.TableInfo; +import org.onap.music.logging.EELFLoggerDelegate; +import org.onap.music.mdbc.DatabasePartition; +import org.onap.music.mdbc.TableInfo; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Row; /** * This class provides the methods that MDBC needs to access Cassandra directly in order to provide persistence * to calls to the user's DB. It stores dirty row references in one table (called DIRTY____) rather than one dirty - * table per real table (as {@link com.att.research.mdbc.mixins.CassandraMixin} does). + * table per real table (as {@link org.onap.music.mdbc.mixins.CassandraMixin} does). * * @author Robert P. Eby */ diff --git a/src/main/java/com/att/research/mdbc/mixins/CassandraMixin.java b/src/main/java/org/onap/music/mdbc/mixins/CassandraMixin.java similarity index 98% rename from src/main/java/com/att/research/mdbc/mixins/CassandraMixin.java rename to src/main/java/org/onap/music/mdbc/mixins/CassandraMixin.java index 63c95c2..cb9c6e2 100755 --- a/src/main/java/com/att/research/mdbc/mixins/CassandraMixin.java +++ b/src/main/java/org/onap/music/mdbc/mixins/CassandraMixin.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc.mixins; +package org.onap.music.mdbc.mixins; import java.io.IOException; import java.io.Reader; @@ -15,13 +15,13 @@ import java.util.Set; import java.util.TreeSet; import java.util.UUID; -import com.att.research.mdbc.*; -import com.att.research.mdbc.tables.PartitionInformation; -import com.att.research.mdbc.tables.MusixTxDigestId; -import com.att.research.mdbc.tables.StagingTable; -import com.att.research.mdbc.tables.MriReference; -import com.att.research.mdbc.tables.MusicRangeInformationRow; -import com.att.research.mdbc.tables.TxCommitProgress; +import org.onap.music.mdbc.*; +import org.onap.music.mdbc.tables.PartitionInformation; +import org.onap.music.mdbc.tables.MusixTxDigestId; +import org.onap.music.mdbc.tables.StagingTable; +import org.onap.music.mdbc.tables.MriReference; +import org.onap.music.mdbc.tables.MusicRangeInformationRow; +import org.onap.music.mdbc.tables.TxCommitProgress; import org.json.JSONObject; import org.onap.music.datastore.CassaLockStore; @@ -33,8 +33,8 @@ import org.onap.music.main.MusicCore; import org.onap.music.main.ResultType; import org.onap.music.main.ReturnType; -import com.att.research.exceptions.MDBCServiceException; -import com.att.research.logging.EELFLoggerDelegate; +import org.onap.music.exceptions.MDBCServiceException; +import org.onap.music.logging.EELFLoggerDelegate; import com.datastax.driver.core.BoundStatement; import com.datastax.driver.core.ColumnDefinitions; import com.datastax.driver.core.DataType; diff --git a/src/main/java/com/att/research/mdbc/mixins/DBInterface.java b/src/main/java/org/onap/music/mdbc/mixins/DBInterface.java similarity index 95% rename from src/main/java/com/att/research/mdbc/mixins/DBInterface.java rename to src/main/java/org/onap/music/mdbc/mixins/DBInterface.java index e2b2ad7..2ff88a2 100755 --- a/src/main/java/com/att/research/mdbc/mixins/DBInterface.java +++ b/src/main/java/org/onap/music/mdbc/mixins/DBInterface.java @@ -1,13 +1,13 @@ -package com.att.research.mdbc.mixins; +package org.onap.music.mdbc.mixins; import java.sql.ResultSet; import java.util.List; import java.util.Map; import java.util.Set; -import com.att.research.mdbc.Range; -import com.att.research.mdbc.TableInfo; -import com.att.research.mdbc.tables.StagingTable; +import org.onap.music.mdbc.Range; +import org.onap.music.mdbc.TableInfo; +import org.onap.music.mdbc.tables.StagingTable; /** * This Interface defines the methods that MDBC needs in order to mirror data to/from a Database instance. diff --git a/src/main/java/com/att/research/mdbc/mixins/MixinFactory.java b/src/main/java/org/onap/music/mdbc/mixins/MixinFactory.java similarity index 92% rename from src/main/java/com/att/research/mdbc/mixins/MixinFactory.java rename to src/main/java/org/onap/music/mdbc/mixins/MixinFactory.java index 68d2986..de46187 100755 --- a/src/main/java/com/att/research/mdbc/mixins/MixinFactory.java +++ b/src/main/java/org/onap/music/mdbc/mixins/MixinFactory.java @@ -1,17 +1,17 @@ -package com.att.research.mdbc.mixins; +package org.onap.music.mdbc.mixins; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.sql.Connection; import java.util.Properties; -import com.att.research.logging.EELFLoggerDelegate; -import com.att.research.mdbc.DatabasePartition; -import com.att.research.mdbc.MusicSqlManager; +import org.onap.music.logging.EELFLoggerDelegate; +import org.onap.music.mdbc.DatabasePartition; +import org.onap.music.mdbc.MusicSqlManager; /** - * This class is used to construct instances of Mixins that implement either the {@link com.att.research.mdbc.mixins.DBInterface} - * interface, or the {@link com.att.research.mdbc.mixins.MusicInterface} interface. The Mixins are searched for in the CLASSPATH. + * This class is used to construct instances of Mixins that implement either the {@link org.onap.music.mdbc.mixins.DBInterface} + * interface, or the {@link org.onap.music.mdbc.mixins.MusicInterface} interface. The Mixins are searched for in the CLASSPATH. * * @author Robert P. Eby */ diff --git a/src/main/java/com/att/research/mdbc/mixins/MusicConnector.java b/src/main/java/org/onap/music/mdbc/mixins/MusicConnector.java similarity index 97% rename from src/main/java/com/att/research/mdbc/mixins/MusicConnector.java rename to src/main/java/org/onap/music/mdbc/mixins/MusicConnector.java index 8df6ed5..11322fe 100755 --- a/src/main/java/com/att/research/mdbc/mixins/MusicConnector.java +++ b/src/main/java/org/onap/music/mdbc/mixins/MusicConnector.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc.mixins; +package org.onap.music.mdbc.mixins; import java.net.InetAddress; import java.net.NetworkInterface; @@ -8,7 +8,7 @@ import java.util.Enumeration; import java.util.Iterator; import java.util.List; -import com.att.research.logging.EELFLoggerDelegate; +import org.onap.music.logging.EELFLoggerDelegate; import com.datastax.driver.core.Cluster; import com.datastax.driver.core.HostDistance; import com.datastax.driver.core.Metadata; diff --git a/src/main/java/com/att/research/mdbc/mixins/MusicInterface.java b/src/main/java/org/onap/music/mdbc/mixins/MusicInterface.java similarity index 93% rename from src/main/java/com/att/research/mdbc/mixins/MusicInterface.java rename to src/main/java/org/onap/music/mdbc/mixins/MusicInterface.java index 7fb6d18..abf8f36 100755 --- a/src/main/java/com/att/research/mdbc/mixins/MusicInterface.java +++ b/src/main/java/org/onap/music/mdbc/mixins/MusicInterface.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc.mixins; +package org.onap.music.mdbc.mixins; import java.util.HashMap; import java.util.List; @@ -7,16 +7,16 @@ import java.util.UUID; import org.json.JSONObject; -import com.att.research.exceptions.MDBCServiceException; -import com.att.research.mdbc.DatabasePartition; -import com.att.research.mdbc.Range; -import com.att.research.mdbc.TableInfo; -import com.att.research.mdbc.tables.PartitionInformation; -import com.att.research.mdbc.tables.MusixTxDigestId; -import com.att.research.mdbc.tables.StagingTable; -import com.att.research.mdbc.tables.MriReference; -import com.att.research.mdbc.tables.MusicRangeInformationRow; -import com.att.research.mdbc.tables.TxCommitProgress; +import org.onap.music.exceptions.MDBCServiceException; +import org.onap.music.mdbc.DatabasePartition; +import org.onap.music.mdbc.Range; +import org.onap.music.mdbc.TableInfo; +import org.onap.music.mdbc.tables.PartitionInformation; +import org.onap.music.mdbc.tables.MusixTxDigestId; +import org.onap.music.mdbc.tables.StagingTable; +import org.onap.music.mdbc.tables.MriReference; +import org.onap.music.mdbc.tables.MusicRangeInformationRow; +import org.onap.music.mdbc.tables.TxCommitProgress; /** * This Interface defines the methods that MDBC needs for a class to provide access to the persistence layer of MUSIC. diff --git a/src/main/java/com/att/research/mdbc/mixins/MusicMixin.java b/src/main/java/org/onap/music/mdbc/mixins/MusicMixin.java similarity index 88% rename from src/main/java/com/att/research/mdbc/mixins/MusicMixin.java rename to src/main/java/org/onap/music/mdbc/mixins/MusicMixin.java index 630b75e..f7b667d 100644 --- a/src/main/java/com/att/research/mdbc/mixins/MusicMixin.java +++ b/src/main/java/org/onap/music/mdbc/mixins/MusicMixin.java @@ -1,23 +1,23 @@ -package com.att.research.mdbc.mixins; +package org.onap.music.mdbc.mixins; import java.io.IOException; import java.io.InputStream; import java.util.*; -import com.att.research.mdbc.LockId; +import org.onap.music.mdbc.LockId; import org.json.JSONObject; import org.onap.music.exceptions.MusicLockingException; -import com.att.research.exceptions.MDBCServiceException; -import com.att.research.mdbc.DatabasePartition; -import com.att.research.mdbc.Range; -import com.att.research.mdbc.TableInfo; -import com.att.research.mdbc.tables.PartitionInformation; -import com.att.research.mdbc.tables.MusixTxDigestId; -import com.att.research.mdbc.tables.StagingTable; -import com.att.research.mdbc.tables.MriReference; -import com.att.research.mdbc.tables.MusicRangeInformationRow; -import com.att.research.mdbc.tables.TxCommitProgress; +import org.onap.music.exceptions.MDBCServiceException; +import org.onap.music.mdbc.DatabasePartition; +import org.onap.music.mdbc.Range; +import org.onap.music.mdbc.TableInfo; +import org.onap.music.mdbc.tables.PartitionInformation; +import org.onap.music.mdbc.tables.MusixTxDigestId; +import org.onap.music.mdbc.tables.StagingTable; +import org.onap.music.mdbc.tables.MriReference; +import org.onap.music.mdbc.tables.MusicRangeInformationRow; +import org.onap.music.mdbc.tables.TxCommitProgress; import org.onap.music.main.MusicCore; diff --git a/src/main/java/com/att/research/mdbc/mixins/MySQLMixin.java b/src/main/java/org/onap/music/mdbc/mixins/MySQLMixin.java similarity index 98% rename from src/main/java/com/att/research/mdbc/mixins/MySQLMixin.java rename to src/main/java/org/onap/music/mdbc/mixins/MySQLMixin.java index 5615ffb..d78bc9b 100755 --- a/src/main/java/com/att/research/mdbc/mixins/MySQLMixin.java +++ b/src/main/java/org/onap/music/mdbc/mixins/MySQLMixin.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc.mixins; +package org.onap.music.mdbc.mixins; import java.sql.Connection; import java.sql.PreparedStatement; @@ -17,12 +17,12 @@ import java.util.TreeSet; import org.json.JSONObject; import org.json.JSONTokener; -import com.att.research.logging.EELFLoggerDelegate; -import com.att.research.mdbc.MusicSqlManager; -import com.att.research.mdbc.Range; -import com.att.research.mdbc.TableInfo; -import com.att.research.mdbc.tables.OperationType; -import com.att.research.mdbc.tables.StagingTable; +import org.onap.music.logging.EELFLoggerDelegate; +import org.onap.music.mdbc.MusicSqlManager; +import org.onap.music.mdbc.Range; +import org.onap.music.mdbc.TableInfo; +import org.onap.music.mdbc.tables.OperationType; +import org.onap.music.mdbc.tables.StagingTable; import net.sf.jsqlparser.JSQLParserException; import net.sf.jsqlparser.parser.CCJSqlParserUtil; diff --git a/src/main/java/com/att/research/mdbc/mixins/Utils.java b/src/main/java/org/onap/music/mdbc/mixins/Utils.java similarity index 98% rename from src/main/java/com/att/research/mdbc/mixins/Utils.java rename to src/main/java/org/onap/music/mdbc/mixins/Utils.java index 22df08f..2fd0f6e 100755 --- a/src/main/java/com/att/research/mdbc/mixins/Utils.java +++ b/src/main/java/org/onap/music/mdbc/mixins/Utils.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc.mixins; +package org.onap.music.mdbc.mixins; import java.io.IOException; import java.io.InputStream; @@ -15,8 +15,8 @@ import java.util.Properties; import org.json.JSONObject; -import com.att.research.logging.EELFLoggerDelegate; -import com.att.research.mdbc.TableInfo; +import org.onap.music.logging.EELFLoggerDelegate; +import org.onap.music.mdbc.TableInfo; import com.datastax.driver.core.utils.Bytes; /** diff --git a/src/main/java/com/att/research/mdbc/mixins/package-info.java b/src/main/java/org/onap/music/mdbc/mixins/package-info.java similarity index 93% rename from src/main/java/com/att/research/mdbc/mixins/package-info.java rename to src/main/java/org/onap/music/mdbc/mixins/package-info.java index edad7e8..703a119 100755 --- a/src/main/java/com/att/research/mdbc/mixins/package-info.java +++ b/src/main/java/org/onap/music/mdbc/mixins/package-info.java @@ -1,8 +1,8 @@ /** *

* This package provides the "mixins" to use when constructing a MusicSqlManager. The mixins define how MusicSqlManager - * will interface both to the database being mirrored (via the {@link com.att.research.mdbc.mixins.DBInterface} interface), - * and how it will interface to the persistence layer provided by MUSIC (via the {@link com.att.research.mdbc.mixins.MusicInterface} + * will interface both to the database being mirrored (via the {@link org.onap.music.mdbc.mixins.DBInterface} interface), + * and how it will interface to the persistence layer provided by MUSIC (via the {@link org.onap.music.mdbc.mixins.MusicInterface} * interface). *

*

@@ -44,4 +44,4 @@ * The mdbc-h2server-0.0.1-SNAPSHOT.jar file is built with Maven using the pom-h2server.xml pom file. *

*/ -package com.att.research.mdbc.mixins; +package org.onap.music.mdbc.mixins; diff --git a/src/main/java/com/att/research/mdbc/package-info.java b/src/main/java/org/onap/music/mdbc/package-info.java similarity index 93% rename from src/main/java/com/att/research/mdbc/package-info.java rename to src/main/java/org/onap/music/mdbc/package-info.java index 5ad59c8..576ab88 100755 --- a/src/main/java/com/att/research/mdbc/package-info.java +++ b/src/main/java/org/onap/music/mdbc/package-info.java @@ -32,7 +32,7 @@ * *
  • Load the driver using the following call: * 
    - *	Class.forName("com.att.research.mdbc.ProxyDriver");
+ *	Class.forName("org.onap.music.mdbc.ProxyDriver");
  *
    • * *

    Because, under the current design, the MDBC driver must be running within the same JVM as the database, MDBC @@ -50,7 +50,7 @@ * type="javax.sql.DataSource" * factory="org.apache.tomcat.jdbc.pool.DataSourceFactory" * uniqueResourceName="process-engine" - * driverClassName="com.att.research.mdbc.ProxyDriver" + * driverClassName="org.onap.music.mdbc.ProxyDriver" * url="jdbc:mdbc:./camunda-h2-dbs/process-engine;MVCC=TRUE;TRACE_LEVEL_FILE=0;DB_CLOSE_ON_EXIT=FALSE" * connectionProperties="myid=0;replicas=0,1,2;music_keyspace=camunda;music_address=localhost" * username="sa" @@ -76,12 +76,12 @@ * </security> * </datasource> * <drivers> - * <driver name="mdbc" module="com.att.research.mdbc"> - * <driver-class>com.att.research.mdbc.ProxyDriver</driver-class> + * <driver name="mdbc" module="org.onap.music.mdbc"> + * <driver-class>org.onap.music.mdbc.ProxyDriver</driver-class> * </driver> * </drivers> * </datasources> * - *

    Note: This assumes that you have built and installed the com.att.research.mdbc module within JBoss. + *

    Note: This assumes that you have built and installed the org.onap.music.mdbc module within JBoss. */ -package com.att.research.mdbc; +package org.onap.music.mdbc; diff --git a/src/main/java/com/att/research/mdbc/tables/MriReference.java b/src/main/java/org/onap/music/mdbc/tables/MriReference.java similarity index 84% rename from src/main/java/com/att/research/mdbc/tables/MriReference.java rename to src/main/java/org/onap/music/mdbc/tables/MriReference.java index a1d0b61..29de8d0 100644 --- a/src/main/java/com/att/research/mdbc/tables/MriReference.java +++ b/src/main/java/org/onap/music/mdbc/tables/MriReference.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc.tables; +package org.onap.music.mdbc.tables; import java.util.UUID; diff --git a/src/main/java/com/att/research/mdbc/tables/MusicRangeInformationRow.java b/src/main/java/org/onap/music/mdbc/tables/MusicRangeInformationRow.java similarity index 91% rename from src/main/java/com/att/research/mdbc/tables/MusicRangeInformationRow.java rename to src/main/java/org/onap/music/mdbc/tables/MusicRangeInformationRow.java index e069666..5d7bc97 100644 --- a/src/main/java/com/att/research/mdbc/tables/MusicRangeInformationRow.java +++ b/src/main/java/org/onap/music/mdbc/tables/MusicRangeInformationRow.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc.tables; +package org.onap.music.mdbc.tables; import java.util.List; import java.util.UUID; diff --git a/src/main/java/com/att/research/mdbc/tables/MusixTxDigestId.java b/src/main/java/org/onap/music/mdbc/tables/MusixTxDigestId.java similarity index 86% rename from src/main/java/com/att/research/mdbc/tables/MusixTxDigestId.java rename to src/main/java/org/onap/music/mdbc/tables/MusixTxDigestId.java index 71e715a..0eccd53 100644 --- a/src/main/java/com/att/research/mdbc/tables/MusixTxDigestId.java +++ b/src/main/java/org/onap/music/mdbc/tables/MusixTxDigestId.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc.tables; +package org.onap.music.mdbc.tables; import java.util.UUID; diff --git a/src/main/java/com/att/research/mdbc/tables/Operation.java b/src/main/java/org/onap/music/mdbc/tables/Operation.java similarity index 93% rename from src/main/java/com/att/research/mdbc/tables/Operation.java rename to src/main/java/org/onap/music/mdbc/tables/Operation.java index abb21c8..85428a7 100644 --- a/src/main/java/com/att/research/mdbc/tables/Operation.java +++ b/src/main/java/org/onap/music/mdbc/tables/Operation.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc.tables; +package org.onap.music.mdbc.tables; import java.io.Serializable; diff --git a/src/main/java/com/att/research/mdbc/tables/OperationType.java b/src/main/java/org/onap/music/mdbc/tables/OperationType.java similarity index 62% rename from src/main/java/com/att/research/mdbc/tables/OperationType.java rename to src/main/java/org/onap/music/mdbc/tables/OperationType.java index ae83485..1ccd919 100644 --- a/src/main/java/com/att/research/mdbc/tables/OperationType.java +++ b/src/main/java/org/onap/music/mdbc/tables/OperationType.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc.tables; +package org.onap.music.mdbc.tables; public enum OperationType{ DELETE, UPDATE, INSERT, SELECT diff --git a/src/main/java/com/att/research/mdbc/tables/PartitionInformation.java b/src/main/java/org/onap/music/mdbc/tables/PartitionInformation.java similarity index 82% rename from src/main/java/com/att/research/mdbc/tables/PartitionInformation.java rename to src/main/java/org/onap/music/mdbc/tables/PartitionInformation.java index 0e4b80d..3f99098 100644 --- a/src/main/java/com/att/research/mdbc/tables/PartitionInformation.java +++ b/src/main/java/org/onap/music/mdbc/tables/PartitionInformation.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc.tables; +package org.onap.music.mdbc.tables; import java.util.List; diff --git a/src/main/java/com/att/research/mdbc/tables/StagingTable.java b/src/main/java/org/onap/music/mdbc/tables/StagingTable.java similarity index 94% rename from src/main/java/com/att/research/mdbc/tables/StagingTable.java rename to src/main/java/org/onap/music/mdbc/tables/StagingTable.java index f5e5101..6e93856 100644 --- a/src/main/java/com/att/research/mdbc/tables/StagingTable.java +++ b/src/main/java/org/onap/music/mdbc/tables/StagingTable.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc.tables; +package org.onap.music.mdbc.tables; import java.io.Serializable; import java.util.Deque; @@ -8,7 +8,7 @@ import java.util.Set; import org.apache.commons.lang3.tuple.Pair; import org.json.JSONObject; -import com.att.research.logging.EELFLoggerDelegate; +import org.onap.music.logging.EELFLoggerDelegate; public class StagingTable implements Serializable{ /** diff --git a/src/main/java/com/att/research/mdbc/tables/TxCommitProgress.java b/src/main/java/org/onap/music/mdbc/tables/TxCommitProgress.java similarity index 98% rename from src/main/java/com/att/research/mdbc/tables/TxCommitProgress.java rename to src/main/java/org/onap/music/mdbc/tables/TxCommitProgress.java index d87e33d..73ef4b2 100644 --- a/src/main/java/com/att/research/mdbc/tables/TxCommitProgress.java +++ b/src/main/java/org/onap/music/mdbc/tables/TxCommitProgress.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc.tables; +package org.onap.music.mdbc.tables; import java.math.BigInteger; import java.util.Map; @@ -6,7 +6,7 @@ import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import com.datastax.driver.core.utils.UUIDs; -import com.att.research.logging.EELFLoggerDelegate; +import org.onap.music.logging.EELFLoggerDelegate; import java.sql.Connection; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/com/att/research/mdbc/tests/ConnectionTest.java b/src/main/java/org/onap/music/mdbc/tests/ConnectionTest.java similarity index 97% rename from src/main/java/com/att/research/mdbc/tests/ConnectionTest.java rename to src/main/java/org/onap/music/mdbc/tests/ConnectionTest.java index 721b389..5a0d98c 100644 --- a/src/main/java/com/att/research/mdbc/tests/ConnectionTest.java +++ b/src/main/java/org/onap/music/mdbc/tests/ConnectionTest.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc.tests; +package org.onap.music.mdbc.tests; //import java.sql.Connection; //import java.sql.DriverManager; @@ -97,7 +97,7 @@ public class ConnectionTest { // * // * In order to use, must have mysql and Cassandra services running locally. Must // * have a database EMP created in the mysql db. Uses -// * "Driver.getConnection(com.att.research.mdbc.ProxyDriver)" for mdbc +// * "Driver.getConnection(org.onap.music.mdbc.ProxyDriver)" for mdbc // * connection // */ // //@Test @@ -110,7 +110,7 @@ public class ConnectionTest { // connectionProps.put("user", USER); // connectionProps.put("password", PASS); // -// final String MDBC_DRIVER = "com.att.research.mdbc.ProxyDriver"; +// final String MDBC_DRIVER = "org.onap.music.mdbc.ProxyDriver"; // final String MDBC_DB_URL = "jdbc:mdbc://localhost/TEST"; // final String MDBC_DB_MIXIN = "mysql"; // connectionProps.put("MDBC_DB_MIXIN", MDBC_DB_MIXIN); @@ -125,7 +125,7 @@ public class ConnectionTest { // * // * In order to use, must have mysql and Cassandra services running locally. Must // * have a database EMP created in the mysql db. Uses -// * "Driver.getConnection(com.att.research.mdbc.ProxyDriver)" for mdbc +// * "Driver.getConnection(org.onap.music.mdbc.ProxyDriver)" for mdbc // * connection // * // * Uses preparedStatements @@ -140,7 +140,7 @@ public class ConnectionTest { // connectionProps.put("user", USER); // connectionProps.put("password", PASS); // -// final String MDBC_DRIVER = "com.att.research.mdbc.ProxyDriver"; +// final String MDBC_DRIVER = "org.onap.music.mdbc.ProxyDriver"; // final String MDBC_DB_URL = "jdbc:mdbc://localhost/EMP"; // //final String MDBC_DRIVER = "org.h2.Driver"; // //final String MDBC_DB_URL = "jdbc:h2:tcp://localhost:9092/~/test"; diff --git a/src/main/java/com/att/research/mdbc/tests/MAIN.java b/src/main/java/org/onap/music/mdbc/tests/MAIN.java similarity index 98% rename from src/main/java/com/att/research/mdbc/tests/MAIN.java rename to src/main/java/org/onap/music/mdbc/tests/MAIN.java index 164b088..160868b 100755 --- a/src/main/java/com/att/research/mdbc/tests/MAIN.java +++ b/src/main/java/org/onap/music/mdbc/tests/MAIN.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc.tests; +package org.onap.music.mdbc.tests; import java.io.FileInputStream; import java.io.InputStream; diff --git a/src/main/java/com/att/research/mdbc/tests/Test.java b/src/main/java/org/onap/music/mdbc/tests/Test.java similarity index 94% rename from src/main/java/com/att/research/mdbc/tests/Test.java rename to src/main/java/org/onap/music/mdbc/tests/Test.java index 0b8c0ab..67a78c8 100755 --- a/src/main/java/com/att/research/mdbc/tests/Test.java +++ b/src/main/java/org/onap/music/mdbc/tests/Test.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc.tests; +package org.onap.music.mdbc.tests; import java.sql.Connection; import java.sql.DriverManager; @@ -17,7 +17,7 @@ import org.json.JSONObject; * @author Robert Eby */ public abstract class Test { - public static final String MDBC_DRIVER = "com.att.research.mdbc.ProxyDriver"; + public static final String MDBC_DRIVER = "org.onap.music.mdbc.ProxyDriver"; /** * Each test derived from this class must implement this method, @@ -31,7 +31,7 @@ public abstract class Test { public String getName() { String s = this.getClass().getName(); - return s.replaceAll("com.att.research.mdbc.tests.", ""); + return s.replaceAll("org.onap.music.mdbc.tests.", ""); } public Properties buildProperties(JSONObject config, int i) { diff --git a/src/main/java/com/att/research/mdbc/tests/Test_Delete.java b/src/main/java/org/onap/music/mdbc/tests/Test_Delete.java similarity index 98% rename from src/main/java/com/att/research/mdbc/tests/Test_Delete.java rename to src/main/java/org/onap/music/mdbc/tests/Test_Delete.java index 8017cb3..6417ab7 100755 --- a/src/main/java/com/att/research/mdbc/tests/Test_Delete.java +++ b/src/main/java/org/onap/music/mdbc/tests/Test_Delete.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc.tests; +package org.onap.music.mdbc.tests; import java.sql.Connection; import java.sql.Statement; diff --git a/src/main/java/com/att/research/mdbc/tests/Test_Insert.java b/src/main/java/org/onap/music/mdbc/tests/Test_Insert.java similarity index 98% rename from src/main/java/com/att/research/mdbc/tests/Test_Insert.java rename to src/main/java/org/onap/music/mdbc/tests/Test_Insert.java index 4c19dbd..1ea0908 100755 --- a/src/main/java/com/att/research/mdbc/tests/Test_Insert.java +++ b/src/main/java/org/onap/music/mdbc/tests/Test_Insert.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc.tests; +package org.onap.music.mdbc.tests; import java.sql.Connection; import java.sql.ResultSet; diff --git a/src/main/java/com/att/research/mdbc/tests/Test_Transactions.java b/src/main/java/org/onap/music/mdbc/tests/Test_Transactions.java similarity index 98% rename from src/main/java/com/att/research/mdbc/tests/Test_Transactions.java rename to src/main/java/org/onap/music/mdbc/tests/Test_Transactions.java index 1153c9b..787f1f5 100755 --- a/src/main/java/com/att/research/mdbc/tests/Test_Transactions.java +++ b/src/main/java/org/onap/music/mdbc/tests/Test_Transactions.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc.tests; +package org.onap.music.mdbc.tests; import java.sql.Connection; import java.sql.Statement; diff --git a/src/main/java/com/att/research/mdbc/tests/package-info.java b/src/main/java/org/onap/music/mdbc/tests/package-info.java similarity index 94% rename from src/main/java/com/att/research/mdbc/tests/package-info.java rename to src/main/java/org/onap/music/mdbc/tests/package-info.java index ee993db..7e0b84d 100755 --- a/src/main/java/com/att/research/mdbc/tests/package-info.java +++ b/src/main/java/org/onap/music/mdbc/tests/package-info.java @@ -9,7 +9,7 @@ * To run the tests against all the configurations specified in /tests.json, do the following: *

    * 
    - * 	java com.att.research.mdbc.tests.MAIN [ configfile ]
+ * 	java org.onap.music.mdbc.tests.MAIN [ configfile ]
  *
    *

    * It is assumed that a copy of Cassandra is running locally on port 9042, @@ -26,9 +26,9 @@ * 

      * {
  *	"tests": [
- *		"com.att.research.mdbc.tests.Test_Insert",
- *		"com.att.research.mdbc.tests.Test_Delete",
- *		"com.att.research.mdbc.tests.Test_Transactions"
+ *		"org.onap.music.mdbc.tests.Test_Insert",
+ *		"org.onap.music.mdbc.tests.Test_Delete",
+ *		"org.onap.music.mdbc.tests.Test_Transactions"
  *	],
  *	"configs": [
  *		{
@@ -162,4 +162,4 @@
  * }
  *
    */ -package com.att.research.mdbc.tests; +package org.onap.music.mdbc.tests; diff --git a/src/main/java/com/att/research/mdbc/tools/CreateNodeConfigurations.java b/src/main/java/org/onap/music/mdbc/tools/CreateNodeConfigurations.java similarity index 90% rename from src/main/java/com/att/research/mdbc/tools/CreateNodeConfigurations.java rename to src/main/java/org/onap/music/mdbc/tools/CreateNodeConfigurations.java index f0eca5b..c4ebf46 100644 --- a/src/main/java/com/att/research/mdbc/tools/CreateNodeConfigurations.java +++ b/src/main/java/org/onap/music/mdbc/tools/CreateNodeConfigurations.java @@ -1,9 +1,9 @@ -package com.att.research.mdbc.tools; +package org.onap.music.mdbc.tools; -import com.att.research.exceptions.MDBCServiceException; -import com.att.research.logging.EELFLoggerDelegate; -import com.att.research.mdbc.configurations.NodeConfiguration; -import com.att.research.mdbc.configurations.TablesConfiguration; +import org.onap.music.exceptions.MDBCServiceException; +import org.onap.music.logging.EELFLoggerDelegate; +import org.onap.music.mdbc.configurations.NodeConfiguration; +import org.onap.music.mdbc.configurations.TablesConfiguration; import com.beust.jcommander.JCommander; import com.beust.jcommander.Parameter; diff --git a/src/main/java/com/att/research/mdbc/tools/CreatePartition.java b/src/main/java/org/onap/music/mdbc/tools/CreatePartition.java similarity index 92% rename from src/main/java/com/att/research/mdbc/tools/CreatePartition.java rename to src/main/java/org/onap/music/mdbc/tools/CreatePartition.java index a38274b..53bbc53 100644 --- a/src/main/java/com/att/research/mdbc/tools/CreatePartition.java +++ b/src/main/java/org/onap/music/mdbc/tools/CreatePartition.java @@ -1,7 +1,7 @@ -package com.att.research.mdbc.tools; +package org.onap.music.mdbc.tools; -import com.att.research.logging.EELFLoggerDelegate; -import com.att.research.mdbc.configurations.NodeConfiguration; +import org.onap.music.logging.EELFLoggerDelegate; +import org.onap.music.mdbc.configurations.NodeConfiguration; import com.beust.jcommander.JCommander; import com.beust.jcommander.Parameter; diff --git a/src/main/javadoc/overview.html b/src/main/javadoc/overview.html index 162e7ec..0be8c38 100755 --- a/src/main/javadoc/overview.html +++ b/src/main/javadoc/overview.html @@ -13,15 +13,15 @@ MDBC can automatically adopt to the database in use, as well as the style of MUS by the use of "mixins". Each JDBC Connection via MDBC specifies two mixins to use:

      -
    • a Mixin that conforms to the {@link com.att.research.mdbc.mixins.MusicInterface} specification +
    • a Mixin that conforms to the {@link org.onap.music.mdbc.mixins.MusicInterface} specification for communicating with MUSIC/Cassandra.
      • -
    • a Mixin that conforms to the {@link com.att.research.mdbc.mixins.DBInterface} specification +
    • a Mixin that conforms to the {@link org.onap.music.mdbc.mixins.DBInterface} specification for communicating with the underlying database in use.

    More details are provided on the package pages for -com.att.research.mdbc and -com.att.research.mdbc.mixins. +org.onap.music.mdbc and +org.onap.music.mdbc.mixins.

    Limitations

    There are several limitations to the use of MDBC: diff --git a/src/main/resources/META-INF/services/java.sql.Driver b/src/main/resources/META-INF/services/java.sql.Driver index 7228fe7..a135284 100755 --- a/src/main/resources/META-INF/services/java.sql.Driver +++ b/src/main/resources/META-INF/services/java.sql.Driver @@ -1 +1 @@ -com.att.research.mdbc.ProxyDriver +org.onap.music.mdbc.ProxyDriver diff --git a/src/main/resources/mdbc.properties b/src/main/resources/mdbc.properties index f6e722c..3e207aa 100755 --- a/src/main/resources/mdbc.properties +++ b/src/main/resources/mdbc.properties @@ -2,11 +2,11 @@ # A list of all Mixins that should be checked by MDBC # MIXINS= \ - com.att.research.mdbc.mixins.H2Mixin \ - com.att.research.mdbc.mixins.H2ServerMixin \ - com.att.research.mdbc.mixins.MySQLMixin \ - com.att.research.mdbc.mixins.CassandraMixin \ - com.att.research.mdbc.mixins.Cassandra2Mixin + org.onap.music.mdbc.mixins.H2Mixin \ + org.onap.music.mdbc.mixins.H2ServerMixin \ + org.onap.music.mdbc.mixins.MySQLMixin \ + org.onap.music.mdbc.mixins.CassandraMixin \ + org.onap.music.mdbc.mixins.Cassandra2Mixin critical.tables= \ TEST \ No newline at end of file diff --git a/src/main/resources/mdbc_driver.properties b/src/main/resources/mdbc_driver.properties index 1549d5f..487feb3 100644 --- a/src/main/resources/mdbc_driver.properties +++ b/src/main/resources/mdbc_driver.properties @@ -2,11 +2,11 @@ # A list of all Mixins that should be checked by MDBC # MIXINS= \ - com.att.research.mdbc.mixins.H2Mixin \ - com.att.research.mdbc.mixins.H2ServerMixin \ - com.att.research.mdbc.mixins.MySQLMixin \ - com.att.research.mdbc.mixins.CassandraMixin \ - com.att.research.mdbc.mixins.Cassandra2Mixin + org.onap.music.mdbc.mixins.H2Mixin \ + org.onap.music.mdbc.mixins.H2ServerMixin \ + org.onap.music.mdbc.mixins.MySQLMixin \ + org.onap.music.mdbc.mixins.CassandraMixin \ + org.onap.music.mdbc.mixins.Cassandra2Mixin DEFAULT_DRIVERS=\ org.h2.Driver \ diff --git a/src/main/resources/tests.json b/src/main/resources/tests.json index ac9221e..8df9f34 100755 --- a/src/main/resources/tests.json +++ b/src/main/resources/tests.json @@ -1,8 +1,8 @@ { "tests": [ - "com.att.research.mdbc.tests.Test_Insert", - "com.att.research.mdbc.tests.Test_Delete", - "com.att.research.mdbc.tests.Test_Transactions" + "org.onap.music.mdbc.tests.Test_Insert", + "org.onap.music.mdbc.tests.Test_Delete", + "org.onap.music.mdbc.tests.Test_Transactions" ], "configs": [ { diff --git a/src/main/shell/mk_jboss_module b/src/main/shell/mk_jboss_module index 28d0540..7bbb8d9 100755 --- a/src/main/shell/mk_jboss_module +++ b/src/main/shell/mk_jboss_module @@ -22,7 +22,7 @@ then fi T=/tmp/mk_jboss_module$$ -T2=$T/com/att/research/mdbc/main +T2=$T/org/onap/music/mdbc/main MODULE=$T2/module.xml TARGET=`pwd`/target/mdbc-jboss-module.tar JARS=$( mvn dependency:build-classpath | grep -v INFO | tr : '\012' ) @@ -38,7 +38,7 @@ cat > $MODULE < - + EOF for i in $JAR2; do echo " "; done >> $MODULE diff --git a/src/test/java/com/att/research/mdbc/MDBCUtilsTest.java b/src/test/java/org/onap/music/mdbc/MDBCUtilsTest.java similarity index 93% rename from src/test/java/com/att/research/mdbc/MDBCUtilsTest.java rename to src/test/java/org/onap/music/mdbc/MDBCUtilsTest.java index 7e25fe0..5e39244 100644 --- a/src/test/java/com/att/research/mdbc/MDBCUtilsTest.java +++ b/src/test/java/org/onap/music/mdbc/MDBCUtilsTest.java @@ -1,7 +1,7 @@ -package com.att.research.mdbc; +package org.onap.music.mdbc; -import com.att.research.mdbc.tables.OperationType; -import com.att.research.mdbc.tables.StagingTable; +import org.onap.music.mdbc.tables.OperationType; +import org.onap.music.mdbc.tables.StagingTable; import org.json.JSONArray; import org.json.JSONObject; diff --git a/src/test/java/com/att/research/mdbc/test/ALLTESTS.java b/src/test/java/org/onap/music/mdbc/test/ALLTESTS.java similarity index 85% rename from src/test/java/com/att/research/mdbc/test/ALLTESTS.java rename to src/test/java/org/onap/music/mdbc/test/ALLTESTS.java index c36e94c..d4ef4c3 100755 --- a/src/test/java/com/att/research/mdbc/test/ALLTESTS.java +++ b/src/test/java/org/onap/music/mdbc/test/ALLTESTS.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc.test; +package org.onap.music.mdbc.test; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/src/test/java/com/att/research/mdbc/test/BasicTest.java b/src/test/java/org/onap/music/mdbc/test/BasicTest.java similarity index 98% rename from src/test/java/com/att/research/mdbc/test/BasicTest.java rename to src/test/java/org/onap/music/mdbc/test/BasicTest.java index 2b17eba..b88a22e 100755 --- a/src/test/java/com/att/research/mdbc/test/BasicTest.java +++ b/src/test/java/org/onap/music/mdbc/test/BasicTest.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc.test; +package org.onap.music.mdbc.test; import static org.junit.Assert.*; diff --git a/src/test/java/com/att/research/mdbc/test/CrossSiteTest.java b/src/test/java/org/onap/music/mdbc/test/CrossSiteTest.java similarity index 99% rename from src/test/java/com/att/research/mdbc/test/CrossSiteTest.java rename to src/test/java/org/onap/music/mdbc/test/CrossSiteTest.java index 71ac54e..d15589f 100755 --- a/src/test/java/com/att/research/mdbc/test/CrossSiteTest.java +++ b/src/test/java/org/onap/music/mdbc/test/CrossSiteTest.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc.test; +package org.onap.music.mdbc.test; import static org.junit.Assert.*; diff --git a/src/test/java/com/att/research/mdbc/test/TestCommon.java b/src/test/java/org/onap/music/mdbc/test/TestCommon.java similarity index 90% rename from src/test/java/com/att/research/mdbc/test/TestCommon.java rename to src/test/java/org/onap/music/mdbc/test/TestCommon.java index e5e85dc..3067b01 100755 --- a/src/test/java/com/att/research/mdbc/test/TestCommon.java +++ b/src/test/java/org/onap/music/mdbc/test/TestCommon.java @@ -1,11 +1,11 @@ -package com.att.research.mdbc.test; +package org.onap.music.mdbc.test; import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; import java.util.Properties; -import com.att.research.mdbc.mixins.CassandraMixin; +import org.onap.music.mdbc.mixins.CassandraMixin; public class TestCommon { public static final String DB_DRIVER = "avatica.Driver"; diff --git a/src/test/java/com/att/research/mdbc/test/TransactionTest.java b/src/test/java/org/onap/music/mdbc/test/TransactionTest.java similarity index 99% rename from src/test/java/com/att/research/mdbc/test/TransactionTest.java rename to src/test/java/org/onap/music/mdbc/test/TransactionTest.java index 9d50db5..08eba8a 100755 --- a/src/test/java/com/att/research/mdbc/test/TransactionTest.java +++ b/src/test/java/org/onap/music/mdbc/test/TransactionTest.java @@ -1,4 +1,4 @@ -package com.att.research.mdbc.test; +package org.onap.music.mdbc.test; import static org.junit.Assert.fail;