Skip to content

Commit 32f3a74

Browse files
committed
fix WDT config and do some cleanup based on Ryan comments
1 parent 0eee84e commit 32f3a74

File tree

4 files changed

+37
-6
lines changed

4 files changed

+37
-6
lines changed

integration-tests/src/test/java/oracle/kubernetes/operator/ItCoherenceTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.junit.runners.MethodSorters;
1919

2020
/**
21-
* This class contains Coherence relates integraiton tests.
21+
* This class contains Coherence related integration tests.
2222
*/
2323
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
2424
public class ItCoherenceTests extends BaseTest {
@@ -165,7 +165,7 @@ private Domain createDomain() throws Exception {
165165
+ "/integration-tests/src/test/resources/wdt/coh-wdt-config.yaml");
166166
domain = TestUtils.createDomain(domainMap);
167167
domain.verifyDomainCreated();
168-
return domain;
168+
return domain;
169169
}
170170

171171
/**

integration-tests/src/test/resources/apps/coherence-proxy-client/src/main/java/cohapp/CacheClient.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package cohapp;
1+
// Copyright 2019, Oracle Corporation and/or its affiliates. All rights reserved.
2+
// Licensed under the Universal Permissive License v 1.0 as shown at
3+
// http://oss.oracle.com/licenses/upl.
24

3-
/*
4-
* Copyright (c) 2013-2014 Oracle and/or its affiliates. All rights reserved.
5-
*/
5+
package cohapp;
66

77
import com.tangosol.net.CacheFactory;
88
import com.tangosol.net.ConfigurableCacheFactory;

integration-tests/src/test/resources/apps/coherence-proxy-client/src/main/java/cohapp/Main.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// Copyright 2019, Oracle Corporation and/or its affiliates. All rights reserved.
2+
// Licensed under the Universal Permissive License v 1.0 as shown at
3+
// http://oss.oracle.com/licenses/upl.
4+
15
package cohapp;
26

37
import static java.lang.System.exit;

integration-tests/src/test/resources/wdt/coh-wdt-config.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ topology:
99
FileName: '@@PROP:DOMAIN_NAME@@.log'
1010
Cluster:
1111
'@@PROP:CLUSTER_NAME@@':
12+
CoherenceClusterSystemResource: CoherenceCluster
1213
Server:
1314
'@@PROP:ADMIN_NAME@@':
1415
ListenPort: '@@PROP:ADMIN_PORT@@'
@@ -27,9 +28,35 @@ topology:
2728
Cluster: '@@PROP:CLUSTER_NAME@@'
2829
ListenPort: '@@PROP:MANAGED_SERVER_PORT@@'
2930

31+
ServerTemplate:
32+
'cluster-1-template':
33+
ListenPort: 8001
34+
Cluster: 'cluster-1'
35+
JTAMigratableTarget:
36+
Cluster: 'cluster-1'
37+
Log:
38+
FileCount: 100
39+
LogFileSeverity: Trace
40+
DateFormatPattern: 'MMM d, yyyy h:mm:ss,SSS a z'
41+
RotateLogOnStartup: false
42+
DomainLogBroadcastSeverity: Notice
43+
RotationType: bySize
44+
StdoutSeverity: Notice
45+
PlatformLoggerLevels:
46+
com.oracle.coherence: FINEST
47+
FileMinSize: 5000
48+
LoggerSeverity: Info
49+
DomainLogBroadcasterBufferSize: 10
50+
StdoutFormat: standard
51+
FileName: 'logs/cluster-1-template.log'
52+
SSL:
53+
ListenPort: 8100
54+
ServerStart:
55+
Arguments: '-Dtangosol.coherence.log.level=9'
3056
resources:
3157
CoherenceClusterSystemResource:
3258
CoherenceCluster:
59+
Target: '@@PROP:CLUSTER_NAME@@'
3360
CoherenceResource:
3461
CoherenceClusterParams:
3562
ClusteringMode: unicast

0 commit comments

Comments
 (0)