Changed code to use a single FlmDbSystem object. Fixed utilities so that they build using FTK.

git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@405 0109f412-320b-0410-ab79-c3e0c5ffbbe6
2006-05-10 22:27:54 +00:00
parent 62e33bcd7d
commit 8df295d049
30 changed files with 289 additions and 447 deletions
--- a/xflaim/java/jni/jbackup.cpp
+++ b/xflaim/java/jni/jbackup.cpp
@@ -46,21 +46,21 @@ public:
 		m_pJvm = pJvm;
 	}
 	
-	RCODE XFLMAPI JNIBackupClient::WriteData(
+	RCODE FLMAPI JNIBackupClient::WriteData(
 		const void *	pvBuffer,
 		FLMUINT			uiBytesToWrite);
 		
-	FINLINE FLMUINT getRefCount( void)
+	FINLINE FLMINT FLMAPI getRefCount( void)
 	{
 		return( IF_BackupClient::getRefCount());
 	}

-	virtual FINLINE FLMINT XFLMAPI AddRef( void)
+	virtual FINLINE FLMINT FLMAPI AddRef( void)
 	{
 		return( IF_BackupClient::AddRef());
 	}

-	virtual FINLINE FLMINT XFLMAPI Release( void)
+	virtual FINLINE FLMINT FLMAPI Release( void)
 	{
 		return( IF_BackupClient::Release());
 	}
@@ -88,21 +88,21 @@ public:
 		m_pJvm = pJvm;
 	}
 	
