additional merge fixes

Author: lsho

tests/Coherence.Core.Tests/Resources/s4hc-cache-config.xml

@@ -112,6 +112,21 @@
       </initiator-config>
     </remote-cache-scheme>
 
+    <remote-cache-scheme>
+      <scheme-name>extend-direct-with-cluster-name</scheme-name>
+      <service-name>ExtendTcpCacheServiceCN</service-name>
+      <cluster-name>DotNetTest</cluster-name>
+      <proxy-service-name>ExtendTcpProxyServiceEphermeral</proxy-service-name>
+      <initiator-config>
+        <tcp-initiator>
+          <name-service-addresses>
+            <address-provider>ap2</address-provider>
+          </name-service-addresses>
+        </tcp-initiator>
+        <connect-timeout>5s</connect-timeout>
+      </initiator-config>
+    </remote-cache-scheme>
+
     <remote-cache-scheme>
       <scheme-name>extend-direct-with-cluster-name</scheme-name>
       <service-name>ExtendTcpCacheServiceUnknownCN</service-name>

tests/Coherence.Core.Tests/Resources/s4hc-test-config.xml

@@ -72,7 +72,7 @@
       <type-id>1204</type-id>
       <class-name>Tangosol.ProcessorPrintUUIDTimestamp, Coherence.Core.Tests</class-name>
     </user-type>
-    
+
     <user-type>
       <type-id>1210</type-id>
       <class-name>Tangosol.TestEntryProcessor, Coherence.Core.Tests</class-name>

tests/Coherence.Pof.Tests/readme.txt

@@ -26,8 +26,8 @@ To add new data files (or change the data):
 1) p4 edit and update PofStreamTests.{cs | java}
 
 2) on dotnet:
-    - add a new data file to tests/Coherence.Tests/Coherence.Tests.2008.csproj
-    - run PofStreamTests.cs to tests/Coherence.Tests/Coherence.Tests.2008.csproj
+    - add a new data file to tests/Coherence.Core.Tests/Coherence.Core.Tests.2008.csproj
+    - run PofStreamTests.cs to tests/Coherence.Core.Tests/Coherence.Core.Tests.2008.csproj
 
 3) on Java:
     - run PofStreamTests.java standalone
@@ -38,7 +38,7 @@ To add new data files (or change the data):
 
 6) copy the dotnet generated data file to main/tests/Data/dotnet
 
-7) copy the Java generated data file to main.net/tests/Coherence.Tests/Data/Java
+7) copy the Java generated data file to main.net/tests/Coherence.Core.Tests/Data/Java
 
 8) run the unit tests again to verify PofStreamTests can read the newly
 generated data.

tests/test-server/README.md

@@ -5,18 +5,18 @@
 # http://oss.oracle.com/licenses/upl.
 #
 
-The `keystore.jks` was created from `tests\Coherence.Tests\Net\Ssl\server.cer` with the following command:
+The `keystore.jks` was created from `tests\Coherence.Core.Tests\Net\Ssl\server.cer` with the following command:
 
 ```shell script
-%JAVA_HOME%\bin\keytool -importcert -alias server -file tests\Coherence.Tests\Net\Ssl\server.cer -keypass password -keystore tests\Coherence.Tests\Config\keystore.jks -storepass password
+%JAVA_HOME%\bin\keytool -importcert -alias server -file tests\Coherence.Core.Tests\Net\Ssl\server.cer -keypass password -keystore tests\Coherence.Core.Tests\Config\keystore.jks -storepass password
 ```
 
 Note: when it asks if you trust this cert, say yes.
 
-The `trust.jks` was created from `tests\Coherence.Tests\Net\Ssl\CA.cer` with the following command:
+The `trust.jks` was created from `tests\Coherence.Core.Tests\Net\Ssl\CA.cer` with the following command:
 
 ```shell script
-%JAVA_HOME%\bin\keytool -importcert -trustcacerts -alias serverCA -file tests\Coherence.Tests\Net\Ssl\CA.cer -keypass password -keystore tests\Coherence.Tests\Config\trust.jks -storepass password
+%JAVA_HOME%\bin\keytool -importcert -trustcacerts -alias serverCA -file tests\Coherence.Core.Tests\Net\Ssl\CA.cer -keypass password -keystore tests\Coherence.Core.Tests\Config\trust.jks -storepass password
 ```
 
 Note: when it asks if you trust this cert, say yes.