From 4a2fd13b43ecbc9a7d459074be7a63efaaab16f4 Mon Sep 17 00:00:00 2001 From: Yury Batrakov Date: Fri, 13 Jul 2018 20:44:09 +0300 Subject: [PATCH 1/9] Build oea and noop bridges when configured --- CMakeLists.txt | 1 + mama/CMakeLists.txt | 3 +-- mama/c_cpp/src/c/CMakeLists.txt | 6 +++++ .../src/c/entitlement/oea/CMakeLists.txt | 24 +++++++++++++++++++ 4 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 mama/c_cpp/src/c/entitlement/oea/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 35840ec96..b4da14001 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,7 @@ set (LIBEVENT_ROOT "${DEFAULT_LIBEVENT_ROOT}" CACHE PATH "Libevent dependency in set (PROTON_ROOT "${DEFAULT_PROTON_ROOT}" CACHE PATH "Qpid dependency install directory (for qpid middleware and payload bridges)") set (APR_ROOT "${DEFAULT_APR_ROOT}" CACHE PATH "Apache APR dependency install directory (for core MAMA)") set (GTEST_ROOT "${DEFAULT_GTEST_ROOT}" CACHE PATH "Google test framework dependency install directory (for unit tests)") +set (OEA_ROOT "${DEFAULT_OEA_ROOT}" CACHE PATH "OEA dependency install directory (for ef ENTITLEMENTS is set to oea)") # Install / post-compilation options set (INSTALL_RUNTIME_DEPENDENCIES true CACHE BOOL "Whether or not to include dependent .so or .dll files in the installation package") diff --git a/mama/CMakeLists.txt b/mama/CMakeLists.txt index 76c733413..a872600af 100644 --- a/mama/CMakeLists.txt +++ b/mama/CMakeLists.txt @@ -14,7 +14,6 @@ add_definitions(-DOPENMAMA_INTEGRATION) get_component_version(${CMAKE_CURRENT_LIST_DIR} MAMA) add_subdirectory (c_cpp/src/c) -add_subdirectory (c_cpp/src/c/entitlement/noop) add_subdirectory (c_cpp/src/c/dqstrategyplugin) if(WITH_CPP) @@ -69,4 +68,4 @@ endif () if (WITH_CSHARP) add_subdirectory (dotnet/src/cs) -endif() \ No newline at end of file +endif() diff --git a/mama/c_cpp/src/c/CMakeLists.txt b/mama/c_cpp/src/c/CMakeLists.txt index 8409a8436..a5e3b7eff 100644 --- a/mama/c_cpp/src/c/CMakeLists.txt +++ b/mama/c_cpp/src/c/CMakeLists.txt @@ -20,6 +20,12 @@ if(DEFINED ENTITLEMENTS) string(REPLACE "," ";" ENT_LIST ${ENTITLEMENTS}) foreach(ENT ${ENT_LIST}) set(ENTITLEMENT_BRIDGES "${ENTITLEMENT_BRIDGES}\"${ENT}\", ") + if(${ENT} STREQUAL "noop") + add_subdirectory (entitlement/noop) + endif() + if(${ENT} STREQUAL "oea") + add_subdirectory (entitlement/oea) + endif() endforeach() endif() set(ENTITLEMENT_BRIDGES "${ENTITLEMENT_BRIDGES}NULL") diff --git a/mama/c_cpp/src/c/entitlement/oea/CMakeLists.txt b/mama/c_cpp/src/c/entitlement/oea/CMakeLists.txt new file mode 100644 index 000000000..80b88a241 --- /dev/null +++ b/mama/c_cpp/src/c/entitlement/oea/CMakeLists.txt @@ -0,0 +1,24 @@ +if(NOT DEFINED OEA_ROOT OR "${OEA_ROOT}" STREQUAL "") + message(SEND_ERROR "OEA_ROOT is undefined") +endif() + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${OEA_ROOT}/include/oea +) + +add_definitions(-DBRIDGE) + +add_library(mamaentoea + MODULE oea.c +) +target_link_libraries(mamaentoea mama wombatcommon) +set_target_properties(mamaentoea PROPERTIES OUTPUT_NAME "mamaentoea${OPENMAMA_LIBRARY_SUFFIX}") + +if (MSVC) + install(FILES $ DESTINATION bin OPTIONAL) +endif() +install(TARGETS mamaentoea + RUNTIME DESTINATION bin + LIBRARY DESTINATION bin + ARCHIVE DESTINATION lib) From 2822a2e2943bbe101bd820c85933e6eb4b1eaa29 Mon Sep 17 00:00:00 2001 From: Chris Morgan Date: Tue, 17 Jul 2018 14:58:28 -0400 Subject: [PATCH 2/9] Fix for Issue #371 Signed-off-by: Chris Morgan --- common/c_cpp/src/c/SConscript | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/c_cpp/src/c/SConscript b/common/c_cpp/src/c/SConscript index d60c68250..b987659bd 100644 --- a/common/c_cpp/src/c/SConscript +++ b/common/c_cpp/src/c/SConscript @@ -11,9 +11,11 @@ osname = env['host']['os'] if osname == 'Linux': includePath.append('./linux') includePath.append('./linux/wombat') + InstWomPlatformHeaders = Glob('linux/wombat/*.h') elif osname == 'Darwin': includePath.append('./darwin') includePath.append('./darwin/wombat') + InstWomPlatformHeaders = Glob('darwin/wombat/*.h') includePath.append('./wombat') @@ -57,4 +59,5 @@ lib = env.StaticLibrary('libwombatcommon', objects) Alias('install', env.Install('$libdir', lib)) Alias('install', env.Install('$incdir', InstHeaders)) Alias('install', env.Install('$incdir/wombat', InstWomHeaders)) +Alias('install', env.Install('$incdir/wombat', InstWomPlatformHeaders)) From 64c7e3b626be475b2a283d86e389fef80da21554 Mon Sep 17 00:00:00 2001 From: Frank Quinn Date: Mon, 28 May 2018 12:16:22 +0100 Subject: [PATCH 3/9] Updated version information to 6.2.2 Signed-off-by: Frank Quinn --- mama/VERSION.scons | 2 +- mama/c_cpp/src/c/generateMamaSourceFiles.bat | 2 +- mama/dotnet/src/cs/MamaVersion.cs | 4 ++-- mama/jni/build.xml | 2 +- mamda/VERSION.scons | 2 +- mamda/c_cpp/src/cpp/generateMamdaVersion.bat | 2 +- mamda/java/build.xml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mama/VERSION.scons b/mama/VERSION.scons index 585006d88..31b4948fa 100644 --- a/mama/VERSION.scons +++ b/mama/VERSION.scons @@ -1 +1 @@ -mama 6.2.1 +mama 6.2.2 diff --git a/mama/c_cpp/src/c/generateMamaSourceFiles.bat b/mama/c_cpp/src/c/generateMamaSourceFiles.bat index 6ded86485..e4df1ba87 100644 --- a/mama/c_cpp/src/c/generateMamaSourceFiles.bat +++ b/mama/c_cpp/src/c/generateMamaSourceFiles.bat @@ -1,7 +1,7 @@ set BUILD_DIR=%1 set VERSION_MAJOR=6 set VERSION_MINOR=2 -set VERSION_RELEASE=1 +set VERSION_RELEASE=2 set RC_VERSION_NUMERICAL=1 set RC_VERSION_STRING=1 set MAMACDLL=libmamacmdd.dll diff --git a/mama/dotnet/src/cs/MamaVersion.cs b/mama/dotnet/src/cs/MamaVersion.cs index 678d49719..d1322a6c7 100644 --- a/mama/dotnet/src/cs/MamaVersion.cs +++ b/mama/dotnet/src/cs/MamaVersion.cs @@ -6,7 +6,7 @@ public class MamaVersion { public static int MAMADOTNET_VERSION_MAJOR = 6; public static int MAMADOTNET_VERSION_MINOR = 2; - public static string MAMADOTNET_VERSION_RELEASE = "1"; - public static string MAMADOTNET_VERSION = "mamadotnet 6.2.1"; + public static string MAMADOTNET_VERSION_RELEASE = "2"; + public static string MAMADOTNET_VERSION = "mamadotnet 6.2.2; } } diff --git a/mama/jni/build.xml b/mama/jni/build.xml index 48c48ef11..bb661f087 100644 --- a/mama/jni/build.xml +++ b/mama/jni/build.xml @@ -1,7 +1,7 @@ - + diff --git a/mamda/VERSION.scons b/mamda/VERSION.scons index cafa341ea..a472cd2d0 100644 --- a/mamda/VERSION.scons +++ b/mamda/VERSION.scons @@ -1 +1 @@ -mamda 6.2.1 +mamda 6.2.2 diff --git a/mamda/c_cpp/src/cpp/generateMamdaVersion.bat b/mamda/c_cpp/src/cpp/generateMamdaVersion.bat index 588757dea..3c7192d2e 100644 --- a/mamda/c_cpp/src/cpp/generateMamdaVersion.bat +++ b/mamda/c_cpp/src/cpp/generateMamdaVersion.bat @@ -1,7 +1,7 @@ set BUILD_DIR=%1 set VERSION_MAJOR=6 set VERSION_MINOR=2 -set VERSION_RELEASE=1 +set VERSION_RELEASE=2 echo "generating version files.." diff --git a/mamda/java/build.xml b/mamda/java/build.xml index 5a51a6cbe..107e8a843 100644 --- a/mamda/java/build.xml +++ b/mamda/java/build.xml @@ -1,6 +1,6 @@ - + From 88c63e1ad81609fa3ea8a5c67e4bbb1467c920e5 Mon Sep 17 00:00:00 2001 From: fquinner Date: Wed, 18 Jul 2018 23:09:47 +0100 Subject: [PATCH 4/9] Fixed typo in MamaVersion C# --- mama/dotnet/src/cs/MamaVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mama/dotnet/src/cs/MamaVersion.cs b/mama/dotnet/src/cs/MamaVersion.cs index d1322a6c7..7b1f3b5bb 100644 --- a/mama/dotnet/src/cs/MamaVersion.cs +++ b/mama/dotnet/src/cs/MamaVersion.cs @@ -7,6 +7,6 @@ public class MamaVersion public static int MAMADOTNET_VERSION_MAJOR = 6; public static int MAMADOTNET_VERSION_MINOR = 2; public static string MAMADOTNET_VERSION_RELEASE = "2"; - public static string MAMADOTNET_VERSION = "mamadotnet 6.2.2; + public static string MAMADOTNET_VERSION = "mamadotnet 6.2.2"; } } From 76184bbfe01a4d40c580b39414991242c8df2bcd Mon Sep 17 00:00:00 2001 From: Chris Morgan Date: Thu, 19 Jul 2018 09:58:54 -0400 Subject: [PATCH 5/9] Restored mamaSubscription_setRecoverGaps and mamaSubscription_getRecoverGaps functions using the new DqStrategy internal functions Signed-off-by: Chris Morgan --- mama/c_cpp/src/c/mama/subscription.h | 35 ++++++++++++++++++++++++++++ mama/c_cpp/src/c/subscription.c | 12 ++++++++++ 2 files changed, 47 insertions(+) diff --git a/mama/c_cpp/src/c/mama/subscription.h b/mama/c_cpp/src/c/mama/subscription.h index 5b23375da..bbc8d3812 100644 --- a/mama/c_cpp/src/c/mama/subscription.h +++ b/mama/c_cpp/src/c/mama/subscription.h @@ -744,6 +744,23 @@ mamaSubscription_getReceivedInitial( mamaSubscription subscription, int *receivedInitial); +/** + * @brief Whether the specified subscription will attempt to recover from sequence + * number gaps. + * + * @param[in] subscription The subscription + * @param[out] doesRecover 0 - does not recover, 1 - does attempt to recover + * + * @return mama_status return code can be one of: + * MAMA_STATUS_NULL_ARG + * MAMA_STATUS_OK + */ +MAMAExpDLL +extern mama_status +mamaSubscription_getRecoverGaps ( + mamaSubscription subscription, + int *doesRecover); + /** * @brief Returns a value of 1 or 0 indicating whether this subscription is * interested in initial values. @@ -1147,6 +1164,24 @@ mamaSubscription_setPreIntitialCacheSize( mamaSubscription subscription, int cacheSize); +/** + * @brief Whether a subscription should attempt to recover from + * sequence number gaps. + * + * @param[in] subscription The subscription + * @param[out] doesRecover 0 indicates not to recover. 1 The subscription will + * attempt to recover via a recap request. + * + * @return mama_status return code can be one of: + * MAMA_STATUS_NULL_ARG + * MAMA_STATUS_OK + */ +MAMAExpDLL +extern mama_status +mamaSubscription_setRecoverGaps ( + mamaSubscription subscription, + int doesRecover); + /** * @brief Whether an initial value is required for the specified subscription. * diff --git a/mama/c_cpp/src/c/subscription.c b/mama/c_cpp/src/c/subscription.c index 23df1b4a4..dd725397b 100644 --- a/mama/c_cpp/src/c/subscription.c +++ b/mama/c_cpp/src/c/subscription.c @@ -1122,6 +1122,12 @@ mamaSubscription_hasWildcards (mamaSubscription subscription) (self->mSubscBridge); } +mama_status +mamaSubscription_setRecoverGaps (mamaSubscription subscription, int doesRecover) +{ + return dqStrategy_setRecoverGaps(mamaSubscription_getDqStrategy(subscription), doesRecover); +} + mama_status mamaSubscription_setGroupSizeHint (mamaSubscription subscription, int groupSizeHint) { @@ -1129,6 +1135,12 @@ mamaSubscription_setGroupSizeHint (mamaSubscription subscription, int groupSizeH return MAMA_STATUS_OK; } +mama_status +mamaSubscription_getRecoverGaps (mamaSubscription subscription, int* result) +{ + return dqStrategy_getRecoverGaps(mamaSubscription_getDqStrategy(subscription), result); +} + SubjectContext * mamaSubscription_getSubjectContext (mamaSubscription subscription, const mamaMsg msg) From ddff7235449d138f9dfda9b54a5ca947eaad97f0 Mon Sep 17 00:00:00 2001 From: Frank Quinn Date: Sat, 30 Jun 2018 21:39:10 +0100 Subject: [PATCH 6/9] Added maven central tasks and fixed javadoc error Signed-off-by: Frank Quinn --- mama/jni/build.gradle | 71 ++++++++++++++++++- mama/jni/gradle.properties | 6 ++ .../java/com/wombat/mama/MamaDateTime.java | 4 +- .../main/java/com/wombat/mama/MamaError.java | 2 +- .../main/java/com/wombat/mama/MamaMsg.java | 15 ++-- .../main/java/com/wombat/mama/MamaPrice.java | 4 +- .../com/wombat/mama/MamaPricePrecision.java | 2 +- .../com/wombat/mama/examples/MamaListen.java | 4 +- mamda/java/build.gradle | 68 ++++++++++++++++++ mamda/java/gradle.properties | 6 ++ .../wombat/mamda/MamdaAuctionListener.java | 5 -- .../wombat/mamda/MamdaConcreteBasicEvent.java | 8 +-- .../java/com/wombat/mamda/MamdaFields.java | 2 +- .../mamda/MamdaOrderImbalanceListener.java | 4 -- .../com/wombat/mamda/MamdaQuoteUpdate.java | 4 +- .../com/wombat/mamda/MamdaSecurityStatus.java | 2 +- .../mamda/MamdaSecurityStatusUpdate.java | 1 - .../wombat/mamda/MamdaTradeCancelOrError.java | 1 - .../wombat/mamda/MamdaTradeCorrection.java | 2 +- .../com/wombat/mamda/MamdaTradeListener.java | 18 ----- .../com/wombat/mamda/MamdaTradeRecap.java | 8 +-- .../com/wombat/mamda/MamdaTradeReport.java | 8 +-- .../mamda/examples/MamdaBookTicker.java | 2 +- .../mamda/orderbook/MamdaOrderBook.java | 5 +- .../mamda/orderbook/MamdaOrderBookEntry.java | 4 +- .../orderbook/MamdaOrderBookPriceLevel.java | 8 +-- 26 files changed, 193 insertions(+), 71 deletions(-) create mode 100644 mama/jni/gradle.properties create mode 100644 mamda/java/gradle.properties diff --git a/mama/jni/build.gradle b/mama/jni/build.gradle index 599d9272e..2120e4a0f 100644 --- a/mama/jni/build.gradle +++ b/mama/jni/build.gradle @@ -1,4 +1,10 @@ apply plugin: 'java' +apply plugin: 'maven' +apply plugin: 'signing' + +group = "org.openmama" +archivesBaseName = "openmama" +version = "6.2.2" repositories { mavenCentral() @@ -10,4 +16,67 @@ dependencies { test { environment "PATH", "C:\\Users\\fquinn\\SourceExternal\\github\\fquinner\\OpenMAMA\\openmama_install_6.2.1\\bin\\dynamic" -} \ No newline at end of file +} + +task javadocJar(type: Jar) { + classifier = 'javadoc' + from javadoc +} + +task sourcesJar(type: Jar) { + classifier = 'sources' + from sourceSets.main.allSource +} + +artifacts { + archives javadocJar, sourcesJar +} + +signing { + sign configurations.archives +} + +uploadArchives { + repositories { + mavenDeployer { + beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } + + repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") { + authentication(userName: ossrhUsername, password: ossrhPassword) + } + + snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") { + authentication(userName: ossrhUsername, password: ossrhPassword) + } + + pom.project { + name 'OpenMAMA' + packaging 'jar' + // optionally artifactId can be defined here + description 'OpenMAMA is a high performance vendor neutral lightweight wrapper that provides a common API interface to different middleware and messaging solutions across a variety of platforms and languages.' + url 'https://www.openmama.org' + + scm { + connection 'scm:https://github.com/OpenMAMA/OpenMAMA.git' + developerConnection 'scm:git@github.com:OpenMAMA/OpenMAMA.git' + url 'https://github.com/OpenMAMA/OpenMAMA' + } + + licenses { + license { + name 'GNU LESSER GENERAL PUBLIC LICENSE 2.1' + url 'https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html' + } + } + + developers { + developer { + id 'fquinner' + name 'Frank Quinn' + email 'fquinn@cascadium.io' + } + } + } + } + } +} \ No newline at end of file diff --git a/mama/jni/gradle.properties b/mama/jni/gradle.properties new file mode 100644 index 000000000..2e18a97fc --- /dev/null +++ b/mama/jni/gradle.properties @@ -0,0 +1,6 @@ +signing.keyId= +signing.password= +signing.secretKeyRingFile= + +ossrhUsername= +ossrhPassword= \ No newline at end of file diff --git a/mama/jni/src/main/java/com/wombat/mama/MamaDateTime.java b/mama/jni/src/main/java/com/wombat/mama/MamaDateTime.java index dc29aa0ef..05ef90f74 100644 --- a/mama/jni/src/main/java/com/wombat/mama/MamaDateTime.java +++ b/mama/jni/src/main/java/com/wombat/mama/MamaDateTime.java @@ -243,7 +243,7 @@ public native void setDate ( * Get the date and time as microseconds since the Epoch, (using the UTC timezone). * * @return The number of microseconds since the Epoch. - * @exception com.wombat.mama MamaException thrown if the underlying JNI object has been destroyed. + * @exception com.wombat.mama.MamaException thrown if the underlying JNI object has been destroyed. * @exception com.wombat.common.WombatException for other general MAMA errors. */ public long getEpochTimeMicroseconds () @@ -282,7 +282,7 @@ public double getEpochTimeSeconds (MamaTimeZone tz) * threads concurrently to avoid contention in strftime. * * @return The number of seconds, (including partial seconds), since the Epoch. - * @exception com.wombat.mama MamaException thrown if the underlying JNI object has been destroyed. + * @exception com.wombat.mama.MamaException thrown if the underlying JNI object has been destroyed. * @exception com.wombat.common.WombatException for other general MAMA errors. */ public native double getEpochTimeSecondsWithCheck (); diff --git a/mama/jni/src/main/java/com/wombat/mama/MamaError.java b/mama/jni/src/main/java/com/wombat/mama/MamaError.java index 8fbb0af9a..de9e2d2dd 100644 --- a/mama/jni/src/main/java/com/wombat/mama/MamaError.java +++ b/mama/jni/src/main/java/com/wombat/mama/MamaError.java @@ -42,7 +42,7 @@ public class MamaError /** Get a stringified representation of the error. - @param quality A valid quality short value. + @param error The error code to stringify. @return The string representation of the quality. */ public static String toString (int error) diff --git a/mama/jni/src/main/java/com/wombat/mama/MamaMsg.java b/mama/jni/src/main/java/com/wombat/mama/MamaMsg.java index 35f53625d..1024be016 100644 --- a/mama/jni/src/main/java/com/wombat/mama/MamaMsg.java +++ b/mama/jni/src/main/java/com/wombat/mama/MamaMsg.java @@ -28,10 +28,12 @@ /** * Wrapper class for the native C mama msg structure. * - *

- * Field identifiers must be >=0. A field identifier of 0 indicates that there - * is no unique FID and multiple fields with the same name may have FID == 0. - *

+ *

+ * Field identifiers must be greater than or equal to 0. A field identifier + * of 0 indicates that there is no unique FID and multiple fields with the + * same name may have FID == 0. + *

+ *

* Field lookup proceeds in the following manner. *

    *
  1. @@ -39,13 +41,12 @@ * specified fid and return the field if it exists (the name is not validated). * Otherwise return null. *
    2. - *

    *

  2. * If the fid supplied is 0, return the first field encountered with the * supplied name or null if no such field exists. *
    3. *
- *

+ *

* Get methods for numeric values may result in loss of information through * either rounding or truncation when a larger data type is accessed as a * smaller one. The result may be the same as the result of casting the larger @@ -54,7 +55,7 @@ * might return Short.MIN_VALUE. It is also valid to throw a * ClassCastException or other appropriate * RuntimeException. - *

+ *

* Since some message implementations may not natively support all data types, * the behaviour may vary substantially. In creating and accessing messages the * Wombat APIs assume that the underlying values are stored in the smallest diff --git a/mama/jni/src/main/java/com/wombat/mama/MamaPrice.java b/mama/jni/src/main/java/com/wombat/mama/MamaPrice.java index 1165c0bfd..b13acfcd5 100644 --- a/mama/jni/src/main/java/com/wombat/mama/MamaPrice.java +++ b/mama/jni/src/main/java/com/wombat/mama/MamaPrice.java @@ -156,7 +156,7 @@ public void setHints (MamaPriceHints hints) * This function obtains the double value of the price rounded to zero precision. * * @return The rounded value. - * @exception com.wombat.mama MamaException thrown if the underlying JNI object has been destroyed. + * @exception com.wombat.mama.MamaException thrown if the underlying JNI object has been destroyed. * @exception com.wombat.common.WombatException for other general MAMA errors. */ public double getRoundedValue () @@ -169,7 +169,7 @@ public double getRoundedValue () * * @param precision The precision to use for rounding. * @return The rounded value. - * @exception com.wombat.mama MamaException thrown if the underlying JNI object has been destroyed. + * @exception com.wombat.mama.MamaException thrown if the underlying JNI object has been destroyed. * @exception com.wombat.common.WombatException for other general MAMA errors. */ public double getRoundedValue (MamaPricePrecision precision) diff --git a/mama/jni/src/main/java/com/wombat/mama/MamaPricePrecision.java b/mama/jni/src/main/java/com/wombat/mama/MamaPricePrecision.java index f04e7c41c..a2ce54b48 100644 --- a/mama/jni/src/main/java/com/wombat/mama/MamaPricePrecision.java +++ b/mama/jni/src/main/java/com/wombat/mama/MamaPricePrecision.java @@ -145,7 +145,7 @@ public String toString () /** * Return the appropriate precision for a given number of - * decimal places. If places > 10 return Unknown. + * decimal places. If places is greater than 10 return Unknown. */ public static MamaPricePrecision decimals2Precision (int places) { diff --git a/mama/jni/src/main/java/com/wombat/mama/examples/MamaListen.java b/mama/jni/src/main/java/com/wombat/mama/examples/MamaListen.java index 4f3a26c6d..51df6f1ca 100644 --- a/mama/jni/src/main/java/com/wombat/mama/examples/MamaListen.java +++ b/mama/jni/src/main/java/com/wombat/mama/examples/MamaListen.java @@ -52,7 +52,7 @@ * * java com.wombat.mama.MamaListen -S SOURCE -s MSFT.ISLD * - * 3. Subscribing to top-of-book MSFT & ORCL from Island ITCH feed + * 3. Subscribing to top-of-book MSFT and ORCL from Island ITCH feed * (specific fields): * * java com.wombat.mama.MamaListen -s MSFT.ISLD -s ORCL.ISLD wBidPrice wBidSize wAskPrice wAskSize wTradePrice wTradeVolume wTotalVolume @@ -60,7 +60,7 @@ * 4. Subscribing to a list of symbols from a file (all fields): * * java com.wombat.mama.MamaListen -S WOMABT -f file - * 
+ *
*/ public class MamaListen { diff --git a/mamda/java/build.gradle b/mamda/java/build.gradle index 7fda33b44..884192033 100644 --- a/mamda/java/build.gradle +++ b/mamda/java/build.gradle @@ -1,4 +1,10 @@ apply plugin: 'java' +apply plugin: 'maven' +apply plugin: 'signing' + +group = "org.openmama" +archivesBaseName = "openmamda" +version = "6.2.2" repositories { mavenCentral() @@ -15,3 +21,65 @@ test { ] } +task javadocJar(type: Jar) { + classifier = 'javadoc' + from javadoc +} + +task sourcesJar(type: Jar) { + classifier = 'sources' + from sourceSets.main.allSource +} + +artifacts { + archives javadocJar, sourcesJar +} + +signing { + sign configurations.archives +} + +uploadArchives { + repositories { + mavenDeployer { + beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } + + repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") { + authentication(userName: ossrhUsername, password: ossrhPassword) + } + + snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") { + authentication(userName: ossrhUsername, password: ossrhPassword) + } + + pom.project { + name 'OpenMAMDA' + packaging 'jar' + // optionally artifactId can be defined here + description 'OpenMAMDA is a high performance Market Data API written on top of OpenMAMA.' + url 'https://www.openmama.org' + + scm { + connection 'scm:https://github.com/OpenMAMA/OpenMAMA.git' + developerConnection 'scm:git@github.com:OpenMAMA/OpenMAMA.git' + url 'https://github.com/OpenMAMA/OpenMAMA' + } + + licenses { + license { + name 'GNU LESSER GENERAL PUBLIC LICENSE 2.1' + url 'https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html' + } + } + + developers { + developer { + id 'fquinner' + name 'Frank Quinn' + email 'fquinn@cascadium.io' + } + } + } + } + } +} \ No newline at end of file diff --git a/mamda/java/gradle.properties b/mamda/java/gradle.properties new file mode 100644 index 000000000..2e18a97fc --- /dev/null +++ b/mamda/java/gradle.properties @@ -0,0 +1,6 @@ +signing.keyId= +signing.password= +signing.secretKeyRingFile= + +ossrhUsername= +ossrhPassword= \ No newline at end of file diff --git a/mamda/java/src/main/java/com/wombat/mamda/MamdaAuctionListener.java b/mamda/java/src/main/java/com/wombat/mamda/MamdaAuctionListener.java index 09f6375ab..7ffe67f2f 100644 --- a/mamda/java/src/main/java/com/wombat/mamda/MamdaAuctionListener.java +++ b/mamda/java/src/main/java/com/wombat/mamda/MamdaAuctionListener.java @@ -88,7 +88,6 @@ public class MamdaAuctionListener implements MamdaMsgListener, /** * clearCache - clears all cached data by resetting to * default values. - * @param cache The Auction order cache to clear. */ public void clearCache () { @@ -154,7 +153,6 @@ public MamaDateTime getSrcTime () /** * getSendTime * @return mSendTime - * @see MamdaBasicEvent#getSendTime */ public MamaDateTime getSendTime () { @@ -164,7 +162,6 @@ public MamaDateTime getSendTime () /** * getLineTime * @return mLineTime - * @see MamdaBasicEvent#getLineTime */ public MamaDateTime getLineTime () { @@ -268,7 +265,6 @@ public short getSrcTimeFieldState() /** * getSendTimeFieldState * @return mSendTimeFieldState - * @see MamdaBasicEvent#getSendTimeFieldState */ public short getSendTimeFieldState() { @@ -278,7 +274,6 @@ public short getSendTimeFieldState() /** * getLineTimeFieldState * @return mLineTimeFieldState - * @see MamdaBasicEvent#getLineTimeFieldState */ public short getLineTimeFieldState() { diff --git a/mamda/java/src/main/java/com/wombat/mamda/MamdaConcreteBasicEvent.java b/mamda/java/src/main/java/com/wombat/mamda/MamdaConcreteBasicEvent.java index fd0951e23..0cacf6c29 100644 --- a/mamda/java/src/main/java/com/wombat/mamda/MamdaConcreteBasicEvent.java +++ b/mamda/java/src/main/java/com/wombat/mamda/MamdaConcreteBasicEvent.java @@ -51,7 +51,7 @@ public short getSrcTimeFieldState () } /** - * @param mSrcTime The mSrcTime to set. + * @param srcTime The mSrcTime to set. */ public void setSrcTime (MamaDateTime srcTime) { @@ -75,7 +75,7 @@ public short getActivityTimeFieldState () } /** - * @param mActivityTime The mActivityTime to set. + * @param activityTime The mActivityTime to set. */ public void setActivityTime (MamaDateTime activityTime) { @@ -99,7 +99,7 @@ public short getEventTimeFieldState () } /** - * @param mEventTime The mEventTime to set. + * @param eventTime The mEventTime to set. */ public void setEventTime (MamaDateTime eventTime) { @@ -123,7 +123,7 @@ public short getEventSeqNumFieldState () } /** - * @param mEventSeqNum The mEventSeqNum to set. + * @param eventSeqNum The mEventSeqNum to set. */ public void setEventSeqNum (long eventSeqNum) { diff --git a/mamda/java/src/main/java/com/wombat/mamda/MamdaFields.java b/mamda/java/src/main/java/com/wombat/mamda/MamdaFields.java index ac70147b3..3a72e07e5 100644 --- a/mamda/java/src/main/java/com/wombat/mamda/MamdaFields.java +++ b/mamda/java/src/main/java/com/wombat/mamda/MamdaFields.java @@ -34,7 +34,7 @@ * setDictionary() method which contains field mappings. *
* Each mapping should have the following format:
- * mamda.field.= e.g.
+ * mamda.field.[common field name]=[mapped field name] e.g.
* mamda.field.wTradePrice=myMappedTradePrice where myMappedTradePrice is the * name of the field under which the trade price is being published by the * feedhandlers and which is being published by the dictionary to describe the diff --git a/mamda/java/src/main/java/com/wombat/mamda/MamdaOrderImbalanceListener.java b/mamda/java/src/main/java/com/wombat/mamda/MamdaOrderImbalanceListener.java index 25bd0ced1..069740661 100644 --- a/mamda/java/src/main/java/com/wombat/mamda/MamdaOrderImbalanceListener.java +++ b/mamda/java/src/main/java/com/wombat/mamda/MamdaOrderImbalanceListener.java @@ -352,7 +352,6 @@ public MamaDateTime getSrcTime () /** * getSendTime * @return mSendTime - * @see MamdaBasicEvent#getSendTime */ public MamaDateTime getSendTime () { @@ -362,7 +361,6 @@ public MamaDateTime getSendTime () /** * getLineTime * @return mLineTime - * @see MamdaBasicEvent#getLineTime */ public MamaDateTime getLineTime () { @@ -610,7 +608,6 @@ public short getSrcTimeFieldState() /** * getSendTimeFieldState * @return mSendTimeFieldState - * @see MamdaBasicEvent#getSendTimeFieldState */ public short getSendTimeFieldState() { @@ -620,7 +617,6 @@ public short getSendTimeFieldState() /** * getLineTimeFieldState * @return mLineTimeFieldState - * @see MamdaBasicEvent#getLineTimeFieldState */ public short getLineTimeFieldState() { diff --git a/mamda/java/src/main/java/com/wombat/mamda/MamdaQuoteUpdate.java b/mamda/java/src/main/java/com/wombat/mamda/MamdaQuoteUpdate.java index ce5ce1b2d..a214570f5 100644 --- a/mamda/java/src/main/java/com/wombat/mamda/MamdaQuoteUpdate.java +++ b/mamda/java/src/main/java/com/wombat/mamda/MamdaQuoteUpdate.java @@ -104,7 +104,7 @@ public interface MamdaQuoteUpdate extends MamdaBasicEvent * the security. This field may contain multiple string values, * separated by the colon(:) character. * - * + *
* * * @@ -297,7 +297,7 @@ public interface MamdaQuoteUpdate extends MamdaBasicEvent * National Bid Tick Indicator based on changes to the bid price of the * National Best Bid or Offer (National BBO). * - *
ValueMeaning
Normal
+ *
* * * diff --git a/mamda/java/src/main/java/com/wombat/mamda/MamdaSecurityStatus.java b/mamda/java/src/main/java/com/wombat/mamda/MamdaSecurityStatus.java index 6b32e7e23..b482f1579 100644 --- a/mamda/java/src/main/java/com/wombat/mamda/MamdaSecurityStatus.java +++ b/mamda/java/src/main/java/com/wombat/mamda/MamdaSecurityStatus.java @@ -86,7 +86,7 @@ public static String toString (short securityStatus) * Convert a string representation of a security status to the * enumeration. * - * @param securityStatusStr The security status as a string. + * @param securityStatus The security status as a string. * * @return The security status as a short. */ diff --git a/mamda/java/src/main/java/com/wombat/mamda/MamdaSecurityStatusUpdate.java b/mamda/java/src/main/java/com/wombat/mamda/MamdaSecurityStatusUpdate.java index 796bf72c4..632048fd4 100644 --- a/mamda/java/src/main/java/com/wombat/mamda/MamdaSecurityStatusUpdate.java +++ b/mamda/java/src/main/java/com/wombat/mamda/MamdaSecurityStatusUpdate.java @@ -339,7 +339,6 @@ public interface MamdaSecurityStatusUpdate extends MamdaBasicEvent * see getSecurityStatusQualifierStr/getSecurityStatusQualifierEnum. * * @return The reason for the current status. - * @see getSecurityStatusQualfierStr() */ public String getReason(); diff --git a/mamda/java/src/main/java/com/wombat/mamda/MamdaTradeCancelOrError.java b/mamda/java/src/main/java/com/wombat/mamda/MamdaTradeCancelOrError.java index 62aef5709..23b4672c6 100644 --- a/mamda/java/src/main/java/com/wombat/mamda/MamdaTradeCancelOrError.java +++ b/mamda/java/src/main/java/com/wombat/mamda/MamdaTradeCancelOrError.java @@ -152,7 +152,6 @@ public interface MamdaTradeCancelOrError extends MamdaBasicEvent /** * getShortSaleCircuitBreaker Returns the ShortSaleCircuitBreaker * @return ShortSaleCircuitBreaker - * @see MamdaTradeReport#getOrigShortSaleCircuitBreaker() */ public char getOrigShortSaleCircuitBreaker(); diff --git a/mamda/java/src/main/java/com/wombat/mamda/MamdaTradeCorrection.java b/mamda/java/src/main/java/com/wombat/mamda/MamdaTradeCorrection.java index 1ecbd0897..a56e79bfc 100644 --- a/mamda/java/src/main/java/com/wombat/mamda/MamdaTradeCorrection.java +++ b/mamda/java/src/main/java/com/wombat/mamda/MamdaTradeCorrection.java @@ -239,7 +239,7 @@ public interface MamdaTradeCorrection extends MamdaBasicEvent /** * getShortSaleCircuitBreaker Returns the ShortSaleCircuitBreaker * @return ShortSaleCircuitBreaker - * @see MamdaTradeReport#getCorrShortSaleCircuitBreaker() + */ public char getCorrShortSaleCircuitBreaker(); diff --git a/mamda/java/src/main/java/com/wombat/mamda/MamdaTradeListener.java b/mamda/java/src/main/java/com/wombat/mamda/MamdaTradeListener.java index 576f5ec02..c478b2aa4 100644 --- a/mamda/java/src/main/java/com/wombat/mamda/MamdaTradeListener.java +++ b/mamda/java/src/main/java/com/wombat/mamda/MamdaTradeListener.java @@ -1086,25 +1086,16 @@ public char getTradeStopStock() return mTradeCache.mStopStockInd.getValue(); } - /** - * @see MamdaTradeReport#gettradeExecVenue() - */ public String getTradeExecVenue() { return mTradeCache.mTradeExecVenue.getValue(); } - /** - * @see MamdaTradeReport#geOffExchangetTradePrice() - */ public MamaPrice getOffExchangeTradePrice() { return mTradeCache.mOffExTradePrice; } - /** - * @see MamdaTradeReport#getOnExchangeTradePrice() - */ public MamaPrice getOnExchangeTradePrice() { return mTradeCache.mOnExTradePrice; @@ -1814,25 +1805,16 @@ public short getTradeStopStockFieldState() return mTradeCache.mStopStockIndFieldState.getState(); } - /** - * @see MamdaTradeReport#gettradeExecVenueFieldState() - */ public short getTradeExecVenueFieldState() { return mTradeCache.mTradeExecVenueFieldState.getState(); } - /** - * @see MamdaTradeReport#geOffExchangetTradePriceFieldState() - */ public short getOffExchangeTradePriceFieldState() { return mTradeCache.mOffExTradePriceFieldState.getState(); } - /** - * @see MamdaTradeReport#getOnExchangeTradePriceFieldState() - */ public short getOnExchangeTradePriceFieldState() { return mTradeCache.mOnExTradePriceFieldState.getState(); diff --git a/mamda/java/src/main/java/com/wombat/mamda/MamdaTradeRecap.java b/mamda/java/src/main/java/com/wombat/mamda/MamdaTradeRecap.java index 8278c920a..8c483b0b6 100644 --- a/mamda/java/src/main/java/com/wombat/mamda/MamdaTradeRecap.java +++ b/mamda/java/src/main/java/com/wombat/mamda/MamdaTradeRecap.java @@ -219,7 +219,7 @@ public interface MamdaTradeRecap extends MamdaBasicRecap *
  • 0- : Unchanged; Previous move was down tick.
    • *
  • NA : Not applicable. (If it is meaningful to have * such a value for some exchanges.)
    • - *
      + *
    */ public String getTradeDirection(); @@ -235,13 +235,13 @@ public interface MamdaTradeRecap extends MamdaBasicRecap *
  • 0 : No TradeSide is currently known/available.
    • *
  • 1 or B : Buy
    • *
  • 2 or S : Sell
    • - *
      + *
    * AggressorSide *
      *
    • 0 : No AggressorSide is currently known/available.
      • *
    • 1 or B : Buy
      • *
    • 2 or S : Sell
      • - *
        + *
      */ public String getSide(); @@ -469,7 +469,7 @@ public interface MamdaTradeRecap extends MamdaBasicRecap *
    • OnExchange
      • *
    • OnExchangeOffBook
      • *
    • OffExchange
      • - *
        + *
      */ public String getTradeExecVenue(); diff --git a/mamda/java/src/main/java/com/wombat/mamda/MamdaTradeReport.java b/mamda/java/src/main/java/com/wombat/mamda/MamdaTradeReport.java index 1117e7967..5153aef73 100644 --- a/mamda/java/src/main/java/com/wombat/mamda/MamdaTradeReport.java +++ b/mamda/java/src/main/java/com/wombat/mamda/MamdaTradeReport.java @@ -72,12 +72,12 @@ public interface MamdaTradeReport extends MamdaBasicEvent public short getTradePartIdFieldState(); /** - * @see MamdaTradeRecap#getSide(); + * (@see MamdaTradeRecap#getSide()) */ public String getSide(); /** - * @see MamdaTradeRecap#getSideFieldState(); + * (@see MamdaTradeRecap#getSideFieldState()) */ public short getSideFieldState(); @@ -100,7 +100,7 @@ public interface MamdaTradeReport extends MamdaBasicEvent * the current trade for the security. This field may contain * multiple string values, separated by the colon(:) character. * - *
    ValueMeaning
    U
    + *
    * * * @@ -220,7 +220,7 @@ public interface MamdaTradeReport extends MamdaBasicEvent * transaction time. * * - * + * * * * diff --git a/mamda/java/src/main/java/com/wombat/mamda/examples/MamdaBookTicker.java b/mamda/java/src/main/java/com/wombat/mamda/examples/MamdaBookTicker.java index 13a27c407..e8f5f0696 100644 --- a/mamda/java/src/main/java/com/wombat/mamda/examples/MamdaBookTicker.java +++ b/mamda/java/src/main/java/com/wombat/mamda/examples/MamdaBookTicker.java @@ -41,7 +41,7 @@ /** * The MamdaBookTicker example shows how to make a subscription for an - * order book (similar to trades & quotes). In the callback, one gets + * order book (similar to trades and quotes). In the callback, one gets * access to the complete book after the delta has been applied. The * example prints the entire book upon receipt of a recap/initial and * just the top-10 for a delta (although the full book is readily diff --git a/mamda/java/src/main/java/com/wombat/mamda/orderbook/MamdaOrderBook.java b/mamda/java/src/main/java/com/wombat/mamda/orderbook/MamdaOrderBook.java index 765d209f3..b3c90b208 100644 --- a/mamda/java/src/main/java/com/wombat/mamda/orderbook/MamdaOrderBook.java +++ b/mamda/java/src/main/java/com/wombat/mamda/orderbook/MamdaOrderBook.java @@ -636,7 +636,8 @@ public void assertEqual (MamdaOrderBook rhs) * thrown if the books are not equal, along with the reason for * the inequality. * - * @param rhs The order book to compare to the current book. + * @param lhsLevel Left hand side price level to compare. + * @param rhsLevel Right hand side price level to compare. * * @throws MamdaOrderBookException The two books are not equal. */ @@ -815,7 +816,7 @@ public void clearDeltaList() * @param level MamdaOrderBookPriceLevel where change occurred. * @param plDeltaSize Pricelevel size change. * @param plAction Pricelevel action. - * @param entAction Entry action. + * @param entryAction Entry action. */ public void addDelta( MamdaOrderBookEntry entry, diff --git a/mamda/java/src/main/java/com/wombat/mamda/orderbook/MamdaOrderBookEntry.java b/mamda/java/src/main/java/com/wombat/mamda/orderbook/MamdaOrderBookEntry.java index ad75cbc2e..beb3dcc10 100644 --- a/mamda/java/src/main/java/com/wombat/mamda/orderbook/MamdaOrderBookEntry.java +++ b/mamda/java/src/main/java/com/wombat/mamda/orderbook/MamdaOrderBookEntry.java @@ -264,7 +264,7 @@ public MamaDateTime getTime () /** * Set the status for the entry. * - * @value the new status value. + * @param value the new status value. */ public void setStatus (int value) { @@ -614,7 +614,7 @@ private MamaSourceState getSourceState () * Order book entry equality verification. A * MamdaOrderBookException is thrown if the entries within a price * level are not equal, along with the reason for the inequality. - * \throw \n + * @throws MamdaOrderBookException */ public void assertEqual (MamdaOrderBookEntry rhs) { diff --git a/mamda/java/src/main/java/com/wombat/mamda/orderbook/MamdaOrderBookPriceLevel.java b/mamda/java/src/main/java/com/wombat/mamda/orderbook/MamdaOrderBookPriceLevel.java index 3e2fb2e1c..a219e3b9e 100644 --- a/mamda/java/src/main/java/com/wombat/mamda/orderbook/MamdaOrderBookPriceLevel.java +++ b/mamda/java/src/main/java/com/wombat/mamda/orderbook/MamdaOrderBookPriceLevel.java @@ -310,7 +310,7 @@ public boolean empty () } /** - * Take the details from level and apply them to this level. + * Take the details from level and apply them to this level. * This does not update entries within the level, only information * pertaining to the level itself. * It is intended that this method should not be used externally to the @@ -330,7 +330,7 @@ public void setDetails (MamdaOrderBookPriceLevel level) } /** - * Take the details from atomic level and apply them to this level. + * Take the details from atomic level and apply them to this level. * This does not update entries within the level, only information * pertaining to the level itself. * It is intended that this method should not be used externally to the @@ -348,7 +348,7 @@ public void setDetails (MamdaBookAtomicLevel level) } /** - * Take the details from atomic levelEntry and apply them to this levelEntry. + * Take the details from atomic levelEntry and apply them to this levelEntry. * This update entries within the level. * It is intended that this method should not be used externally to the * API. @@ -608,7 +608,7 @@ public void checkNotExist (MamdaOrderBookEntry entry) * MamdaOrderBookException exception is thrown. Otherwise the * method simply returns. * - * @param entry The entry whose presence in the level is being determined. + * @param levelEntry The entry whose presence in the level is being determined. * * @throws MamdaOrderBookException If the entry is found in the price * level. From 541f2dc382a134c96e33ceb3bd9d6648a8872318 Mon Sep 17 00:00:00 2001 From: Frank Quinn Date: Wed, 18 Jul 2018 20:37:31 +0100 Subject: [PATCH 7/9] Updating versions for maven upload --- mama/jni/build.gradle | 2 +- mamda/java/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mama/jni/build.gradle b/mama/jni/build.gradle index 2120e4a0f..dce1bc183 100644 --- a/mama/jni/build.gradle +++ b/mama/jni/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'signing' group = "org.openmama" archivesBaseName = "openmama" -version = "6.2.2" +version = "6.2.2-1" repositories { mavenCentral() diff --git a/mamda/java/build.gradle b/mamda/java/build.gradle index 884192033..cb47c44ac 100644 --- a/mamda/java/build.gradle +++ b/mamda/java/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'signing' group = "org.openmama" archivesBaseName = "openmamda" -version = "6.2.2" +version = "6.2.2-1" repositories { mavenCentral() From 86745073d025035b4c8f8b05529118baa7641e58 Mon Sep 17 00:00:00 2001 From: Frank Quinn Date: Wed, 18 Jul 2018 22:00:23 +0100 Subject: [PATCH 8/9] Updated cmake not to use maven central naming Signed-off-by: Frank Quinn --- mama/jni/build.gradle | 8 +++++--- mama/jni/src/CMakeLists.txt | 2 +- mamda/java/CMakeLists.txt | 2 +- mamda/java/build.gradle | 8 +++++--- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/mama/jni/build.gradle b/mama/jni/build.gradle index dce1bc183..4a6cb2710 100644 --- a/mama/jni/build.gradle +++ b/mama/jni/build.gradle @@ -2,9 +2,11 @@ apply plugin: 'java' apply plugin: 'maven' apply plugin: 'signing' -group = "org.openmama" -archivesBaseName = "openmama" -version = "6.2.2-1" +if (!project.hasProperty('legacyNaming')) { + group = "org.openmama" + archivesBaseName = "openmama" + version = "6.2.2-1" +} repositories { mavenCentral() diff --git a/mama/jni/src/CMakeLists.txt b/mama/jni/src/CMakeLists.txt index 7519a0fa3..bea7479cc 100644 --- a/mama/jni/src/CMakeLists.txt +++ b/mama/jni/src/CMakeLists.txt @@ -26,7 +26,7 @@ endforeach() ExternalProject_Add(mamajnijava SOURCE_DIR "." BUILD_COMMAND "" - CONFIGURE_COMMAND ${BIN_GRADLE} --no-daemon -PbuildDir=${MAMAJNI_JAVA_BUILD_DIR} -b ${CMAKE_CURRENT_SOURCE_DIR}/../build.gradle jar testClasses + CONFIGURE_COMMAND ${BIN_GRADLE} --no-daemon -PlegacyNaming -PbuildDir=${MAMAJNI_JAVA_BUILD_DIR} -b ${CMAKE_CURRENT_SOURCE_DIR}/../build.gradle jar testClasses INSTALL_COMMAND "" LOG_BUILD 1) diff --git a/mamda/java/CMakeLists.txt b/mamda/java/CMakeLists.txt index c2c1f0b08..d17f31f61 100644 --- a/mamda/java/CMakeLists.txt +++ b/mamda/java/CMakeLists.txt @@ -15,7 +15,7 @@ set(MAMAJNI_JAVA_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/mamda_java_build") ExternalProject_Add(mamdajava SOURCE_DIR "." BUILD_COMMAND "" - CONFIGURE_COMMAND ${BIN_GRADLE} --no-daemon -PbuildDir=${MAMAJNI_JAVA_BUILD_DIR} -b ${CMAKE_CURRENT_SOURCE_DIR}/build.gradle jar + CONFIGURE_COMMAND ${BIN_GRADLE} --no-daemon -PlegacyNaming -PbuildDir=${MAMAJNI_JAVA_BUILD_DIR} -b ${CMAKE_CURRENT_SOURCE_DIR}/build.gradle jar INSTALL_COMMAND "" LOG_BUILD 1) install (FILES ${MAMAJNI_JAVA_BUILD_DIR}/libs/mamda.jar DESTINATION lib) \ No newline at end of file diff --git a/mamda/java/build.gradle b/mamda/java/build.gradle index cb47c44ac..c78b11add 100644 --- a/mamda/java/build.gradle +++ b/mamda/java/build.gradle @@ -2,9 +2,11 @@ apply plugin: 'java' apply plugin: 'maven' apply plugin: 'signing' -group = "org.openmama" -archivesBaseName = "openmamda" -version = "6.2.2-1" +if (!project.hasProperty('legacyNaming')) { + group = "org.openmama" + archivesBaseName = "openmamda" + version = "6.2.2-1" +} repositories { mavenCentral() From 042025af762afd4f7a412f6e3d8a54b32022fbdf Mon Sep 17 00:00:00 2001 From: Frank Quinn Date: Mon, 30 Jul 2018 08:06:38 +0100 Subject: [PATCH 9/9] Updated version information to 6.2.3 Signed-off-by: Frank Quinn --- mama/VERSION.scons | 2 +- mama/c_cpp/src/c/generateMamaSourceFiles.bat | 2 +- mama/dotnet/src/cs/MamaVersion.cs | 4 ++-- mama/jni/build.xml | 2 +- mamda/VERSION.scons | 2 +- mamda/c_cpp/src/cpp/generateMamdaVersion.bat | 2 +- mamda/java/build.xml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mama/VERSION.scons b/mama/VERSION.scons index 31b4948fa..fa99cca0c 100644 --- a/mama/VERSION.scons +++ b/mama/VERSION.scons @@ -1 +1 @@ -mama 6.2.2 +mama 6.2.3 diff --git a/mama/c_cpp/src/c/generateMamaSourceFiles.bat b/mama/c_cpp/src/c/generateMamaSourceFiles.bat index e4df1ba87..6a74a4d8c 100644 --- a/mama/c_cpp/src/c/generateMamaSourceFiles.bat +++ b/mama/c_cpp/src/c/generateMamaSourceFiles.bat @@ -1,7 +1,7 @@ set BUILD_DIR=%1 set VERSION_MAJOR=6 set VERSION_MINOR=2 -set VERSION_RELEASE=2 +set VERSION_RELEASE=3 set RC_VERSION_NUMERICAL=1 set RC_VERSION_STRING=1 set MAMACDLL=libmamacmdd.dll diff --git a/mama/dotnet/src/cs/MamaVersion.cs b/mama/dotnet/src/cs/MamaVersion.cs index 7b1f3b5bb..db5afe0e6 100644 --- a/mama/dotnet/src/cs/MamaVersion.cs +++ b/mama/dotnet/src/cs/MamaVersion.cs @@ -6,7 +6,7 @@ public class MamaVersion { public static int MAMADOTNET_VERSION_MAJOR = 6; public static int MAMADOTNET_VERSION_MINOR = 2; - public static string MAMADOTNET_VERSION_RELEASE = "2"; - public static string MAMADOTNET_VERSION = "mamadotnet 6.2.2"; + public static string MAMADOTNET_VERSION_RELEASE = "3"; + public static string MAMADOTNET_VERSION = "mamadotnet 6.2.3"; } } diff --git a/mama/jni/build.xml b/mama/jni/build.xml index bb661f087..94e9d40c9 100644 --- a/mama/jni/build.xml +++ b/mama/jni/build.xml @@ -1,7 +1,7 @@ - + diff --git a/mamda/VERSION.scons b/mamda/VERSION.scons index a472cd2d0..7e3e54ca4 100644 --- a/mamda/VERSION.scons +++ b/mamda/VERSION.scons @@ -1 +1 @@ -mamda 6.2.2 +mamda 6.2.3 diff --git a/mamda/c_cpp/src/cpp/generateMamdaVersion.bat b/mamda/c_cpp/src/cpp/generateMamdaVersion.bat index 3c7192d2e..f7ee732db 100644 --- a/mamda/c_cpp/src/cpp/generateMamdaVersion.bat +++ b/mamda/c_cpp/src/cpp/generateMamdaVersion.bat @@ -1,7 +1,7 @@ set BUILD_DIR=%1 set VERSION_MAJOR=6 set VERSION_MINOR=2 -set VERSION_RELEASE=2 +set VERSION_RELEASE=3 echo "generating version files.." diff --git a/mamda/java/build.xml b/mamda/java/build.xml index 107e8a843..5f4c6041a 100644 --- a/mamda/java/build.xml +++ b/mamda/java/build.xml @@ -1,6 +1,6 @@ - +
    ValueMeaning
    Normal
    Adjusted
    Adjusted