Skip to content

Commit 36dacc3

Browse files
philippeVerneyphilippeVerney
committed
Shift from PRODML2.2 support to PRODML2.3 support
Bump gsoap to version 2.8.139E
1 parent b16e1e5 commit 36dacc3

49 files changed

Lines changed: 80468 additions & 79210 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ set (FESAPI_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
1212

1313
# version mechanism
1414
set (Fesapi_VERSION_MAJOR 2)
15-
set (Fesapi_VERSION_MINOR 13)
16-
set (Fesapi_VERSION_PATCH 1)
15+
set (Fesapi_VERSION_MINOR 14)
16+
set (Fesapi_VERSION_PATCH 0)
1717
set (Fesapi_VERSION_TWEAK 0)
1818

1919
set (Fesapi_VERSION ${Fesapi_VERSION_MAJOR}.${Fesapi_VERSION_MINOR}.${Fesapi_VERSION_PATCH}.${Fesapi_VERSION_TWEAK})

‎cmake/nsDefinitions.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ under the License.
3737
/** @namespace ${FESAPI_WITSML2_1_NS} @brief The ${FESAPI_WITSML2_1_NS} namespace. */
3838
#define WITSML2_1_NS ${FESAPI_WITSML2_1_NS}
3939

40-
/** @namespace ${FESAPI_PRODML2_1_NS} @brief The ${FESAPI_PRODML2_1_NS} namespace. */
41-
#define PRODML2_2_NS ${FESAPI_PRODML2_2_NS}
40+
/** @namespace ${FESAPI_PRODML2_3_NS} @brief The ${FESAPI_PRODML2_3_NS} namespace. */
41+
#define PRODML2_3_NS ${FESAPI_PRODML2_3_NS}
4242

4343
/** @namespace ${FESAPI_EML2_NS} @brief The ${FESAPI_EML2_NS} namespace. This namespaces contains classes to handle data objects that exist in various EML v2.*. The classes of this namespace should be favored, when possible, instead of the classes of the namespace ${FESAPI_EML2_0_NS}, ${FESAPI_EML2_1_NS}, ${FESAPI_EML2_2_NS} and ${FESAPI_EML2_3_NS}. */
4444
#define EML2_NS ${FESAPI_EML2_NS}

‎cmake/swigCsInclude.i‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -888,8 +888,8 @@ ${COMMENT_END}
888888
${COMMENT_START}
889889
case DataObjectName.FLUIDBOUNDARYINTERPRETATION : return new F2iConsulting.Fesapi.${FESAPI_RESQML2_2_NS}.FluidBoundaryInterpretation(cPtr, owner);
890890
${COMMENT_END}
891-
case DataObjectName.FLUIDCHARACTERIZATION : return new F2iConsulting.Fesapi.${FESAPI_PRODML2_2_NS}.FluidCharacterization(cPtr, owner);
892-
case DataObjectName.FLUIDSYSTEM : return new F2iConsulting.Fesapi.${FESAPI_PRODML2_2_NS}.FluidSystem(cPtr, owner);
891+
case DataObjectName.FLUIDCHARACTERIZATION : return new F2iConsulting.Fesapi.${FESAPI_PRODML2_3_NS}.FluidCharacterization(cPtr, owner);
892+
case DataObjectName.FLUIDSYSTEM : return new F2iConsulting.Fesapi.${FESAPI_PRODML2_3_NS}.FluidSystem(cPtr, owner);
893893
case DataObjectName.FRONTIERFEATURE : return new F2iConsulting.Fesapi.${FESAPI_RESQML2_0_1_NS}.FrontierFeature(cPtr, owner);
894894
case DataObjectName.GENETICBOUNDARYFEATURE :
895895
F2iConsulting.Fesapi.${FESAPI_RESQML2_0_1_NS}.GeneticBoundaryFeature result = new F2iConsulting.Fesapi.${FESAPI_RESQML2_0_1_NS}.GeneticBoundaryFeature(cPtr, owner);
@@ -950,7 +950,7 @@ ${COMMENT_END}
950950
case DataObjectName.SUBREPRESENTATION : return resqml2_instantiateSubRepresentation(cPtr, owner);
951951
case DataObjectName.TECTONICBOUNDARYFEATURE : return new F2iConsulting.Fesapi.${FESAPI_RESQML2_0_1_NS}.TectonicBoundaryFeature(cPtr, owner);
952952
case DataObjectName.TIMESERIES : return eml2_instantiateTimeSeries(cPtr, owner);
953-
case DataObjectName.TIMESERIESDATA : return new F2iConsulting.Fesapi.${FESAPI_PRODML2_2_NS}.TimeSeriesData(cPtr, owner);
953+
case DataObjectName.TIMESERIESDATA : return new F2iConsulting.Fesapi.${FESAPI_PRODML2_3_NS}.TimeSeriesData(cPtr, owner);
954954
case DataObjectName.TRAJECTORY : return new F2iConsulting.Fesapi.${FESAPI_WITSML2_1_NS}.Trajectory(cPtr, owner);
955955
case DataObjectName.TRIANGULATEDSETREPRESENTATION : return resqml2_instantiateTriangulatedSetRepresentation(cPtr, owner);
956956
case DataObjectName.TRUNCATEDIJKGRIDREPRESENTATION : return resqml2_instantiateConcreteIjkGridRepresentation(cPtr, owner);

‎cmake/swigJavaInclude.i‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -888,8 +888,8 @@ ${COMMENT_END}
888888
${COMMENT_START}
889889
case FLUIDBOUNDARYINTERPRETATION : return new com.f2i_consulting.fesapi.${FESAPI_RESQML2_2_NS}.Resqml22_FluidBoundaryInterpretation(cPtr, owner);
890890
${COMMENT_END}
891-
case FLUIDCHARACTERIZATION : return new com.f2i_consulting.fesapi.${FESAPI_PRODML2_2_NS}.FluidCharacterization(cPtr, owner);
892-
case FLUIDSYSTEM : return new com.f2i_consulting.fesapi.${FESAPI_PRODML2_2_NS}.FluidSystem(cPtr, owner);
891+
case FLUIDCHARACTERIZATION : return new com.f2i_consulting.fesapi.${FESAPI_PRODML2_3_NS}.FluidCharacterization(cPtr, owner);
892+
case FLUIDSYSTEM : return new com.f2i_consulting.fesapi.${FESAPI_PRODML2_3_NS}.FluidSystem(cPtr, owner);
893893
case FRONTIERFEATURE : return new com.f2i_consulting.fesapi.${FESAPI_RESQML2_0_1_NS}.Resqml20_FrontierFeature(cPtr, owner);
894894
case GENETICBOUNDARYFEATURE :
895895
com.f2i_consulting.fesapi.${FESAPI_RESQML2_0_1_NS}.Resqml20_GeneticBoundaryFeature result = new com.f2i_consulting.fesapi.${FESAPI_RESQML2_0_1_NS}.Resqml20_GeneticBoundaryFeature(cPtr, owner);
@@ -950,7 +950,7 @@ ${COMMENT_END}
950950
case SUBREPRESENTATION : return resqml2_instantiateSubRepresentation(cPtr, owner);
951951
case TECTONICBOUNDARYFEATURE : return new com.f2i_consulting.fesapi.${FESAPI_RESQML2_0_1_NS}.Resqml20_TectonicBoundaryFeature(cPtr, owner);
952952
case TIMESERIES : return eml2_instantiateTimeSeries(cPtr, owner);
953-
case TIMESERIESDATA : return new com.f2i_consulting.fesapi.${FESAPI_PRODML2_2_NS}.TimeSeriesData(cPtr, owner);
953+
case TIMESERIESDATA : return new com.f2i_consulting.fesapi.${FESAPI_PRODML2_3_NS}.TimeSeriesData(cPtr, owner);
954954
case TRAJECTORY : return new com.f2i_consulting.fesapi.${FESAPI_WITSML2_1_NS}.Witsml21_Trajectory(cPtr, owner);
955955
case TRIANGULATEDSETREPRESENTATION : return resqml2_instantiateTriangulatedSetRepresentation(cPtr, owner);
956956
case TRUNCATEDIJKGRIDREPRESENTATION : return resqml2_instantiateConcreteIjkGridRepresentation(cPtr, owner);

‎cmake/swigPythonInclude.i.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace COMMON_NS
3535
if (xmlNs == "resqml20") return "${FESAPI_RESQML2_0_1_NS}";
3636
else if (xmlNs == "resqml22") return "${FESAPI_RESQML2_2_NS}";
3737
else if (xmlNs == "witsml21") return "${FESAPI_WITSML2_1_NS}";
38-
else if (xmlNs == "prodml22") return "${FESAPI_PRODML2_2_NS}";
38+
else if (xmlNs == "prodml23") return "${FESAPI_PRODML2_3_NS}";
3939
else if (xmlNs == "eml23") return "${FESAPI_EML2_3_NS}";
4040
}();
4141

@@ -76,7 +76,7 @@ namespace EML2_NS
7676
if (xmlNs == "resqml20") return "${FESAPI_RESQML2_0_1_NS}";
7777
else if (xmlNs == "resqml22") return "${FESAPI_RESQML2_2_NS}";
7878
else if (xmlNs == "witsml21") return "${FESAPI_WITSML2_1_NS}";
79-
else if (xmlNs == "prodml22") return "${FESAPI_PRODML2_2_NS}";
79+
else if (xmlNs == "prodml23") return "${FESAPI_PRODML2_3_NS}";
8080
else if (xmlNs == "eml23") return "${FESAPI_EML2_3_NS}";
8181
}();
8282

‎doc/Doxyfile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2444,7 +2444,7 @@ EXPAND_AS_DEFINED = COMMON_NS \
24442444
RESQML2_0_1_NS \
24452445
RESQML2_2_NS \
24462446
WITSML2_1_NS \
2447-
PRODML2_2_NS \
2447+
PRODML2_3_NS \
24482448
EML2_NS \
24492449
EML2_0_NS \
24502450
EML2_3_NS

0 commit comments

Comments
 (0)