geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [2/2] geode-native git commit: GEODE-2382: Replace gemstone with geode.
Date Thu, 23 Feb 2017 18:55:15 GMT
GEODE-2382: Replace gemstone with geode.

- Remove AssemblyCompany.
- Migrate package hierarchy from com.gemstone.gemfire to org.apache.geode.
- Rename from gemstone.txt to geode.txt.

This closes #25.


Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/938aa471
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/938aa471
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/938aa471

Branch: refs/heads/develop
Commit: 938aa471bd32c775612419ed59de6e21a3625439
Parents: c45b789
Author: Sarge <mdodge@pivotal.io>
Authored: Wed Feb 22 10:38:14 2017 -0800
Committer: Jacob Barrett <jbarrett@pivotal.io>
Committed: Thu Feb 23 10:54:38 2017 -0800

----------------------------------------------------------------------
 src/clicache/integration-test/AssemblyInfo.cs   |   3 +-
 .../integration-test/DataOutputTests.cs         |   2 +-
 .../integration-test/DefaultCacheableN.cs       |   2 +-
 .../integration-test/RegionOperationN.cs        |   2 +-
 .../ThinClientAppDomainQueryTests.cs            |   2 +-
 .../integration-test/ThinClientCallbackArgN.cs  |   4 +-
 .../integration-test/ThinClientPdxTests.cs      |  12 -
 src/clicache/integration-test/gateway1.xml      |   5 -
 src/clicache/integration-test/unicast.xml       | 878 -------------------
 .../gemfire/plugins/sqlite/AssemblyInfo.cs      |  49 --
 .../gemfire/plugins/sqlite/SqLiteImpl.cs        | 274 ------
 src/cppcache/integration-test/gateway1.xml      |   5 -
 src/cppcache/integration-test/gateway2.xml      |   8 -
 .../testThinClientSecurityPostAuthorization.cpp |   2 +-
 src/cppcache/src/ClientProxyMembershipID.cpp    |  28 +-
 src/executables/GacInstall/AssemblyInfo.cs      |   3 +-
 src/plugins/SQLiteCLI/AssemblyInfo.cs           |  48 +
 src/plugins/SQLiteCLI/SQLiteCLI.csproj.in       |   4 +-
 src/plugins/SQLiteCLI/SqLiteImpl.cs             | 274 ++++++
 .../BasicOperations/Properties/AssemblyInfo.cs  |   3 +-
 .../CqQuery/Properties/AssemblyInfo.cs          |   3 +-
 .../DataExpiration/Properties/AssemblyInfo.cs   |   3 +-
 .../vsprojects/Delta/Properties/AssemblyInfo.cs |   3 +-
 .../Properties/AssemblyInfo.cs                  |   3 +-
 .../DurableClient/Properties/AssemblyInfo.cs    |   3 +-
 .../Exceptions/Properties/AssemblyInfo.cs       |   3 +-
 .../ExecuteFunctions/Properties/AssemblyInfo.cs |   3 +-
 .../HACache/Properties/AssemblyInfo.cs          |   3 +-
 .../Properties/AssemblyInfo.cs                  |   3 +-
 .../Properties/AssemblyInfo.cs                  |   3 +-
 .../PdxInstance/Properties/AssemblyInfo.cs      |   3 +-
 .../PdxRemoteQuery/Properties/AssemblyInfo.cs   |   3 +-
 .../PdxSerializer/Properties/AssemblyInfo.cs    |   3 +-
 .../PoolCqQuery/Properties/AssemblyInfo.cs      |   3 +-
 .../PoolRemoteQuery/Properties/AssemblyInfo.cs  |   3 +-
 .../Properties/AssemblyInfo.cs                  |   3 +-
 .../Properties/AssemblyInfo.cs                  |   3 +-
 .../RefIDExample/Properties/AssemblyInfo.cs     |   3 +-
 .../RegisterInterest/Properties/AssemblyInfo.cs |   3 +-
 .../RemoteQuery/Properties/AssemblyInfo.cs      |   3 +-
 .../Security/Properties/AssemblyInfo.cs         |   3 +-
 .../SimplePlugins/Properties/AssemblyInfo.cs    |   3 +-
 .../Transactions/Properties/AssemblyInfo.cs     |   3 +-
 .../TransactionsXA/Properties/AssemblyInfo.cs   |   3 +-
 src/templates/security/authz5_5.dtd             |   4 +-
 src/templates/security/csharp/AssemblyInfo.cs   |   1 -
 src/tests/cli/DUnitFramework/AssemblyInfo.cs    |   3 +-
 src/tests/cli/FwkClient/AssemblyInfo.cs         |   3 +-
 src/tests/cli/FwkLauncher/AssemblyInfo.cs       |   3 +-
 src/tests/cli/NativeWrapper/AssemblyInfo.cpp    |   3 +-
 src/tests/cli/NewFwkLib/AssemblyInfo.cs         |   3 +-
 .../DeltaTest/DeltaClientValidationListener.cs  |   2 +-
 .../FunctionExecution/MyResultCollector.cs      |   2 +-
 .../PdxClassLibrary/Properties/AssemblyInfo.cs  |   3 +-
 .../PdxVersion1Lib/Properties/AssemblyInfo.cs   |   3 +-
 src/tests/cli/PdxVersion1Lib/Version1.cs        |   2 +-
 .../PdxVersion2Lib/Properties/AssemblyInfo.cs   |   3 +-
 src/tests/cli/PdxVersion2Lib/Version2.cs        |   2 +-
 src/tests/cli/QueryHelper/AssemblyInfo.cpp      |   3 +-
 .../SecurityUtil/LdapCredentialGeneratorN.cs    |   2 +-
 .../security/LdapUserCredentialGenerator.hpp    |   2 +-
 src/tests/javaobject/DefaultCacheable.java      |   4 +-
 src/tests/javaobject/EqStruct.java              |   2 +-
 src/tests/javaobject/InstantiatorTest.java      |   4 +-
 src/xsds/gfcpp-cache-9.0.xsd                    |   2 +-
 65 files changed, 382 insertions(+), 1354 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode-native/blob/938aa471/src/clicache/integration-test/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/AssemblyInfo.cs b/src/clicache/integration-test/AssemblyInfo.cs
index 11e7c30..e54a2f7 100644
--- a/src/clicache/integration-test/AssemblyInfo.cs
+++ b/src/clicache/integration-test/AssemblyInfo.cs
@@ -25,9 +25,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("UnitTests")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("GEMSTONE")]
 [assembly: AssemblyProduct("UnitTests")]
-[assembly: AssemblyCopyright("Copyright © GEMSTONE 2006")]
+[assembly: AssemblyCopyright("Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/938aa471/src/clicache/integration-test/DataOutputTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/DataOutputTests.cs b/src/clicache/integration-test/DataOutputTests.cs
index 607a310..a247b10 100755
--- a/src/clicache/integration-test/DataOutputTests.cs
+++ b/src/clicache/integration-test/DataOutputTests.cs
@@ -56,4 +56,4 @@ namespace Apache.Geode.Client.UnitTests
             Assert.AreEqual(bufferSize + 2, dataOutput.BufferLength, "Buffer length should be string plus 2 bytes for length.");
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/geode-native/blob/938aa471/src/clicache/integration-test/DefaultCacheableN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/DefaultCacheableN.cs b/src/clicache/integration-test/DefaultCacheableN.cs
index d8ed3b9..c9b8145 100644
--- a/src/clicache/integration-test/DefaultCacheableN.cs
+++ b/src/clicache/integration-test/DefaultCacheableN.cs
@@ -71,7 +71,7 @@ namespace Apache.Geode.Client.UnitTests
         
         m_cacheableInt32Array =new int[]{1,2,3};
         
-        m_cacheableFileName = "gemstone.txt";
+        m_cacheableFileName = "geode.txt";
         
         m_CacheableStringASCII = "asciistring";
         

http://git-wip-us.apache.org/repos/asf/geode-native/blob/938aa471/src/clicache/integration-test/RegionOperationN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/RegionOperationN.cs b/src/clicache/integration-test/RegionOperationN.cs
index ecad781..a0db56f 100644
--- a/src/clicache/integration-test/RegionOperationN.cs
+++ b/src/clicache/integration-test/RegionOperationN.cs
@@ -94,4 +94,4 @@ namespace Apache.Geode.Client.UnitTests
       }
     }
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/geode-native/blob/938aa471/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs b/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs
index e2c5b50..63ba85a 100644
--- a/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs
+++ b/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs
@@ -277,4 +277,4 @@ namespace Apache.Geode.Client.UnitTests
       Util.Log("Locator stopped");
     }
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/geode-native/blob/938aa471/src/clicache/integration-test/ThinClientCallbackArgN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientCallbackArgN.cs b/src/clicache/integration-test/ThinClientCallbackArgN.cs
index 85dbcc5..e62d2a0 100644
--- a/src/clicache/integration-test/ThinClientCallbackArgN.cs
+++ b/src/clicache/integration-test/ThinClientCallbackArgN.cs
@@ -485,7 +485,7 @@ namespace Apache.Geode.Client.UnitTests
       Assert.IsNotNull(csa, "String array is null");
       Assert.AreEqual(2, csa.Length, "String array length is not two");
 
-      Assert.AreEqual(dc.CFileName, "gemstone.txt", "Cacheable filename is not equal");
+      Assert.AreEqual(dc.CFileName, "geode.txt", "Cacheable filename is not equal");
 
       /*
       Assert.IsNotNull(dc.CHashSet, "hashset is null");
@@ -723,4 +723,4 @@ namespace Apache.Geode.Client.UnitTests
       runPutAllCallbackArgTest();
     }
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/geode-native/blob/938aa471/src/clicache/integration-test/ThinClientPdxTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientPdxTests.cs b/src/clicache/integration-test/ThinClientPdxTests.cs
index a186839..e598ff7 100755
--- a/src/clicache/integration-test/ThinClientPdxTests.cs
+++ b/src/clicache/integration-test/ThinClientPdxTests.cs
@@ -1405,21 +1405,9 @@ namespace Apache.Geode.Client.UnitTests
        all.Add(26, p6);
        all.Add(27, p7);
        all.Add(28, p8);
-       //all.Add(p1, "Gemstone");
-       //all.Add(p2, p1);
        region0.PutAll(all);
        
        
-       /*
-        
-       all.Clear();
-       all.Add(p1, "Gemstone");
-       region0.PutAll(all);
-       
-       all.Clear();
-       all.Add(p2, p1);
-       region0.PutAll(all);
-         */
        ICollection<object> keys = new List<object>();
        IDictionary<object, object> getall = new Dictionary<object, object>();
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/938aa471/src/clicache/integration-test/gateway1.xml
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/gateway1.xml b/src/clicache/integration-test/gateway1.xml
index b0fabe1..2d142a8 100644
--- a/src/clicache/integration-test/gateway1.xml
+++ b/src/clicache/integration-test/gateway1.xml
@@ -28,15 +28,10 @@
                     enable-persistence="true" maximum-queue-memory="10" parallel="false"
                     >
     </gateway-sender>
-
-    <!-- gateway-receiver bind-address="poland.gemstone.com" >
-        
-    </gateway-receiver -->
     
   <cache-server port="HOST_PORT1"  >   
 	</cache-server> 
 
-    <!-- pdx read-serialized="true"  persistent="true" disk-store-name="myDiskStore" / --> 
     <region name="exampleRegion"  >
       <region-attributes data-policy="partition" gateway-sender-ids="sender1"  >
         <partition-attributes redundant-copies="0"  total-num-buckets="113" > 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/938aa471/src/clicache/integration-test/unicast.xml
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/unicast.xml b/src/clicache/integration-test/unicast.xml
deleted file mode 100644
index 61e495d..0000000
--- a/src/clicache/integration-test/unicast.xml
+++ /dev/null
@@ -1,878 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-
-<!-- This is the Ant build file for running C tests.  It is designed 
-     to be invoked from the build.xml Ant script in the top level directory
-     of the GemFire tree, and expects to inherit the properties set
-     there.
-  -->
-
-<project name ="gemfire" default="usage">
-  <description>Runs GemFire C++ Tests</description>
-  <target name="usage">
-    <echo>
-    This script is designed to be invoked from the build.xml script
-    in the base directory.
-    </echo>
-  </target>
-
-  <taskdef name="conditional"
-    classname="com.gemstone.tools.ant.taskdefs.Conditional">
-    <classpath>
-      <pathelement location="${basedir}/../../../buildfiles/taskdefsV10.jar" />
-    </classpath>
-  </taskdef>
-
-
-  <target name="-run-testX">
-    <description>
-       Requires that the testName property be set.
-       If the testScript property is set then bash is used as the executable.
-       The testTimeout property can be set to the number of seconds to
-       wait before timing out. It defaults to 30 seconds.
-       If a test should only be run once against a single sytem then set
-       the testRunOnce property.
-    </description>
-    <conditional unless="cpp.testcase">
-      <conditional unless="cpp.testset">
-        <property name="thisTestOk" value="true"/>
-      </conditional>
-    </conditional> 
-    <conditional if="cpp.testcase">
-      <condition property="thisTestOk">
-        <equals arg1="${testName}" arg2="${cpp.testcase}"/>
-      </condition>
-    </conditional>
-    <conditional if="cpp.testset">
-      <condition property="thisTestOk">
-        <matches pattern="\\*${testName}\\*" string="${cpp.testset}"/>
-      </condition>
-    </conditional>
-    <condition property="okToRun">
-      <and>
-        <or>
-          <not> <isset property="testRunOnce"/> </not>
-          <not> <isset property="userSystem"/> </not>
-          <equals arg1="${iterations.count}" arg2="1"/>
-        </or>
-        <isset property="thisTestOk"/>
-      </and>
-    </condition>
-
-    <conditional unless="okToRun">
-       <echo level="info" message="Skipping test ${testName}"/>
-    </conditional>
-    <conditional if="okToRun">
-      <condition property="myTimeout" value="${testTimeout}">
-         <isset property="testTimeout"/>
-      </condition>
-    <!--  set the timeout for an individual test to 30 minutes -->
-      <condition property="myTimeout" value="1800">
-         <and>
-         <not><isset property="testTimeout"/></not>
-         <not><or>
-           <isset property="msdev"/>
-           <isset property="msdev.profile"/>
-           <isset property="cpp-debug"/>
-         </or></not>
-         </and>
-      </condition>
-      <condition property="myTimeout" value="9999999">
-         <or>
-           <isset property="msdev"/>
-           <isset property="msdev.profile"/>
-           <isset property="cpp-debug"/>
-         </or>
-      </condition>
-      <condition property="myExe" value="cmd">
-         <isset property="msdev.profile"/>
-      </condition>
-      <condition property="myExe" value="msdev">
-         <isset property="msdev"/>
-      </condition>
-      <condition property="msdevTestName" value="${cpptest.exedir}/${testName}.exe">
-         <isset property="msdev"/>
-      </condition>
-      <condition property="msdevTestName" value="/c ftime.bat ${cpptest.exedir}/${testName}">
-         <isset property="msdev.profile"/>
-      </condition>
-      <condition property="myExe" value="bash">
-         <isset property="testScript"/>
-      </condition>
-      <condition property="myExe" value="${cpptest.exedir}/${testName}">
-         <not><isset property="testScript"/></not>
-      </condition>
-      <condition property="myPath" value="${cpptest.exedir}${path.separator}${hiddenlib.dir}/debug${path.separator}${product.library.dir}${path.separator}${myenv.PATH}">
-         <isset property="cpp-debug"/>
-      </condition>
-      <condition property="myPath" value="${cpptest.exedir}${path.separator}${myenv.PATH}">
-         <and>
-         <not><isset property="cpp-debug"/></not>
-         <isset property="testScript"/>
-         </and>
-      </condition>
-      <condition property="myPath" value="${cpptest.exedir}${path.separator}${product.library.dir}${path.separator}${myenv.PATH}">
-         <and>
-         <not><isset property="cpp-debug"/></not>
-         <not><isset property="testScript"/></not>
-         </and>
-      </condition>
-      <condition property="test.library.dir" value="${cpptest.exedir}${path.separator}${product.library.dir}">
-         <and>
-         <not><isset property="cpp-debug"/></not>
-         <not><isset property="testScript"/></not>
-         </and>
-      </condition>
-      <condition property="test.library.dir" value="${cpptest.exedir}${path.separator}${hiddenlib.dir}/debug${path.separator}${product.library.dir}">
-         <isset property="cpp-debug"/>
-      </condition>
-      <property name="additionalLibPath" value=""/>
-      <tstamp>
-        <format property="test.time" pattern="HH:mm:ss"/>
-      </tstamp>
-      <echo level="info" message="${test.time}: ${testName} timeout=${myTimeout} seconds"/>
-      <condition property="working.dir" value="${tst_res}/cpp/${test.type}/native-client-only">
-        <contains string="${testName}" substring="thinclient" casesensitive="no"/>
-      </condition>
-      <condition property="working.dir" value="${tst_res}/cpp/${test.type}">
-        <not><contains string="${testName}" substring="thinclient" casesensitive="no"/></not>
-      </condition>
-     
-      <!-- echo message="Working dir is ${working.dir}"/ -->
-      <exec executable="bash" outputProperty="mport">
-        <arg line=" -c '((res=( ( $RANDOM * ( 52999 - 21111 + 1 ) ) / 53767 ) + 32111)); echo $res'"/>
-      </exec>
-      <exec executable="bash" outputProperty="bbport">
-        <arg line=" -c '((res=( ( $RANDOM * ( 31999 - 21111 + 1 ) ) / 32767 ) + 21115)); echo $res'"/>
-      </exec>
-      <exec executable="bash" outputProperty="maddr">
-        <arg line=" -c '((res=( ( $RANDOM * ( 255 - 1 + 1 ) ) / 32767 ) + 1)); echo $res'"/>
-      </exec>
-
-      <condition property="profiler.cmd" value="${valgrind.dir}/bin/valgrind --tool=${vtool} --log-file=./${vtool}-%lu-%d-%d.out ${vtool.args}">
-         <and>
-         <isset property="valgrind.dir"/>
-         <isset property="vtool"/>
-         </and>
-      </condition>
-      <condition property="profiler.cmd" value="">
-         <not><isset property="vtool"/></not>
-      </condition>
-      <condition property="valgrind.dir" value="">
-         <not><isset property="vtool"/></not>
-      </condition>
-      <!--
-      <property name="profiler.cmd" value="bcheck -all -o ./bcheck-%lu-%d-%d.out ${vtool.args}"/>
-      -->
-
-	  
-      <property name="path.dir" value="${product.library.dir}${path.separator}${myPath}${path.separator}${framework.dir}/lib${additionalLibPath}${path.separator}${openssl.dir}/bin"/>
-      <!--property name="path.dir" value="${myPath}${path.separator}${framework.dir}/lib${additionalLibPath}${path.separator}${valgrind.dir}/bin${path.separator}${openssl.dir}/lib${path.separator}${product.library.dir}"/-->
-      <!-- echo message="PATH is name=${path.dir}"/ -->
-      <!-- echo message="Port is ${mport}"/ -->
-      <!-- echo message="Addr is 224.10.13.${maddr}"/ -->
-      <!-- echo message="Cacheservers will use 224.10.13.${maddr}:${mport} for discovery."/ -->
-      <exec executable="${myExe}"
-                          resultproperty="testResult"
-                          failifexecutionfails="false"
-                          output="${tst_res}/cpp/${test.type}/${testName}.out"
-                          dir="${working.dir}">
-        <env key="LD_LIBRARY_PATH" path="${test.library.dir}${path.separator}${framework.dir}/lib${additionalLibPath}${path.separator}${hiddenlib.dir}${path.separator}${hidden.gpl.dir}${path.separator}${openssl.dir}/lib"/>
-        <env key="PATH" path="${path.dir}"/>
-        <env key="TESTSRC" path="${basedir}"/>    
-        <env key="GFCPP" path="${product.dir}"/>
-        <env key="GF_JAVA" path="${gfe.jre}/bin/java"/>
-        <env key="GFJAVA" path="${gfe.dir}"/>
-        <env key="GFE_LOGLEVEL" value="${gfeLogLevel}"/>
-        <env key="GFE_SECLOGLEVEL" value="${gfeSecLogLevel}"/>
-        <env key="MCAST_PORT" value="${mport}"/>
-        <env key="BB_PORT" value="${bbport}"/>
-        <env key="MCAST_ADDR" value="224.10.13.${maddr}"/>
-        <env key="TIMEBOMB" value="${myTimeout}"/>
-        <env key="TESTNAME" value="${testName}" />
-        <env key="CLASSPATH" path="${gfe.dir}/lib/server-dependencies.jar:${framework.dir}/lib/javaobject.jar:${gfe.dir}/lib/antlr.jar:${gfe.dir}/lib/gfSecurityImpl.jar" />
-        <env key="PROFILERCMD" value="${profiler.cmd}" />
-	<env key="BUG481" value="${BUG481}" />
-        <arg line="${msdevTestName}"/>
-      </exec>
-      <condition property="unitTestFailed">
-        <not>
-           <equals arg1="${testResult}" arg2="0"/>
-        </not>
-      </condition>
-      <property name="xml.reports" 
-                value="${tst_res}/cpp/${test.type}/xml-reports"/>
-      <conditional if="unitTestFailed">
-        <echo level="info" message="FAILED: c++ unicast test ${testName}"/>
-        <propertyfile file="${tst_res}/cpp/${test.type}/cppTestFailures" comment="Number of Tests that Failed">
-          <entry key="failureCount" type="int" operation="+" value="1"/>
-          <entry key="failedTests" operation="+" value=" ${testName}"/>
-        </propertyfile>
-        <copy todir="${errorsDir}" preservelastmodified="true">
-           <fileset dir="${tst_res}/cpp/${test.type}" includes="${testName}*"/>
-        </copy>
-        <loadfile srcfile="${tst_res}/cpp/${test.type}/${testName}.out" property="output">
-          <filterchain>
-            <filterreader classname="org.apache.tools.ant.filters.TailFilter">
-              <param name="lines" value="15"/>
-            </filterreader>
-          </filterchain>
-        </loadfile>
-
-        <concat append="no" destfile="${xml.reports}/${testName}.xml">
-<![CDATA[<testsuite errors="0" failures="1" name="${testName}" tests="1">
-  <testcase classname="${testName}" name="${testName}">
-    <failure message="Log lines that contain suspect phrases">]]>
-<![CDATA[<![CDATA[
-${output}
-]]>]]&gt;
-<![CDATA[      </failure>
-  </testcase>
-</testsuite>]]>
-        </concat>
-      </conditional>
-      <conditional unless="unitTestFailed">
-        <concat append="no" destfile="${xml.reports}/${testName}.xml">
-<![CDATA[<testsuite errors="0" failures="0" name="${testName}" tests="1">
-  <testcase classname="${testName}" name="${testName}"/>
-</testsuite>]]>
-        </concat>
-      </conditional>
-    </conditional>
-  </target>
-
-  <tstamp>
-    <format property="time.stamp" pattern="yyyyMMddHHmmss"/>
-  </tstamp>
-  <propertyregex property="cpp.sanitizedtestcase"
-                 override="true"
-                 input="${cpp.testcase}"
-                 regexp="[+*?]"
-                 replace="_"
-                 global="true" />
-
-  <target name="stable-tests">
-    <property name="ctest" value="ctest"/>
-    <property name="cpp.testcase" value="."/>
-    <conditional if="isWindows">
-      <property name="ctest.log" value="%TESTNAME%.log" />
-    </conditional>
-    <property name="ctest.log" value="${TESTNAME}.log" />
-    <exec executable="${ctest}" dir="${build.dir}/build-${cmake-build-type}/tests/cppcache" failonerror="true">
-      <env key="LOG" value="|tee ${ctest.log}"/>
-      <arg value="-C"/>
-      <arg value="${cmake-build-type}"/>
-      <arg value="-j${parallelTests}"/>
-      <arg line="${ctest.args}"/>
-      <arg value="-L"/>
-      <arg value="STABLE"/>     
-      <arg value="-O"/>
-      <arg value="STABLE_${time.stamp}_tests.log"/>
-    </exec>
-  </target>
-
-  <target name="flaky-tests">
-    <property name="ctest" value="ctest"/>
-    <property name="cpp.testcase" value="."/>
-    <conditional if="isWindows">
-      <property name="ctest.log" value="%TESTNAME%.log" />
-    </conditional>
-    <property name="ctest.log" value="${TESTNAME}.log" />
-    <exec executable="${ctest}" dir="${build.dir}/build-${cmake-build-type}/tests/cppcache" failonerror="true">
-      <env key="LOG" value="|tee ${ctest.log}"/>
-      <arg value="-C"/>
-      <arg value="${cmake-build-type}"/>
-      <arg value="-j${parallelTests}"/>
-      <arg line="${ctest.args}"/>
-      <arg value="-L"/>
-      <arg value="FLAKY"/>     
-      <arg value="-O"/>
-      <arg value="FLAKY_${time.stamp}_tests.log"/>
-    </exec>
-  </target>
-
-	<target name="unicast-tests">
-		<property name="ctest" value="ctest"/>
-		<property name="cpp.testcase" value="."/>
-    <conditional if="isWindows">
-      <property name="ctest.log" value="%TESTNAME%.log" />
-    </conditional>
-    <property name="ctest.log" value="${TESTNAME}.log" />
-		<exec executable="${ctest}" dir="${build.dir}/build-${cmake-build-type}/tests/cppcache" failonerror="true">
-			<env key="LOG" value="|tee ${ctest.log}"/>
-			<arg value="-C"/>
-			<arg value="${cmake-build-type}"/>
-			<arg value="-j${parallelTests}"/>
-			<arg line="${ctest.args}"/>
-			<arg value="-R"/>
-			<arg value="${cpp.testcase}"/>			
-			<arg value="-O"/>
-            <arg value="${cpp.sanitizedtestcase}_${time.stamp}_tests.log"/>			
-		</exec>
-	</target>
-	
-<target name="unicast-testsX">
-
-    <!-- LD_LIBRARY_PATH and PATH are both set to the lib directory so
-         that the loader can find the shared-library/dll and we don't 
-         have to have a different exec task for each operating system -->
-
-    <echo>running tests</echo>
-
-	<!-- added for setting custom new and delete operators -->
-    <condition property="BUG481" value="">
-       <not><isset property="BUG481"/></not>
-    </condition>
-	  
-    <delete file="${tst_res}/cpp/${test.type}/cppTestFailures" quiet="true"/>
-    <propertyfile file="${tst_res}/cpp/${test.type}/cppTestFailures" comment="Number of Tests that Failed">
-      <entry key="failureCount" type="int" value="0"/>
-      <entry key="failedTests" value=""/>
-    </propertyfile>
-
-    <exec executable="bash" outputProperty="unique.mcast.port">
-      <arg line=" -c '((res=( ( $RANDOM * ( 52999 - 21111 + 1 ) ) / 53767 ) + 32111)); echo $res'"/>
-    </exec>
-
-    <copy todir="${tst_res}/cpp/${test.type}/native-client-only" preservelastmodified="true">
-      <fileset dir="${tests.cppcache.src.dir}/">
-        <include name="*.dtd"/>
-      </fileset>
-    </copy>
-    
-    <propertyfile file="${tst_res}/cpp/${test.type}/native-client-only/geode.properties">
-      <entry key="log-level" value="${logLevel}"/>
-      <!--entry key="stacktrace-enabled" value="true"/-->
-      <!--entry key="license-file" value="${hidden.dir}/internal.license.nativeclientonly.zip"/-->
-    </propertyfile>
-
-    <propertyfile file="${tst_res}/cpp/${test.type}/geode.properties">
-      <entry key="log-level" value="${logLevel}"/>
-      <!--entry key="stacktrace-enabled" value="true"/-->
-      <!--entry key="cache-server-version" value="5.7"/-->
-      <!--entry key="license-file" value="${hidden.dir}/internal.license.nativeclientonly.zip"/-->
-    </propertyfile>    
-    <!--propertyfile file="${tst_res}/cpp/${test.type}/native-client-only/gemfire.properties">
-      <entry key="log-level" value="Config"/>
-    </propertyfile-->    
-  <parallel threadCount='${parallelTests}'>
-    <antcall target="-run-test">
-       <param name="testName" value="testSTLport"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientPutAll"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientPutAllWithCallBckArg"/>
-    </antcall>
-    <antcall target="-run-test">
-  	       <param name="testName" value="testThinClientRemoveAll"/>
-  	    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientGatewayTest"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientPutAllTimeout"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientPutGetAll"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientCacheables"/>
-       <param name="testTimeout" value="1800"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientNotification"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientDistOps"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientDistOps2"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientFailover"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientFailover2"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientFailover3"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientInterestList"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientInterestList2"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientFailoverInterest"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientFailoverInterest2"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientFailoverInterestAllWithCache"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientRegex"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientRegex2"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientRegex3"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientRIwithlocalRegionDestroy"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientIntResPolKeysInv"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientFailoverRegex"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientHADistOps"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientHAFailover"/>
-       <param name="testTimeout" value="3600"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientHAFailoverRegex"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientHAMixedRedundancy"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientHAQueryFailover"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientHAEventIDMap"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientHAPeriodicAck"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testMixedHACPPRegions"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientLRUExpiration"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientHeapLRU"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientPoolAttrTest"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientPoolLocator"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientPoolServer"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientRemoteQueryRS"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientRemoteQuerySS"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientRemoteQueryFailover"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientRemoteRegionQuery"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientLocator"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientSSL"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientSSLWithSecurityAuthz"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientSecurityAuthentication"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientSecurityAuthenticationMU"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientSecurityAuthorization"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientSecurityAuthorizationMU"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientSecurityPostAuthorization"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientSecurityDH"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientSecurityDH_MU"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientSecurityMultiUserTest"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientSecurityCQAuthorization"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientSecurityCQAuthorizationMU"/>
-    </antcall>
-    <!--antcall target="-run-test">
-       <param name="testName" value="testThinClientSecurityDurableCQAuthorizationMU"/>
-    </antcall-->
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientDurableConnect"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientDurable"/>
-       <param name="testTimeout" value="3600"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientDurableFailover"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientDurableInterest"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientDurableReconnect"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientRemoteQueryTimeout"/>
-       <param name="testTimeout" value="3600"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientRegionQueryExclusiveness"/>
-    </antcall>
-    <antcall target="-run-test">
-      <param name="testName" value="testThinClientListenerCallbackArgTest"/>
-    </antcall>
-    <antcall target="-run-test">
-      <param name="testName" value="testThinClientPoolRedundancy"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientRegionQueryDifferentServerConfigs"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientStatistics"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientBackwardCompatibility"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientListenerWriter"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientWriterException"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientCallbackArg"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testLogger"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testSystemProperties"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testFWHelper"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testDunit"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testFwPerf"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testEntriesMap"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testEntriesMapForVersioning"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testLinkage"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testLRUList"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testRegionMap"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testDataOutput"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testSpinLock"/>
-    </antcall>
-    <conditional unless="isSolaris">
-      <antcall target="-run-test">
-         <param name="testName" value="testTimedSemaphore"/>
-      </antcall>
-    </conditional>
-    <antcall target="-run-test">
-       <param name="testName" value="testSharedPtr"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testNativeCompareBasic"/>
-    </antcall>
-    <!--antcall target="-run-test">
-       <param name="testName" value="testLicense"/>
-    </antcall-->
-    <antcall target="-run-test">
-       <param name="testName" value="testConnect"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testSerialization"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testCacheless"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testExpiration"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testCache"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testRegionTemplateArgs"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testXmlCacheCreationWithOverFlow"/>
-       <param name="additionalLibPath" value="${path.separator}${sqlite.dir}/lib"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testXmlCacheCreationWithPools"/>
-       <param name="additionalLibPath" value="${path.separator}${bdb.library.dir}"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testXmlCacheCreationWithRefid"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testOverflowPutGet"/>
-       <param name="additionalLibPath" value="${path.separator}${bdb.library.dir}"/>
-    </antcall>
-	<antcall target="-run-test">
-       <param name="testName" value="testOverflowPutGetSqLite"/>
-       <param name="additionalLibPath" value="${path.separator}${sqlite.dir}/lib"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testRegionAccessThreadSafe"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientConflation"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientListenerInit"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testAttributesFactory"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientBigValue"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testAttributesMutator"/>
-    </antcall>
-	<antcall target="-run-test">
-       <param name="testName" value="testThinClientCacheablesLimits"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientInterest1"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientInterest1Cacheless"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientInterest2"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientInterest3"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientInterest3Cacheless"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientInterestNotify"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientCq"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientCqDurable"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientCqIR"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientCqFailover"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientCqHAFailover"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientCqDelta"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientCacheableStringArray"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientPoolExecuteFunction"/>
-    </antcall>
-	<antcall target="-run-test">
-	<param name="testName" value="testThinClientPoolExecuteHAFunction"/>
-	  </antcall>
-	<antcall target="-run-test">
-      <param name="testName" value="testThinClientPoolExecuteFunctionPrSHOP"/>
-    </antcall>
-	<antcall target="-run-test">
-	  <param name="testName" value="testThinClientPoolExecuteHAFunctionPrSHOP"/>
-	</antcall>	
-     <antcall target="-run-test">
-           <param name="testName" value="testThinClientLocatorFailover"/>
-    </antcall>
-    <!--<antcall target="-run-test">
-       <param name="testName" value="testThinClientTracking"/>
-    </antcall> -->
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientTicket303"/>
-       <param name="additionalLibPath" value="${path.separator}${hidden.gpl.dir}"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientTicket317"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientTicket304"/>
-    </antcall>
-    
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientDisconnectionListioner"/>
-    </antcall>
-    
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientAfterRegionLive"/>
-    </antcall>
-    
-    <antcall target="-run-test">
-           <param name="testName" value="testThinClientPutWithDelta"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientDeltaWithNotification"/>
-       <param name="additionalLibPath" value="${path.separator}${bdb.library.dir}"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testCreateAndDestroyPool"/>
-    </antcall>
-    
-    <antcall target="-run-test">
-           <param name="testName" value="testThinClientNotificationWithDeltaWithoutcache"/>
-    </antcall>
-
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientClearRegion"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientGetInterests"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientContainsKeyOnServer"/>
-    </antcall>
-    <antcall target="-run-test">
-        <param name="testName" value="testThinClientLocalCacheLoader"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientMultiDS"/>
-    </antcall> 
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientPRSingleHop"/>
-       <param name="testTimeout" value="3600"/>
-    </antcall> 
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientPutAllPRSingleHop"/>
-       <param name="testTimeout" value="1800"/>
-    </antcall> 
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientPRPutAllFailover"/>
-    </antcall>
-    <antcall target="-run-test">
-       <param name="testName" value="testThinClientPartitionResolver"/>
-   </antcall>
-    <antcall target="-run-test">
-        <param name="testName" value="testThinClientListenerEvents"/>
-    </antcall>
-	<antcall target="-run-test">
-        <param name="testName" value="testThinClientRemoveOps"/>
-    </antcall>
-	<antcall target="-run-test">
-        <param name="testName" value="testThinClientPRSingleHopServerGroup"/>
-    </antcall>	
-	<antcall target="-run-test">
-        <param name="testName" value="testThinClientFixedPartitionResolver"/>
-    </antcall>	
-	<antcall target="-run-test">
-        <param name="testName" value="testThinClientTransactions"/>
-    </antcall>	
-	<antcall target="-run-test">
-        <param name="testName" value="testThinClientTransactionsXA"/>
-    </antcall>	
-	<antcall target="-run-test">
-        <param name="testName" value="testThinClientTXFailover"/>
-    </antcall>	
-  <antcall target="-run-test">
-        <param name="testName" value="testThinClientSSLWithPassword"/>
-  </antcall>
-	<antcall target="-run-test">
-		<param name="testName" value="testThinClientPdxTests"/>
-    <param name="testTimeout" value="1800"/> 
-    </antcall>
-  <antcall target="-run-test">
-    <param name="testName" value="testThinClientPdxSerializer"/>
-  </antcall>
-	<antcall target="-run-test">
-        <param name="testName" value="testThinClientPdxInstance"/>
-    </antcall>
-	<antcall target="-run-test">
-        <param name="testName" value="testThinClientPdxEnum"/>
-    </antcall>		
-    <antcall target="-run-test">
-      <param name="testName" value="testThinClientVersionedOps"/>
-    </antcall>
-	<antcall target="-run-test">
-	  <param name="testName" value="testThinClientExecuteFunctionPrSHOP"/>
-	</antcall>
- 	<antcall target="-run-test">
-	  <param name="testName" value="testThinClientPdxTestsAuto"/>
-	</antcall>
-	<antcall target="-run-test">
-		<param name="testName" value="testThinClientPdxTestsWithAuto"/>
-		<param name="testTimeout" value="3600"/>
-    </antcall>
- 	<antcall target="-run-test">
-	  <param name="testName" value="testThinClientInterest1_Bug1001"/>
-	</antcall>	
-	
-  </parallel>  
-</target>
-
-</project>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/938aa471/src/com/gemstone/gemfire/plugins/sqlite/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/src/com/gemstone/gemfire/plugins/sqlite/AssemblyInfo.cs b/src/com/gemstone/gemfire/plugins/sqlite/AssemblyInfo.cs
deleted file mode 100644
index 85ede51..0000000
--- a/src/com/gemstone/gemfire/plugins/sqlite/AssemblyInfo.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Apache.Geode.Plugins.SqLite")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Apache.Geode.Plugins.SqLite")]
-[assembly: AssemblyCopyright("Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("bb7e822b-885b-409e-8ef2-f74bb4fc142d")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

http://git-wip-us.apache.org/repos/asf/geode-native/blob/938aa471/src/com/gemstone/gemfire/plugins/sqlite/SqLiteImpl.cs
----------------------------------------------------------------------
diff --git a/src/com/gemstone/gemfire/plugins/sqlite/SqLiteImpl.cs b/src/com/gemstone/gemfire/plugins/sqlite/SqLiteImpl.cs
deleted file mode 100644
index 1b9d9d7..0000000
--- a/src/com/gemstone/gemfire/plugins/sqlite/SqLiteImpl.cs
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using System;
-using System.Data;
-using System.Data.SQLite;
-using Apache.Geode.Client;
-using System.IO;
-using System.Runtime.Serialization.Formatters.Binary;
-namespace Apache.Geode.Plugins.SQLite
-{
-
-  public class SqLiteImpl<TKey, TValue> : IPersistenceManager<TKey, TValue>
-  {
-
-    #region Factory Method
-    public static SqLiteImpl<TKey, TValue> Create()
-    {
-      return new SqLiteImpl<TKey, TValue>();
-    }
-
-    #endregion //Factory Method
-
-    #region IPersistenceManager<TKey,TValue> Members
-
-
-    public void Init(IRegion<TKey, TValue> region, Properties<string, string> diskProperties)
-    {
-      try
-      {
-        string pageSize, maxPageCount, persistenceDir;
-        m_tableName = region.Name;
-
-        if (diskProperties == null)
-        {
-          persistenceDir = DefaultPersistenceDir;
-          pageSize = DefaultPageSize;
-          maxPageCount = DefaultMaxPageCount;
-        }
-        else
-        {
-          persistenceDir = string.IsNullOrEmpty(diskProperties.Find(PersistenceDir)) ? DefaultPersistenceDir : diskProperties.Find(PersistenceDir);
-          pageSize = string.IsNullOrEmpty(diskProperties.Find(PageSize)) ? DefaultPageSize : diskProperties.Find(PageSize);
-          maxPageCount = string.IsNullOrEmpty(diskProperties.Find(MaxPageCount)) ? DefaultMaxPageCount : diskProperties.Find(MaxPageCount);
-        }
-        Log.Debug("InitalizeSqLite called with MaxPageCount:{0} PageSize:{1} PersistenceDir:{2}", maxPageCount, pageSize, persistenceDir);
-
-        // create region db file
-        m_persistenceDir = Path.Combine(Directory.GetCurrentDirectory(), persistenceDir);
-        m_regionDir = Path.Combine(m_persistenceDir, m_tableName);
-        Directory.CreateDirectory(m_regionDir);
-
-        //create sqlite connection string
-        m_connectionString = string.Format("Data Source={0};Version=3;Page Size={1};Max Page Count={2};",
-          Path.Combine(m_regionDir, m_tableName + ".db"), pageSize, maxPageCount);
-        Log.Debug("Created connection string : {0}", m_connectionString);
-        SqliteHelper.InitalizeSqLite(m_tableName, m_connectionString);
-      }
-      catch (Exception ex)
-      {
-        Log.Error("Exception in SqLiteImpl.Init: {0}", ex);
-        throw;
-      }
-
-    }
-
-    public TValue Read(TKey key)
-    {
-      try
-      {
-        return (TValue)SqliteHelper.GetValue(key, m_tableName, m_connectionString);
-      }
-      catch (Exception ex)
-      {
-        Log.Error("Exceptn in SqLiteImpl.Init: {0}", ex);
-        throw;
-      }
-    }
-
-    public void Write(TKey key, TValue value)
-    {
-      try
-      {
-        SqliteHelper.InsertKeyValue(key, value, m_tableName, m_connectionString);
-      }
-      catch (Exception ex)
-      {
-        Log.Error("Exceptn in SqLiteImpl.Init: {0}", ex);
-        throw;
-      }
-    }
-
-    public bool WriteAll()
-    {
-      throw new NotImplementedException();
-    }
-
-    public bool ReadAll()
-    {
-      throw new NotImplementedException();
-    }
-
-    public void Destroy(TKey key)
-    {
-      try
-      {
-        SqliteHelper.RemoveKey(key, m_tableName, m_connectionString);
-      }
-      catch (Exception ex)
-      {
-        Log.Error("Exceptn in SqLiteImpl.Init: {0}", ex);
-        throw;
-      }
-    }
-
-    public void Close()
-    {
-      try
-      {
-        SqliteHelper.CloseSqlite();
-        Directory.Delete(m_regionDir, true);
-        Directory.Delete(m_persistenceDir);
-      }
-      catch (Exception ex)
-      {
-        Log.Error("Exceptn in SqLiteImpl.Init: {0}", ex);
-      }
-    }
-
-    #endregion //IPersistenceManager<TKey,TValue> Members
-
-    #region Data Members
-    private string m_connectionString;
-    private string m_tableName;
-    private string m_persistenceDir;
-    private string m_regionDir;
-    #endregion
-
-    #region Constants
-    public static readonly string PersistenceDir = "PersistenceDirectory";
-    public static readonly string MaxPageCount = "max_page_count";
-    public static readonly string PageSize = "page_size";
-    public static readonly string DefaultPersistenceDir = "GeodeRegionData";
-    public static readonly string DefaultMaxPageCount = "2147483646";
-    public static readonly string DefaultPageSize = "65536";
-    #endregion
-
-  }
-
-  internal static class SqliteHelper
-  {
-    public static byte[] GetBytes(object obj)
-    {
-      BinaryFormatter bf = new BinaryFormatter();
-      MemoryStream ms = new MemoryStream();
-      bf.Serialize(ms, obj);
-      return ms.ToArray();
-    }
-
-    public static object GetObject(byte[] bytes)
-    {
-      BinaryFormatter bf = new BinaryFormatter();
-      MemoryStream ms = new MemoryStream(bytes);
-      return bf.Deserialize(ms);
-    }
-
-    public static void InitalizeSqLite(string tableName, string connectionString)
-    {
-
-      //construct create table query for this region
-      string query = string.Format("CREATE TABLE IF NOT EXISTS {0}(key BLOB PRIMARY KEY,value BLOB);", tableName);
-
-      using (SQLiteConnection conn = new SQLiteConnection(connectionString))
-      {
-        conn.Open();
-        using (SQLiteCommand command = new SQLiteCommand(query, conn))
-        {
-          Log.Debug("Executing query:{0} ", command.CommandText);
-          command.ExecuteNonQuery();
-        }
-      }
-      Log.Debug("Initialization Completed");
-    }
-
-    public static void ExecutePragma(string pragmaName, string pragmaValue, string connectionString)
-    {
-      string pragmaQuery = string.Format("PRAGMA {0} = {1};", pragmaName, pragmaValue);
-      using (SQLiteConnection conn = new SQLiteConnection(connectionString))
-      {
-        conn.Open();
-        using (SQLiteCommand command = new SQLiteCommand(pragmaQuery, conn))
-        {
-          Log.Debug("Executing query:{0} ", command.CommandText);
-          command.ExecuteNonQuery();
-        }
-      }
-    }
-
-    public static void InsertKeyValue(object key, object value, string tableName, string connectionString)
-    {
-      //construct query
-      string query = string.Format("REPLACE INTO {0} VALUES(@key,@value);", tableName);
-      using (SQLiteConnection conn = new SQLiteConnection(connectionString))
-      {
-        conn.Open();
-        using (SQLiteCommand command = new SQLiteCommand(query, conn))
-        {
-          command.Parameters.Add(new SQLiteParameter("@key", key));
-          command.Parameters.Add(new SQLiteParameter("@value", GetBytes(value)));
-          Log.Debug("Executing query:{0} ", command.CommandText);
-          command.ExecuteNonQuery();
-        }
-      }
-    }
-
-    public static object GetValue(object key, string tableName, string connectionString)
-    {
-      //construct query
-      string query = string.Format("SELECT value FROM {0} WHERE key=@key;", tableName);
-      object retValue;
-      using (SQLiteConnection conn = new SQLiteConnection(connectionString))
-      {
-        conn.Open();
-        using (SQLiteCommand command = new SQLiteCommand(query, conn))
-        {
-          // create parameters and execute
-          command.Parameters.Add(new SQLiteParameter("@key", key));
-          Log.Debug("Executing query:{0} ", command.CommandText);
-          retValue = SqliteHelper.GetObject((byte[])command.ExecuteScalar());
-        }
-      }
-      return retValue;
-    }
-
-    public static void RemoveKey(object key, string tableName, string connectionString)
-    {
-      //construct query
-      string query = string.Format("DELETE FROM {0} WHERE key=@key;", tableName);
-      using (SQLiteConnection conn = new SQLiteConnection(connectionString))
-      {
-        conn.Open();
-        using (SQLiteCommand command = new SQLiteCommand(query, conn))
-        {
-          // create parameters and execute
-          command.Parameters.Add(new SQLiteParameter("@key", key));
-          Log.Debug("Executing query:{0} ", command.CommandText);
-          command.ExecuteNonQuery();
-        }
-      }
-    }
-
-    public static void CloseSqlite()
-    {
-      // remove the region db files
-      //Directory.Delete(m_persistenceDir, true);
-    }
-
-
-  }
-}

http://git-wip-us.apache.org/repos/asf/geode-native/blob/938aa471/src/cppcache/integration-test/gateway1.xml
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/gateway1.xml b/src/cppcache/integration-test/gateway1.xml
index 8f2773a..1ace51e 100755
--- a/src/cppcache/integration-test/gateway1.xml
+++ b/src/cppcache/integration-test/gateway1.xml
@@ -28,15 +28,10 @@
                     enable-persistence="true" maximum-queue-memory="10" parallel="false"
                     >
     </gateway-sender>
-
-    <!-- gateway-receiver bind-address="poland.gemstone.com" >
-        
-    </gateway-receiver -->
     
   <cache-server port="HOST_PORT1"  >   
 	</cache-server> 
 
-    <!-- pdx read-serialized="true"  persistent="true" disk-store-name="myDiskStore" / --> 
     <region name="exampleRegion"  >
       <region-attributes data-policy="partition" gateway-sender-ids="sender1"  >
         <partition-attributes redundant-copies="0"  total-num-buckets="113" > 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/938aa471/src/cppcache/integration-test/gateway2.xml
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/gateway2.xml b/src/cppcache/integration-test/gateway2.xml
index eef266a..5a57eb7 100755
--- a/src/cppcache/integration-test/gateway2.xml
+++ b/src/cppcache/integration-test/gateway2.xml
@@ -22,13 +22,6 @@
   "http://www.gemstone.com/dtd/cache7_0.dtd">
 <cache copy-on-read="false" >
 
- 
-  <!-- gateway-sender id="sender1" remote-distributed-system-id="2" batch-size="1000"
-                    batch-time-interval="1000"
-                    enable-persistence="true" maximum-queue-memory="10" parallel="false"
-                    >
-    </gateway-sender -->
-
     <gateway-receiver bind-address="localhost" >
         
     </gateway-receiver>
@@ -36,7 +29,6 @@
   <cache-server port="HOST_PORT2"  >   
 	</cache-server> 
                       
-    <!-- pdx read-serialized="true" persistent="true" disk-store-name="myDiskStore" / --> 
     <region name="exampleRegion"  >
       <region-attributes data-policy="partition" gateway-sender-ids="sender1" >
         <partition-attributes redundant-copies="0"  total-num-buckets="113" > 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/938aa471/src/cppcache/integration-test/testThinClientSecurityPostAuthorization.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientSecurityPostAuthorization.cpp b/src/cppcache/integration-test/testThinClientSecurityPostAuthorization.cpp
index 1287614..5f953ce 100644
--- a/src/cppcache/integration-test/testThinClientSecurityPostAuthorization.cpp
+++ b/src/cppcache/integration-test/testThinClientSecurityPostAuthorization.cpp
@@ -114,7 +114,7 @@ const char* getServerSecurityParams() {
     serverSecurityParams +=
         std::string(" security-ldap-basedn=") +
         (ldapRoot != NULL ? ldapRoot
-                          : "ou=ldapTesting,dc=ldap,dc=gemstone,dc=com");
+                          : "ou=ldapTesting,dc=ldap,dc=apache,dc=org");
 
     char* ldapSSL = ACE_OS::getenv("LDAP_USESSL");
     serverSecurityParams += std::string(" security-ldap-usessl=") +

http://git-wip-us.apache.org/repos/asf/geode-native/blob/938aa471/src/cppcache/src/ClientProxyMembershipID.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ClientProxyMembershipID.cpp b/src/cppcache/src/ClientProxyMembershipID.cpp
index 7ff38ee..4edaf99 100644
--- a/src/cppcache/src/ClientProxyMembershipID.cpp
+++ b/src/cppcache/src/ClientProxyMembershipID.cpp
@@ -378,9 +378,6 @@ Serializable* ClientProxyMembershipID::fromData(DataInput& input) {
   input.read(&vmKind);                 // vmkind
   CacheableStringArrayPtr aStringArray(CacheableStringArray::create());
   aStringArray->fromData(input);
-  // #925 - currently reading empty string keep watch here,
-  // server might remove even sending this string
-  // (https://svn.gemstone.com/trac/geode/changeset/44566).
   input.readObject(dsName);            // name
   input.readObject(uniqueTag);         // unique tag
   input.readObject(durableClientId);   // durable client id
@@ -437,9 +434,6 @@ Serializable* ClientProxyMembershipID::readEssentialData(DataInput& input) {
     vmViewId = atoi(vmViewIdstr.ptr()->asChar());
   }
 
-  // #925 - currently reading empty string keep watch here,
-  // server might remove even sending this string
-  // (https://svn.gemstone.com/trac/geode/changeset/44566).
   input.readObject(dsName);  // name
 
   if (vmKind != ClientProxyMembershipID::LONER_DM_TYPE) {
@@ -504,27 +498,7 @@ int16_t ClientProxyMembershipID::compareTo(DSMemberForVersionStampPtr other) {
     if (myAddr[i] < otherAddr[i]) return -1;
     if (myAddr[i] > otherAddr[i]) return 1;
   }
-  // #925 - currently reading empty string keep watch here,
-  // server might remove even sending this string
-  // (https://svn.gemstone.com/trac/geode/changeset/44566).
-  // InternalDistributedMember no longer uses "name" in comparisons.
-  // std::string myDSName = getDSName();
-  // std::string otherDSName = otherMember->getDSName();
-
-  // if (myDSName.empty()&& otherDSName.empty()) {
-  //  // do nothing
-  //} else if (myDSName.empty()) {
-  //  return -1;
-  //}
-  // else if (otherDSName.empty()) {
-  //  return 1;
-  //}
-  // else {
-  //  int i = myDSName.compare(otherDSName);
-  //  if (i != 0) {
-  //    return i;
-  //  }
-  //}
+
   std::string myUniqueTag = getUniqueTag();
   std::string otherUniqueTag = otherMember->getUniqueTag();
   if (myUniqueTag.empty() && otherUniqueTag.empty()) {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/938aa471/src/executables/GacInstall/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/src/executables/GacInstall/AssemblyInfo.cs b/src/executables/GacInstall/AssemblyInfo.cs
index a9e8d9a..036a99a 100644
--- a/src/executables/GacInstall/AssemblyInfo.cs
+++ b/src/executables/GacInstall/AssemblyInfo.cs
@@ -25,9 +25,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("GeodeGacInstall")]
 [assembly: AssemblyDescription("Geode utility to install/uninstall to GAC")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("GemStone Systems Inc.")]
 [assembly: AssemblyProduct("GeodeGacInstall")]
-[assembly: AssemblyCopyright("Copyright © GemStone Systems Inc. 2006")]
+[assembly: AssemblyCopyright("Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.")]
 [assembly: AssemblyTrademark("All Rights Reserved")]
 [assembly: AssemblyCulture("")]
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/938aa471/src/plugins/SQLiteCLI/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/src/plugins/SQLiteCLI/AssemblyInfo.cs b/src/plugins/SQLiteCLI/AssemblyInfo.cs
new file mode 100644
index 0000000..96cb45d
--- /dev/null
+++ b/src/plugins/SQLiteCLI/AssemblyInfo.cs
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Apache.Geode.Plugins.SqLite")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyProduct("Apache.Geode.Plugins.SqLite")]
+[assembly: AssemblyCopyright("Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("bb7e822b-885b-409e-8ef2-f74bb4fc142d")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

http://git-wip-us.apache.org/repos/asf/geode-native/blob/938aa471/src/plugins/SQLiteCLI/SQLiteCLI.csproj.in
----------------------------------------------------------------------
diff --git a/src/plugins/SQLiteCLI/SQLiteCLI.csproj.in b/src/plugins/SQLiteCLI/SQLiteCLI.csproj.in
index 04b53f2..8fefebf 100644
--- a/src/plugins/SQLiteCLI/SQLiteCLI.csproj.in
+++ b/src/plugins/SQLiteCLI/SQLiteCLI.csproj.in
@@ -112,10 +112,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="$(CMAKE_SOURCE_DIR)\com\gemstone\gemfire\plugins\sqlite\AssemblyInfo.cs">
+    <Compile Include="$(CMAKE_SOURCE_DIR)\plugins\SQLiteCLI\AssemblyInfo.cs">
       <Link>AssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="$(CMAKE_SOURCE_DIR)\com\gemstone\gemfire\plugins\sqlite\SqLiteImpl.cs">
+    <Compile Include="$(CMAKE_SOURCE_DIR)\plugins\SQLiteCLI\SqLiteImpl.cs">
       <Link>SqLiteImpl.cs</Link>
     </Compile>
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/938aa471/src/plugins/SQLiteCLI/SqLiteImpl.cs
----------------------------------------------------------------------
diff --git a/src/plugins/SQLiteCLI/SqLiteImpl.cs b/src/plugins/SQLiteCLI/SqLiteImpl.cs
new file mode 100644
index 0000000..1b9d9d7
--- /dev/null
+++ b/src/plugins/SQLiteCLI/SqLiteImpl.cs
@@ -0,0 +1,274 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Data;
+using System.Data.SQLite;
+using Apache.Geode.Client;
+using System.IO;
+using System.Runtime.Serialization.Formatters.Binary;
+namespace Apache.Geode.Plugins.SQLite
+{
+
+  public class SqLiteImpl<TKey, TValue> : IPersistenceManager<TKey, TValue>
+  {
+
+    #region Factory Method
+    public static SqLiteImpl<TKey, TValue> Create()
+    {
+      return new SqLiteImpl<TKey, TValue>();
+    }
+
+    #endregion //Factory Method
+
+    #region IPersistenceManager<TKey,TValue> Members
+
+
+    public void Init(IRegion<TKey, TValue> region, Properties<string, string> diskProperties)
+    {
+      try
+      {
+        string pageSize, maxPageCount, persistenceDir;
+        m_tableName = region.Name;
+
+        if (diskProperties == null)
+        {
+          persistenceDir = DefaultPersistenceDir;
+          pageSize = DefaultPageSize;
+          maxPageCount = DefaultMaxPageCount;
+        }
+        else
+        {
+          persistenceDir = string.IsNullOrEmpty(diskProperties.Find(PersistenceDir)) ? DefaultPersistenceDir : diskProperties.Find(PersistenceDir);
+          pageSize = string.IsNullOrEmpty(diskProperties.Find(PageSize)) ? DefaultPageSize : diskProperties.Find(PageSize);
+          maxPageCount = string.IsNullOrEmpty(diskProperties.Find(MaxPageCount)) ? DefaultMaxPageCount : diskProperties.Find(MaxPageCount);
+        }
+        Log.Debug("InitalizeSqLite called with MaxPageCount:{0} PageSize:{1} PersistenceDir:{2}", maxPageCount, pageSize, persistenceDir);
+
+        // create region db file
+        m_persistenceDir = Path.Combine(Directory.GetCurrentDirectory(), persistenceDir);
+        m_regionDir = Path.Combine(m_persistenceDir, m_tableName);
+        Directory.CreateDirectory(m_regionDir);
+
+        //create sqlite connection string
+        m_connectionString = string.Format("Data Source={0};Version=3;Page Size={1};Max Page Count={2};",
+          Path.Combine(m_regionDir, m_tableName + ".db"), pageSize, maxPageCount);
+        Log.Debug("Created connection string : {0}", m_connectionString);
+        SqliteHelper.InitalizeSqLite(m_tableName, m_connectionString);
+      }
+      catch (Exception ex)
+      {
+        Log.Error("Exception in SqLiteImpl.Init: {0}", ex);
+        throw;
+      }
+
+    }
+
+    public TValue Read(TKey key)
+    {
+      try
+      {
+        return (TValue)SqliteHelper.GetValue(key, m_tableName, m_connectionString);
+      }
+      catch (Exception ex)
+      {
+        Log.Error("Exceptn in SqLiteImpl.Init: {0}", ex);
+        throw;
+      }
+    }
+
+    public void Write(TKey key, TValue value)
+    {
+      try
+      {
+        SqliteHelper.InsertKeyValue(key, value, m_tableName, m_connectionString);
+      }
+      catch (Exception ex)
+      {
+        Log.Error("Exceptn in SqLiteImpl.Init: {0}", ex);
+        throw;
+      }
+    }
+
+    public bool WriteAll()
+    {
+      throw new NotImplementedException();
+    }
+
+    public bool ReadAll()
+    {
+      throw new NotImplementedException();
+    }
+
+    public void Destroy(TKey key)
+    {
+      try
+      {
+        SqliteHelper.RemoveKey(key, m_tableName, m_connectionString);
+      }
+      catch (Exception ex)
+      {
+        Log.Error("Exceptn in SqLiteImpl.Init: {0}", ex);
+        throw;
+      }
+    }
+
+    public void Close()
+    {
+      try
+      {
+        SqliteHelper.CloseSqlite();
+        Directory.Delete(m_regionDir, true);
+        Directory.Delete(m_persistenceDir);
+      }
+      catch (Exception ex)
+      {
+        Log.Error("Exceptn in SqLiteImpl.Init: {0}", ex);
+      }
+    }
+
+    #endregion //IPersistenceManager<TKey,TValue> Members
+
+    #region Data Members
+    private string m_connectionString;
+    private string m_tableName;
+    private string m_persistenceDir;
+    private string m_regionDir;
+    #endregion
+
+    #region Constants
+    public static readonly string PersistenceDir = "PersistenceDirectory";
+    public static readonly string MaxPageCount = "max_page_count";
+    public static readonly string PageSize = "page_size";
+    public static readonly string DefaultPersistenceDir = "GeodeRegionData";
+    public static readonly string DefaultMaxPageCount = "2147483646";
+    public static readonly string DefaultPageSize = "65536";
+    #endregion
+
+  }
+
+  internal static class SqliteHelper
+  {
+    public static byte[] GetBytes(object obj)
+    {
+      BinaryFormatter bf = new BinaryFormatter();
+      MemoryStream ms = new MemoryStream();
+      bf.Serialize(ms, obj);
+      return ms.ToArray();
+    }
+
+    public static object GetObject(byte[] bytes)
+    {
+      BinaryFormatter bf = new BinaryFormatter();
+      MemoryStream ms = new MemoryStream(bytes);
+      return bf.Deserialize(ms);
+    }
+
+    public static void InitalizeSqLite(string tableName, string connectionString)
+    {
+
+      //construct create table query for this region
+      string query = string.Format("CREATE TABLE IF NOT EXISTS {0}(key BLOB PRIMARY KEY,value BLOB);", tableName);
+
+      using (SQLiteConnection conn = new SQLiteConnection(connectionString))
+      {
+        conn.Open();
+        using (SQLiteCommand command = new SQLiteCommand(query, conn))
+        {
+          Log.Debug("Executing query:{0} ", command.CommandText);
+          command.ExecuteNonQuery();
+        }
+      }
+      Log.Debug("Initialization Completed");
+    }
+
+    public static void ExecutePragma(string pragmaName, string pragmaValue, string connectionString)
+    {
+      string pragmaQuery = string.Format("PRAGMA {0} = {1};", pragmaName, pragmaValue);
+      using (SQLiteConnection conn = new SQLiteConnection(connectionString))
+      {
+        conn.Open();
+        using (SQLiteCommand command = new SQLiteCommand(pragmaQuery, conn))
+        {
+          Log.Debug("Executing query:{0} ", command.CommandText);
+          command.ExecuteNonQuery();
+        }
+      }
+    }
+
+    public static void InsertKeyValue(object key, object value, string tableName, string connectionString)
+    {
+      //construct query
+      string query = string.Format("REPLACE INTO {0} VALUES(@key,@value);", tableName);
+      using (SQLiteConnection conn = new SQLiteConnection(connectionString))
+      {
+        conn.Open();
+        using (SQLiteCommand command = new SQLiteCommand(query, conn))
+        {
+          command.Parameters.Add(new SQLiteParameter("@key", key));
+          command.Parameters.Add(new SQLiteParameter("@value", GetBytes(value)));
+          Log.Debug("Executing query:{0} ", command.CommandText);
+          command.ExecuteNonQuery();
+        }
+      }
+    }
+
+    public static object GetValue(object key, string tableName, string connectionString)
+    {
+      //construct query
+      string query = string.Format("SELECT value FROM {0} WHERE key=@key;", tableName);
+      object retValue;
+      using (SQLiteConnection conn = new SQLiteConnection(connectionString))
+      {
+        conn.Open();
+        using (SQLiteCommand command = new SQLiteCommand(query, conn))
+        {
+          // create parameters and execute
+          command.Parameters.Add(new SQLiteParameter("@key", key));
+          Log.Debug("Executing query:{0} ", command.CommandText);
+          retValue = SqliteHelper.GetObject((byte[])command.ExecuteScalar());
+        }
+      }
+      return retValue;
+    }
+
+    public static void RemoveKey(object key, string tableName, string connectionString)
+    {
+      //construct query
+      string query = string.Format("DELETE FROM {0} WHERE key=@key;", tableName);
+      using (SQLiteConnection conn = new SQLiteConnection(connectionString))
+      {
+        conn.Open();
+        using (SQLiteCommand command = new SQLiteCommand(query, conn))
+        {
+          // create parameters and execute
+          command.Parameters.Add(new SQLiteParameter("@key", key));
+          Log.Debug("Executing query:{0} ", command.CommandText);
+          command.ExecuteNonQuery();
+        }
+      }
+    }
+
+    public static void CloseSqlite()
+    {
+      // remove the region db files
+      //Directory.Delete(m_persistenceDir, true);
+    }
+
+
+  }
+}

http://git-wip-us.apache.org/repos/asf/geode-native/blob/938aa471/src/quickstart/csharp/vsprojects/BasicOperations/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/BasicOperations/Properties/AssemblyInfo.cs b/src/quickstart/csharp/vsprojects/BasicOperations/Properties/AssemblyInfo.cs
index 1972845..e8fedb8 100644
--- a/src/quickstart/csharp/vsprojects/BasicOperations/Properties/AssemblyInfo.cs
+++ b/src/quickstart/csharp/vsprojects/BasicOperations/Properties/AssemblyInfo.cs
@@ -24,9 +24,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("BasicOperations")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("BasicOperations")]
-[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyCopyright("Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/938aa471/src/quickstart/csharp/vsprojects/CqQuery/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/CqQuery/Properties/AssemblyInfo.cs b/src/quickstart/csharp/vsprojects/CqQuery/Properties/AssemblyInfo.cs
index 224c8c5..613396e 100644
--- a/src/quickstart/csharp/vsprojects/CqQuery/Properties/AssemblyInfo.cs
+++ b/src/quickstart/csharp/vsprojects/CqQuery/Properties/AssemblyInfo.cs
@@ -24,9 +24,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("CqQuery")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("CqQuery")]
-[assembly: AssemblyCopyright("Copyright ©  2008")]
+[assembly: AssemblyCopyright("Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/938aa471/src/quickstart/csharp/vsprojects/DataExpiration/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/DataExpiration/Properties/AssemblyInfo.cs b/src/quickstart/csharp/vsprojects/DataExpiration/Properties/AssemblyInfo.cs
index 2f455c1..83bc5dc 100644
--- a/src/quickstart/csharp/vsprojects/DataExpiration/Properties/AssemblyInfo.cs
+++ b/src/quickstart/csharp/vsprojects/DataExpiration/Properties/AssemblyInfo.cs
@@ -24,9 +24,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("DataExpiration")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("DataExpiration")]
-[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyCopyright("Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/938aa471/src/quickstart/csharp/vsprojects/Delta/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/Delta/Properties/AssemblyInfo.cs b/src/quickstart/csharp/vsprojects/Delta/Properties/AssemblyInfo.cs
index 52c5d40..2ade01c 100644
--- a/src/quickstart/csharp/vsprojects/Delta/Properties/AssemblyInfo.cs
+++ b/src/quickstart/csharp/vsprojects/Delta/Properties/AssemblyInfo.cs
@@ -24,9 +24,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("Delta")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Delta")]
-[assembly: AssemblyCopyright("Copyright ©  2009")]
+[assembly: AssemblyCopyright("Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/938aa471/src/quickstart/csharp/vsprojects/DistributedSystem/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/DistributedSystem/Properties/AssemblyInfo.cs b/src/quickstart/csharp/vsprojects/DistributedSystem/Properties/AssemblyInfo.cs
index 019c1c7..216f5c1 100755
--- a/src/quickstart/csharp/vsprojects/DistributedSystem/Properties/AssemblyInfo.cs
+++ b/src/quickstart/csharp/vsprojects/DistributedSystem/Properties/AssemblyInfo.cs
@@ -24,9 +24,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("DistributedSystem")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("DistributedSystem")]
-[assembly: AssemblyCopyright("Copyright ©  2009")]
+[assembly: AssemblyCopyright("Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/938aa471/src/quickstart/csharp/vsprojects/DurableClient/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/DurableClient/Properties/AssemblyInfo.cs b/src/quickstart/csharp/vsprojects/DurableClient/Properties/AssemblyInfo.cs
index a4b0993..5553bb0 100644
--- a/src/quickstart/csharp/vsprojects/DurableClient/Properties/AssemblyInfo.cs
+++ b/src/quickstart/csharp/vsprojects/DurableClient/Properties/AssemblyInfo.cs
@@ -24,9 +24,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("DurableClient")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("DurableClient")]
-[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyCopyright("Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/938aa471/src/quickstart/csharp/vsprojects/Exceptions/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/Exceptions/Properties/AssemblyInfo.cs b/src/quickstart/csharp/vsprojects/Exceptions/Properties/AssemblyInfo.cs
index af6a6a8..97ad093 100644
--- a/src/quickstart/csharp/vsprojects/Exceptions/Properties/AssemblyInfo.cs
+++ b/src/quickstart/csharp/vsprojects/Exceptions/Properties/AssemblyInfo.cs
@@ -24,9 +24,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("Exceptions")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Gemstone Systems Pvt. Ltd")]
 [assembly: AssemblyProduct("Exceptions")]
-[assembly: AssemblyCopyright("Copyright © Gemstone Systems Pvt. Ltd 2007")]
+[assembly: AssemblyCopyright("Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/938aa471/src/quickstart/csharp/vsprojects/ExecuteFunctions/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/ExecuteFunctions/Properties/AssemblyInfo.cs b/src/quickstart/csharp/vsprojects/ExecuteFunctions/Properties/AssemblyInfo.cs
index 0e1de26..3590e53 100644
--- a/src/quickstart/csharp/vsprojects/ExecuteFunctions/Properties/AssemblyInfo.cs
+++ b/src/quickstart/csharp/vsprojects/ExecuteFunctions/Properties/AssemblyInfo.cs
@@ -24,9 +24,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("ExecuteFunctions")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("ExecuteFunctions")]
-[assembly: AssemblyCopyright("Copyright ©  2008")]
+[assembly: AssemblyCopyright("Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 


Mime
View raw message