-	RCODE XFLMAPI backupStatus(
+	RCODE FLMAPI backupStatus(
 		FLMUINT64	ui64BytesToDo,
 		FLMUINT64	ui64BytesDone);
 	
-	FINLINE FLMUINT getRefCount( void)
+	FINLINE FLMINT FLMAPI getRefCount( void)
 	{
 		return( IF_BackupStatus::getRefCount());
 	}

-	virtual FINLINE FLMINT XFLMAPI AddRef( void)
+	virtual FINLINE FLMINT FLMAPI AddRef( void)
 	{
 		return( IF_BackupStatus::AddRef());
 	}

-	virtual FINLINE FLMINT XFLMAPI Release( void)
+	virtual FINLINE FLMINT FLMAPI Release( void)
 	{
 		return( IF_BackupStatus::Release());
 	}
@@ -140,13 +140,13 @@ RCODE JNIBackupClient::WriteData(
 	}
 	
 	Cls = pEnv->GetObjectClass( m_jClient);
-	MId = pEnv->GetMethodID( Cls, "WriteData", "([B)I");
+	MId = pEnv->GetMethodID( Cls, "writeData", "([B)I");
 	
 	flmAssert( MId);
 	
-	jBuff = pEnv->NewByteArray( uiBytesToWrite);
+	jBuff = pEnv->NewByteArray( (jsize)uiBytesToWrite);
 	pvBuff = pEnv->GetPrimitiveArrayCritical(jBuff, NULL);
-	memcpy(pvBuff, pvBuffer, uiBytesToWrite);
+	f_memcpy(pvBuff, pvBuffer, uiBytesToWrite);
 	pEnv->ReleasePrimitiveArrayCritical( jBuff, pvBuff, 0);
 	
 	if( RC_BAD( rc = (RCODE)pEnv->CallIntMethod( m_jClient, MId, jBuff)))
@@ -238,7 +238,7 @@ JNIEXPORT jlong JNICALL Java_xflaim_Backup__1backup(
 	flmAssert( Client);
 	
 	pEnv->GetJavaVM( &pJvm);
-	if( (pClient = new JNIBackupClient( Client, pJvm)) == NULL)
+	if( (pClient = f_new JNIBackupClient( Client, pJvm)) == NULL)
 	{
 		rc = RC_SET( NE_XFLM_MEM);
 		ThrowError( rc, pEnv);
@@ -257,7 +257,7 @@ JNIEXPORT jlong JNICALL Java_xflaim_Backup__1backup(
 	
 	if (Status)
 	{
-		if( (pStatus = new JNIBackupStatus( Status, pJvm)) == NULL)
+		if( (pStatus = f_new JNIBackupStatus( Status, pJvm)) == NULL)
 		{
 			rc = RC_SET( NE_XFLM_MEM);
 			ThrowError( rc, pEnv);
--- a/xflaim/java/jni/jdatavector.cpp
+++ b/xflaim/java/jni/jdatavector.cpp
@@ -503,7 +503,7 @@ JNIEXPORT jstring JNICALL Java_xflaim_DataVector__1getString(
 		goto Exit;
 	}
 	
-	sBuf = pEnv->NewString( puzBuf, uiBufSize / sizeof( FLMUNICODE));
+	sBuf = pEnv->NewString( puzBuf, (jsize)(uiBufSize / sizeof( FLMUNICODE)));
 	
 Exit:

@@ -532,7 +532,7 @@ JNIEXPORT jbyteArray JNICALL Java_xflaim_DataVector__1getBinary(
 	FLMBOOL			bMustRelease = false;
 	
 	uiLength = THIS_VECTOR()->getDataLength( (FLMUINT)iElementNumber);
-	Data = pEnv->NewByteArray( uiLength);
+	Data = pEnv->NewByteArray( (jsize)uiLength);
 	
 	if ( (pvData = pEnv->GetPrimitiveArrayCritical( Data, &bIsCopy)) == NULL)
 	{
@@ -589,7 +589,7 @@ JNIEXPORT jbyteArray JNICALL Java_xflaim_DataVector__1outputKey(
 	FLMBOOL			bMustRelease = false;
 	
 	uiLength = XFLM_MAX_KEY_SIZE;
-	Key = pEnv->NewByteArray( uiLength);
+	Key = pEnv->NewByteArray( (jsize)uiLength);
 	
 	if( (pvKey = pEnv->GetPrimitiveArrayCritical( Key, &bIsCopy)) == NULL)
 	{
@@ -646,7 +646,7 @@ JNIEXPORT jbyteArray JNICALL Java_xflaim_DataVector__1outputData(
 	FLMBOOL			bMustRelease = false;
 	
 	uiLength = XFLM_MAX_KEY_SIZE;
-	Data = pEnv->NewByteArray( uiLength);
+	Data = pEnv->NewByteArray( (jsize)uiLength);
 	
 	if ( (pvData = pEnv->GetPrimitiveArrayCritical( Data, &bIsCopy)) == NULL)
 	{
--- a/xflaim/java/jni/jdb.cpp
+++ b/xflaim/java/jni/jdb.cpp
@@ -311,7 +311,7 @@ Exit:
 	}
 	
 	pEnv->ReleaseStringCritical( sElementName, pszElementName);
-	return( (jlong)uiNameId);
+	return( (jint)uiNameId);
 }

 /****************************************************************************
--- a/xflaim/java/jni/jdbsystem.cpp
+++ b/xflaim/java/jni/jdbsystem.cpp
@@ -39,9 +39,9 @@ JNIEXPORT jlong JNICALL Java_xflaim_DbSystem__1createDbSystem(
 	JNIEnv *				pEnv,
 	jobject)				// obj)
 {
-	F_DbSystem * pDbSystem;
+	IF_DbSystem * 		pDbSystem;
 	
-	if( (pDbSystem = new F_DbSystem()) == NULL)
+	if( RC_BAD( FlmAllocDbSystem( &pDbSystem)))
 	{
 		ThrowError( NE_XFLM_MEM, pEnv);
 	}
@@ -49,38 +49,6 @@ JNIEXPORT jlong JNICALL Java_xflaim_DbSystem__1createDbSystem(
 	return( (jlong)(FLMUINT)pDbSystem);
 }

-/****************************************************************************
-Desc:
-****************************************************************************/
-JNIEXPORT void JNICALL Java_xflaim_DbSystem__1init(
-	JNIEnv * 			pEnv,
-	jobject,				// obj,
-	jlong					lThis)
-{
-	RCODE					rc = NE_XFLM_OK;
-
-	if (RC_BAD( rc = THIS_DBSYS()->init()))
-	{
-		ThrowError( rc, pEnv);
-		goto Exit;
-	}
-	
-Exit:
-
-	return;
-}
-
-/****************************************************************************
-Desc:
-****************************************************************************/
-JNIEXPORT void JNICALL Java_xflaim_DbSystem__1exit(
-	JNIEnv *,			// pEnv,
-	jobject,				// obj,
-	jlong					lThis)
-{
-	THIS_DBSYS()->exit();
-}
-
 /****************************************************************************
 Desc:
 ****************************************************************************/
@@ -361,7 +329,7 @@ JNIEXPORT void JNICALL Java_xflaim_DbSystem__1dbRestore(
 	}
 	
 	flmAssert( RestoreClient);
-	if ((pRestoreClient = new JNIRestoreClient( RestoreClient, pJvm)) == NULL)
+	if ((pRestoreClient = f_new JNIRestoreClient( RestoreClient, pJvm)) == NULL)
 	{
 		ThrowError( NE_XFLM_MEM, pEnv);
 		goto Exit;
@@ -369,7 +337,7 @@ JNIEXPORT void JNICALL Java_xflaim_DbSystem__1dbRestore(
 	
 	if (RestoreStatus != NULL)
 	{
-		if ((pRestoreStatus = new JNIRestoreStatus( RestoreStatus, pJvm)) == NULL)
+		if ((pRestoreStatus = f_new JNIRestoreStatus( RestoreStatus, pJvm)) == NULL)
 		{
 			ThrowError( NE_XFLM_MEM, pEnv);
 			goto Exit;
@@ -458,7 +426,7 @@ JNIEXPORT void JNICALL Java_xflaim_DbSystem__1dbRename(
 	if (Status != NULL)
 	{
 		pEnv->GetJavaVM( &pJvm);
-		if ((pStatus = new JNIRenameStatus( Status, pJvm)) == NULL)
+		if ((pStatus = f_new JNIRenameStatus( Status, pJvm)) == NULL)
 		{
 			ThrowError( NE_XFLM_MEM, pEnv);
 			goto Exit;	
@@ -547,7 +515,7 @@ JNIEXPORT void JNICALL Java_xflaim_DbSystem__1dbCopy(
 	if (Status)
 	{
 		pEnv->GetJavaVM( &pJvm);
-		if ( (pStatus = new JNICopyStatus( Status, pJvm)) == NULL)
+		if ( (pStatus = f_new JNICopyStatus( Status, pJvm)) == NULL)
 		{
 			ThrowError( NE_XFLM_MEM, pEnv);
 			goto Exit;
@@ -639,7 +607,7 @@ JNIEXPORT jlong JNICALL Java_xflaim_DbSystem__1dbCheck(
 		
 		pEnv->GetJavaVM( &pJvm);
 		
-		if ((pStatus = new JNICheckStatus( Status, pJvm)) == NULL)
+		if ((pStatus = f_new JNICheckStatus( Status, pJvm)) == NULL)
 		{
 			ThrowError( NE_XFLM_MEM, pEnv);
 			goto Exit;
--- a/xflaim/java/jni/jdomnode.cpp
+++ b/xflaim/java/jni/jdomnode.cpp
@@ -693,7 +693,7 @@ JNIEXPORT jstring JNICALL Java_xflaim_DOMNode__1getPrefix(
 		goto Exit;
 	}
 	
-	sPrefix = pEnv->NewString( puzPrefix, uiNumChars);
+	sPrefix = pEnv->NewString( puzPrefix, (jsize)uiNumChars);
 	
 Exit:

@@ -1015,7 +1015,7 @@ JNIEXPORT jstring JNICALL Java_xflaim_DOMNode__1getNamespaceURI(
 		goto Exit;
 	}
 	
-	sNamespaceURI = pEnv->NewString( puzNamespaceURI, uiNumChars);
+	sNamespaceURI = pEnv->NewString( puzNamespaceURI, (jsize)uiNumChars);
 	
 Exit:

@@ -1070,7 +1070,7 @@ JNIEXPORT jstring JNICALL Java_xflaim_DOMNode__1getLocalName(
 		goto Exit;
 	}
 	
-	sLocalName = pEnv->NewString( puzLocalName, uiNumChars);
+	sLocalName = pEnv->NewString( puzLocalName, (jsize)uiNumChars);
 	
 Exit:

@@ -1125,7 +1125,7 @@ JNIEXPORT jstring JNICALL Java_xflaim_DOMNode__1getQualifiedName(
 		goto Exit;
 	}
 	
-	sLocalName = pEnv->NewString( puzQualName, uiNumChars);
+	sLocalName = pEnv->NewString( puzQualName, (jsize)uiNumChars);
 	
 Exit:

@@ -1229,7 +1229,7 @@ JNIEXPORT jstring JNICALL Java_xflaim_DOMNode__1getString(
 		goto Exit;
 	}
 	
-	sBuf = pEnv->NewString( puzBuf, uiNumChars);	
+	sBuf = pEnv->NewString( puzBuf, (jsize)uiNumChars);	
 	
 Exit:

@@ -1288,7 +1288,7 @@ JNIEXPORT jint JNICALL Java_xflaim_DOMNode__1getDataType(
 	
 Exit:

-	return( uiType);
+	return( (jint)uiType);
 }
 	
 /****************************************************************************
@@ -1339,7 +1339,7 @@ JNIEXPORT jbyteArray JNICALL Java_xflaim_DOMNode__1getBinary(
 		goto Exit;
 	}	

-	Data = pEnv->NewByteArray( uiLength);
+	Data = pEnv->NewByteArray( (jsize)uiLength);
 	
 	if ( (pvData = pEnv->GetPrimitiveArrayCritical( Data, &bIsCopy)) == NULL)
 	{
--- a/xflaim/java/jni/jnirestore.cpp
+++ b/xflaim/java/jni/jnirestore.cpp
@@ -29,7 +29,7 @@
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreClient::openBackupSet( void)
+RCODE FLMAPI JNIRestoreClient::openBackupSet( void)
 {
 	RCODE				rc = NE_XFLM_OK;
 	JNIEnv *			pEnv;
@@ -74,7 +74,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreClient::openRflFile(
+RCODE FLMAPI JNIRestoreClient::openRflFile(
 	FLMUINT			uiFileNum)
 {
 	RCODE				rc = NE_XFLM_OK;
@@ -121,7 +121,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreClient::openIncFile(
+RCODE FLMAPI JNIRestoreClient::openIncFile(
 	FLMUINT			uiFileNum)
 {
 	RCODE				rc = NE_XFLM_OK;
@@ -167,7 +167,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreClient::read(
+RCODE FLMAPI JNIRestoreClient::read(
 	FLMUINT			uiLength,
 	void *			pvBuffer,
 	FLMUINT *		puiBytesRead)
@@ -229,7 +229,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreClient::close( void)
+RCODE FLMAPI JNIRestoreClient::close( void)
 {
 	RCODE				rc = NE_XFLM_OK;
 	JNIEnv *			pEnv;
@@ -274,7 +274,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreClient::abortFile( void)
+RCODE FLMAPI JNIRestoreClient::abortFile( void)
 {
 	RCODE				rc = NE_XFLM_OK;
 	JNIEnv *			pEnv;
@@ -319,7 +319,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportProgress(
+RCODE FLMAPI JNIRestoreStatus::reportProgress(
 	eRestoreAction *		peAction,
 	FLMUINT64				ui64BytesToDo,
 	FLMUINT64				ui64BytesDone)
@@ -366,7 +366,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportError(
+RCODE FLMAPI JNIRestoreStatus::reportError(
 	eRestoreAction *		peAction,
 	RCODE						rcErr)
 {
@@ -410,7 +410,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportBeginTrans(
+RCODE FLMAPI JNIRestoreStatus::reportBeginTrans(
 	eRestoreAction *		peAction,
 	FLMUINT64				ui64TransId)
 {
@@ -455,7 +455,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportCommitTrans(
+RCODE FLMAPI JNIRestoreStatus::reportCommitTrans(
 	eRestoreAction *		peAction,
 	FLMUINT64				ui64TransId)
 {
@@ -500,7 +500,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportAbortTrans(
+RCODE FLMAPI JNIRestoreStatus::reportAbortTrans(
 	eRestoreAction *		peAction,
 	FLMUINT64				ui64TransId)
 {
@@ -545,7 +545,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportBlockChainFree(
+RCODE FLMAPI JNIRestoreStatus::reportBlockChainFree(
 	eRestoreAction *		peAction,
 	FLMUINT64				ui64TransId,
 	FLMUINT64				ui64MaintDocNum,
@@ -595,7 +595,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportIndexSuspend(
+RCODE FLMAPI JNIRestoreStatus::reportIndexSuspend(
 	eRestoreAction *		peAction,
 	FLMUINT64				ui64TransId,
 	FLMUINT					uiIndexNum)
@@ -641,7 +641,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportIndexResume(
+RCODE FLMAPI JNIRestoreStatus::reportIndexResume(
 	eRestoreAction *		peAction,
 	FLMUINT64				ui64TransId,
 	FLMUINT					uiIndexNum)
@@ -687,7 +687,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportReduce(
+RCODE FLMAPI JNIRestoreStatus::reportReduce(
 	eRestoreAction *		peAction,
 	FLMUINT64				ui64TransId,
 	FLMUINT					uiCount)
@@ -733,7 +733,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportUpgrade(
+RCODE FLMAPI JNIRestoreStatus::reportUpgrade(
 	eRestoreAction *		peAction,
 	FLMUINT64				ui64TransId,
 	FLMUINT					uiOldDbVersion,
@@ -781,7 +781,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportOpenRflFile(
+RCODE FLMAPI JNIRestoreStatus::reportOpenRflFile(
 	eRestoreAction *		peAction,
 	FLMUINT					uiFileNum)
 {
@@ -826,7 +826,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportRflRead(
+RCODE FLMAPI JNIRestoreStatus::reportRflRead(
 	eRestoreAction *		peAction,
 	FLMUINT					uiFileNum,
 	FLMUINT					uiBytesRead)
@@ -872,7 +872,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportEnableEncryption(
+RCODE FLMAPI JNIRestoreStatus::reportEnableEncryption(
 	eRestoreAction *		peAction,
 	FLMUINT64				ui64TransId)
 {
@@ -917,7 +917,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportWrapKey(
+RCODE FLMAPI JNIRestoreStatus::reportWrapKey(
 	eRestoreAction *		peAction,
 	FLMUINT64				ui64TransId)
 {
@@ -962,7 +962,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportSetNextNodeId(
+RCODE FLMAPI JNIRestoreStatus::reportSetNextNodeId(
 	eRestoreAction *	peAction,
 	FLMUINT64			ui64TransId,
 	FLMUINT				uiCollection,
@@ -1010,7 +1010,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportNodeSetMetaValue(
+RCODE FLMAPI JNIRestoreStatus::reportNodeSetMetaValue(
 	eRestoreAction *	peAction,
 	FLMUINT64			ui64TransId,
 	FLMUINT				uiCollection,
@@ -1059,7 +1059,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportNodeSetPrefixId(
+RCODE FLMAPI JNIRestoreStatus::reportNodeSetPrefixId(
 	eRestoreAction *	peAction,
 	FLMUINT64			ui64TransId,
 	FLMUINT				uiCollection,
@@ -1109,7 +1109,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportNodeFlagsUpdate(
+RCODE FLMAPI JNIRestoreStatus::reportNodeFlagsUpdate(
 	eRestoreAction *	peAction,
 	FLMUINT64			ui64TransId,
 	FLMUINT				uiCollection,
@@ -1159,7 +1159,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportAttributeSetValue(
+RCODE FLMAPI JNIRestoreStatus::reportAttributeSetValue(
 	eRestoreAction *	peAction,
 	FLMUINT64			ui64TransId,
 	FLMUINT				uiCollection,
@@ -1208,7 +1208,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportNodeSetValue(
+RCODE FLMAPI JNIRestoreStatus::reportNodeSetValue(
 	eRestoreAction *	peAction,
 	FLMUINT64			ui64TransId,
 	FLMUINT				uiCollection,
@@ -1255,7 +1255,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportNodeUpdate(
+RCODE FLMAPI JNIRestoreStatus::reportNodeUpdate(
 	eRestoreAction *	peAction,
 	FLMUINT64			ui64TransId,
 	FLMUINT				uiCollection,
@@ -1302,7 +1302,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportInsertBefore(
+RCODE FLMAPI JNIRestoreStatus::reportInsertBefore(
 	eRestoreAction *	peAction,
 	FLMUINT64			ui64TransId,
 	FLMUINT				uiCollection,
@@ -1352,7 +1352,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportNodeCreate(
+RCODE FLMAPI JNIRestoreStatus::reportNodeCreate(
 	eRestoreAction *	peAction,
 	FLMUINT64			ui64TransId,
 	FLMUINT				uiCollection,
@@ -1403,7 +1403,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportNodeChildrenDelete(
+RCODE FLMAPI JNIRestoreStatus::reportNodeChildrenDelete(
 	eRestoreAction *	peAction,
 	FLMUINT64			ui64TransId,
 	FLMUINT				uiCollection,
@@ -1452,7 +1452,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportAttributeDelete(
+RCODE FLMAPI JNIRestoreStatus::reportAttributeDelete(
 	eRestoreAction *	peAction,
 	FLMUINT64			ui64TransId,
 	FLMUINT				uiCollection,
@@ -1501,7 +1501,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportNodeDelete(
+RCODE FLMAPI JNIRestoreStatus::reportNodeDelete(
 	eRestoreAction *	peAction,
 	FLMUINT64			ui64TransId,
 	FLMUINT				uiCollection,
@@ -1548,7 +1548,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportDocumentDone(
+RCODE FLMAPI JNIRestoreStatus::reportDocumentDone(
 	eRestoreAction *	peAction,
 	FLMUINT64			ui64TransId,
 	FLMUINT				uiCollection,
@@ -1595,7 +1595,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRestoreStatus::reportRollOverDbKey(
+RCODE FLMAPI JNIRestoreStatus::reportRollOverDbKey(
 	eRestoreAction *	peAction,
 	FLMUINT64			ui64TransId)
 {
--- a/xflaim/java/jni/jnirestore.h
+++ b/xflaim/java/jni/jnirestore.h
@@ -26,7 +26,7 @@
 /****************************************************************************
 Desc:
 ****************************************************************************/
-class JNIRestoreClient : public IF_RestoreClient, public XF_Base
+class JNIRestoreClient : public IF_RestoreClient
 {
 public:

@@ -40,34 +40,34 @@ public:
 		m_pJvm = pJvm;
 	}

-	RCODE XFLMAPI openBackupSet( void);
+	RCODE FLMAPI openBackupSet( void);

-	RCODE XFLMAPI openRflFile(
+	RCODE FLMAPI openRflFile(
 		FLMUINT			uiFileNum);

-	RCODE XFLMAPI openIncFile(
+	RCODE FLMAPI openIncFile(
 		FLMUINT			uiFileNum);

-	RCODE XFLMAPI read(
+	RCODE FLMAPI read(
 		FLMUINT			uiLength,
 		void *			pvBuffer,
 		FLMUINT *		puiBytesRead);

-	RCODE XFLMAPI close( void);
+	RCODE FLMAPI close( void);

-	RCODE XFLMAPI abortFile( void);
+	RCODE FLMAPI abortFile( void);
 	
-	FINLINE FLMUINT getRefCount( void)
+	FINLINE FLMINT FLMAPI getRefCount( void)
 	{
 		return( IF_RestoreClient::getRefCount());
 	}

-	virtual FINLINE FLMINT XFLMAPI AddRef( void)
+	virtual FINLINE FLMINT FLMAPI AddRef( void)
 	{
 		return( IF_RestoreClient::AddRef());
 	}

-	virtual FINLINE FLMINT XFLMAPI Release( void)
+	virtual FINLINE FLMINT FLMAPI Release( void)
 	{
 		return( IF_RestoreClient::Release());
 	}
@@ -81,7 +81,7 @@ private:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-class JNIRestoreStatus : public IF_RestoreStatus, public XF_Base
+class JNIRestoreStatus : public IF_RestoreStatus
 {
 public:

@@ -95,37 +95,37 @@ public:
 		m_pJvm = pJvm;
 	}
 	
-	RCODE XFLMAPI reportProgress(
+	RCODE FLMAPI reportProgress(
 		eRestoreAction *	peAction,
 		FLMUINT64			ui64BytesToDo,
 		FLMUINT64			ui64BytesDone);

-	RCODE XFLMAPI reportError(
+	RCODE FLMAPI reportError(
 		eRestoreAction *	peAction,
 		RCODE					rcErr);

-	RCODE XFLMAPI reportOpenRflFile(
+	RCODE FLMAPI reportOpenRflFile(
 		eRestoreAction *	peAction,
 		FLMUINT				uiFileNum);

-	RCODE XFLMAPI reportRflRead(
+	RCODE FLMAPI reportRflRead(
 		eRestoreAction *	peAction,
 		FLMUINT				uiFileNum,
 		FLMUINT				uiBytesRead);

-	RCODE XFLMAPI reportBeginTrans(
+	RCODE FLMAPI reportBeginTrans(
 		eRestoreAction *	peAction,
 		FLMUINT64			ui64TransId);

-	RCODE XFLMAPI reportCommitTrans(
+	RCODE FLMAPI reportCommitTrans(
 		eRestoreAction *	peAction,
 		FLMUINT64			ui64TransId);

-	RCODE XFLMAPI reportAbortTrans(
+	RCODE FLMAPI reportAbortTrans(
 		eRestoreAction *	peAction,
 		FLMUINT64			ui64TransId);

-	RCODE XFLMAPI reportBlockChainFree(
+	RCODE FLMAPI reportBlockChainFree(
 		eRestoreAction *	peAction,
 		FLMUINT64			ui64TransId,
 		FLMUINT64			ui64MaintDocNum,
@@ -133,66 +133,66 @@ public:
 		FLMUINT				uiEndBlkAddr,
 		FLMUINT				uiCount);

-	RCODE XFLMAPI reportIndexSuspend(
+	RCODE FLMAPI reportIndexSuspend(
 		eRestoreAction *	peAction,
 		FLMUINT64			ui64TransId,
 		FLMUINT				uiIndexNum);

-	RCODE XFLMAPI reportIndexResume(
+	RCODE FLMAPI reportIndexResume(
 		eRestoreAction *	peAction,
 		FLMUINT64			ui64TransId,
 		FLMUINT				uiIndexNum);

-	RCODE XFLMAPI reportReduce(
+	RCODE FLMAPI reportReduce(
 		eRestoreAction *	peAction,
 		FLMUINT64			ui64TransId,
 		FLMUINT				uiCount);

-	RCODE XFLMAPI reportUpgrade(
+	RCODE FLMAPI reportUpgrade(
 		eRestoreAction *	peAction,
 		FLMUINT64			ui64TransId,
 		FLMUINT				uiOldDbVersion,
 		FLMUINT				uiNewDbVersion);

-	RCODE XFLMAPI reportEnableEncryption(
+	RCODE FLMAPI reportEnableEncryption(
 		eRestoreAction *	peAction,
 		FLMUINT64			ui64TransId);

-	RCODE XFLMAPI reportWrapKey(
+	RCODE FLMAPI reportWrapKey(
 		eRestoreAction *	peAction,
 		FLMUINT64			ui64TransId);
 		
-	RCODE XFLMAPI reportRollOverDbKey(
+	RCODE FLMAPI reportRollOverDbKey(
 		eRestoreAction *	peAction,
 		FLMUINT64			ui64TransId);
 		
-	RCODE XFLMAPI reportDocumentDone(
+	RCODE FLMAPI reportDocumentDone(
 		eRestoreAction *	peAction,
 		FLMUINT64			ui64TransId,
 		FLMUINT				uiCollection,
 		FLMUINT64			ui64NodeId);
 		
-	RCODE XFLMAPI reportNodeDelete(
+	RCODE FLMAPI reportNodeDelete(
 		eRestoreAction *	peAction,
 		FLMUINT64			ui64TransId,
 		FLMUINT				uiCollection,
 		FLMUINT64			ui64NodeId);
 		
-	RCODE XFLMAPI reportAttributeDelete(
+	RCODE FLMAPI reportAttributeDelete(
 		eRestoreAction *	peAction,
 		FLMUINT64			ui64TransId,
 		FLMUINT				uiCollection,
 		FLMUINT64			ui64ElementId,
 		FLMUINT				uiAttrNameId);
 			
-	RCODE XFLMAPI reportNodeChildrenDelete(
+	RCODE FLMAPI reportNodeChildrenDelete(
 		eRestoreAction *	peAction,
 		FLMUINT64			ui64TransId,
 		FLMUINT				uiCollection,
 		FLMUINT64			ui64NodeId,
 		FLMUINT				uiNameId);
 		
-	RCODE XFLMAPI reportNodeCreate(
+	RCODE FLMAPI reportNodeCreate(
 		eRestoreAction *	peAction,
 		FLMUINT64			ui64TransId,
 		FLMUINT				uiCollection,
@@ -201,7 +201,7 @@ public:
 		FLMUINT				uiNameId,
 		eNodeInsertLoc		eLocation);
 		
-	RCODE XFLMAPI reportInsertBefore(
+	RCODE FLMAPI reportInsertBefore(
 		eRestoreAction *	peAction,
 		FLMUINT64			ui64TransId,
 		FLMUINT				uiCollection,
@@ -209,26 +209,26 @@ public:
 		FLMUINT64			ui64NewChildId,
 		FLMUINT64			ui64RefChildId);
 		
-	RCODE XFLMAPI reportNodeUpdate(
+	RCODE FLMAPI reportNodeUpdate(
 		eRestoreAction *	peAction,
 		FLMUINT64			ui64TransId,
 		FLMUINT				uiCollection,
 		FLMUINT64			ui64NodeId);
 		
-	RCODE XFLMAPI reportNodeSetValue(
+	RCODE FLMAPI reportNodeSetValue(
 		eRestoreAction *	peAction,
 		FLMUINT64			ui64TransId,
 		FLMUINT				uiCollection,
 		FLMUINT64			ui64NodeId);
 		
-	RCODE XFLMAPI reportAttributeSetValue(
+	RCODE FLMAPI reportAttributeSetValue(
 		eRestoreAction *	peAction,
 		FLMUINT64			ui64TransId,
 		FLMUINT				uiCollection,
 		FLMUINT64			ui64ElementNodeId,
 		FLMUINT				uiAttrNameId);
 		
-	RCODE XFLMAPI reportNodeFlagsUpdate(
+	RCODE FLMAPI reportNodeFlagsUpdate(
 		eRestoreAction *	peAction,
 		FLMUINT64			ui64TransId,
 		FLMUINT				uiCollection,
@@ -236,7 +236,7 @@ public:
 		FLMUINT				uiFlags,
 		FLMBOOL				bAdd);
 		
-	RCODE XFLMAPI reportNodeSetPrefixId(
+	RCODE FLMAPI reportNodeSetPrefixId(
 		eRestoreAction *	peAction,
 		FLMUINT64			ui64TransId,
 		FLMUINT				uiCollection,
@@ -244,30 +244,30 @@ public:
 		FLMUINT				uiAttrNameId,
 		FLMUINT				uiPrefixId);
 			
-	RCODE XFLMAPI reportNodeSetMetaValue(
+	RCODE FLMAPI reportNodeSetMetaValue(
 		eRestoreAction *	peAction,
 		FLMUINT64			ui64TransId,
 		FLMUINT				uiCollection,
 		FLMUINT64			ui64NodeId,
 		FLMUINT64			ui64MetaValue);
 		
-	RCODE XFLMAPI reportSetNextNodeId(
+	RCODE FLMAPI reportSetNextNodeId(
 		eRestoreAction *	peAction,
 		FLMUINT64			ui64TransId,
 		FLMUINT				uiCollection,
 		FLMUINT64			ui64NextNodeId);

-	FINLINE FLMUINT getRefCount( void)
+	FINLINE FLMINT FLMAPI getRefCount( void)
 	{
 		return( IF_RestoreStatus::getRefCount());
 	}

-	virtual FINLINE FLMINT XFLMAPI AddRef( void)
+	virtual FINLINE FLMINT FLMAPI AddRef( void)
 	{
 		return( IF_RestoreStatus::AddRef());
 	}

-	virtual FINLINE FLMINT XFLMAPI Release( void)
+	virtual FINLINE FLMINT FLMAPI Release( void)
 	{
 		return( IF_RestoreStatus::Release());
 	}
--- a/xflaim/java/jni/jnistatus.cpp
+++ b/xflaim/java/jni/jnistatus.cpp
@@ -28,7 +28,7 @@
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNIRenameStatus::dbRenameStatus(
+RCODE FLMAPI JNIRenameStatus::dbRenameStatus(
 	const char *		pszSrcFileName,
 	const char *		pszDstFileName)
 {
@@ -82,7 +82,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNICopyStatus::dbCopyStatus(
+RCODE FLMAPI JNICopyStatus::dbCopyStatus(
 	FLMUINT64		ui64BytesToCopy,
 	FLMUINT64		ui64BytesCopied,
 	FLMBOOL			bNewSrcFile,
@@ -140,7 +140,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNICheckStatus::reportProgress(
+RCODE FLMAPI JNICheckStatus::reportProgress(
 	XFLM_PROGRESS_CHECK_INFO *)		// pProgCheck)
 {
 	RCODE				rc = NE_XFLM_OK;
@@ -196,7 +196,7 @@ Exit:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-RCODE XFLMAPI JNICheckStatus::reportCheckErr(
+RCODE FLMAPI JNICheckStatus::reportCheckErr(
 	XFLM_CORRUPT_INFO *,		// pCorruptInfo,
 	FLMBOOL *)					// pbFix)
 {
--- a/xflaim/java/jni/jnistatus.h
+++ b/xflaim/java/jni/jnistatus.h
@@ -30,7 +30,7 @@
 /****************************************************************************
 Desc:
 ****************************************************************************/
-class JNIRenameStatus : public IF_DbRenameStatus, public XF_Base
+class JNIRenameStatus : public IF_DbRenameStatus
 {
 public:

@@ -44,21 +44,21 @@ public:
 		m_pJvm = pJvm;
 	}

-	RCODE XFLMAPI dbRenameStatus(
+	RCODE FLMAPI dbRenameStatus(
 		const char *	pszSrcFileName,
 		const char *	pszDstFileName);

-	FINLINE FLMUINT getRefCount( void)
+	FINLINE FLMINT FLMAPI getRefCount( void)
 	{
 		return( IF_DbRenameStatus::getRefCount());
 	}

-	virtual FINLINE FLMINT XFLMAPI AddRef( void)
+	virtual FINLINE FLMINT FLMAPI AddRef( void)
 	{
 		return( IF_DbRenameStatus::AddRef());
 	}

-	virtual FINLINE FLMINT XFLMAPI Release( void)
+	virtual FINLINE FLMINT FLMAPI Release( void)
 	{
 		return( IF_DbRenameStatus::Release());
 	}
@@ -72,7 +72,7 @@ private:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-class JNICopyStatus : public IF_DbCopyStatus, public XF_Base
+class JNICopyStatus : public IF_DbCopyStatus
 {
 public:

@@ -86,24 +86,24 @@ public:
 		m_pJvm = pJvm;
 	}
 	
-	RCODE XFLMAPI dbCopyStatus(
+	RCODE FLMAPI dbCopyStatus(
 		FLMUINT64		ui64BytesToCopy,
 		FLMUINT64		ui64BytesCopied,
 		FLMBOOL			bNewSrcFile,
 		const char *	pszSrcFileName,
 		const char *	pszDestFileName);
 		
-	FINLINE FLMUINT getRefCount( void)
+	FINLINE FLMINT FLMAPI getRefCount( void)
 	{
 		return( IF_DbCopyStatus::getRefCount());
 	}

-	virtual FINLINE FLMINT XFLMAPI AddRef( void)
+	virtual FINLINE FLMINT FLMAPI AddRef( void)
 	{
 		return( IF_DbCopyStatus::AddRef());
 	}

-	virtual FINLINE FLMINT XFLMAPI Release( void)
+	virtual FINLINE FLMINT FLMAPI Release( void)
 	{
 		return( IF_DbCopyStatus::Release());
 	}
@@ -117,7 +117,7 @@ private:
 /****************************************************************************
 Desc:
 ****************************************************************************/
-class JNICheckStatus : public IF_DbCheckStatus, public XF_Base
+class JNICheckStatus : public IF_DbCheckStatus
 {
 public:

@@ -131,24 +131,24 @@ public:
 		m_pJvm = pJvm;
 	}
 	
-	RCODE XFLMAPI reportProgress(
+	RCODE FLMAPI reportProgress(
 		XFLM_PROGRESS_CHECK_INFO *	pProgCheck);

-	RCODE XFLMAPI reportCheckErr(
+	RCODE FLMAPI reportCheckErr(
 		XFLM_CORRUPT_INFO *	pCorruptInfo,
 		FLMBOOL *				pbFix);
 		
-	FINLINE FLMUINT getRefCount( void)
+	FINLINE FLMINT FLMAPI getRefCount( void)
 	{
 		return( IF_DbCheckStatus::getRefCount());
 	}

-	virtual FINLINE FLMINT XFLMAPI AddRef( void)
+	virtual FINLINE FLMINT FLMAPI AddRef( void)
 	{
 		return( IF_DbCheckStatus::AddRef());
 	}

-	virtual FINLINE FLMINT XFLMAPI Release( void)
+	virtual FINLINE FLMINT FLMAPI Release( void)
 	{
 		return( IF_DbCheckStatus::Release());
 	}
--- a/xflaim/java/jni/jposistream.cpp
+++ b/xflaim/java/jni/jposistream.cpp
@@ -28,7 +28,7 @@
 #include "jniftk.h"

 #define THIS_STREAM() \
-	((F_PosIStream *)(FLMUINT)lThis)
+	((IF_PosIStream *)(FLMUINT)lThis)
 	
 /****************************************************************************
 Desc: