Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove JDK 22 #139

Merged
merged 2 commits into from
Oct 9, 2024
Merged

remove JDK 22 #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b0b9a7
remove JDK 22
tmiddlet2666 Oct 4, 2024
966843b
Minor updates
tmiddlet2666 Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/maven-build-snapshots.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ jobs:
- 24.09
javaVersion:
- 21
- 22

steps:
- uses: actions/checkout@v4
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/com/oracle/coherence/demo/application/StartSecondaryResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import com.oracle.bedrock.runtime.console.NullApplicationConsole;
import com.oracle.bedrock.runtime.console.SystemApplicationConsole;

import com.oracle.bedrock.runtime.java.options.JvmOptions;
import com.oracle.bedrock.runtime.java.options.SystemProperty;

import com.oracle.bedrock.runtime.options.Console;
Expand All @@ -50,6 +51,9 @@
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.UriInfo;

import java.lang.management.ManagementFactory;
import java.util.List;

import static com.oracle.bedrock.deferred.DeferredHelper.eventually;
import static com.oracle.bedrock.deferred.DeferredHelper.invoking;
import static com.oracle.bedrock.predicate.Predicates.greaterThan;
Expand Down Expand Up @@ -89,6 +93,9 @@ public Response startCluster() {
ApplicationConsole console = System.getProperty("secondary.verbose") == null
? new NullApplicationConsole() : new SystemApplicationConsole();

List<String> inputArguments = ManagementFactory.getRuntimeMXBean().getInputArguments();
List<String> newArguments = inputArguments.stream().filter(s->s.contains("-Xm")).toList();

try {
// start the new cache server
CoherenceCacheServer server =
Expand Down Expand Up @@ -120,6 +127,7 @@ public Response startCluster() {
ClusterPort.of(Launcher.SECONDARY_PORT),
ClusterName.of(secondaryName),
SystemProperty.of("with.data", "false"),
JvmOptions.include(newArguments.toArray(new String[0])),
SystemProperty.of(Launcher.PRIMARY_CLUSTER_PROPERTY,
System.getProperty(Launcher.PRIMARY_CLUSTER_PROPERTY)),
SystemProperty.of(Launcher.SECONDARY_CLUSTER_PROPERTY,
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,10 +254,10 @@ <h2 class="page-header"><img src="images/coherence.png" class="pull-left" style=
<table border="0" cellpadding="0">
<tr>
<td>
<span class="blue">Data sent to {{secondaryClusterName | clusterName}}: &nbsp;{{currentBytesSent | memory}}&nbsp;</span>
<span class="blue">Data sent to remote cluster {{secondaryClusterName | clusterName}}: &nbsp;{{currentBytesSent | memory}}&nbsp;</span>
<insight ng-click="displayInsight('dataSent')" ng-show="showInsight"/>
</td>
<td><div id="federationGraph" style="width: 120px; height: 70px;"></div></td>
<td><div id="federationGraph" style="width: 150px; height: 70px;"></div></td>
</tr>
</table>
</div>
Expand Down Expand Up @@ -291,7 +291,7 @@ <h2 class="page-header"><img src="images/coherence.png" class="pull-left" style=
<table class="table table-striped table-bordered">
<thead>
<tr>
<td>Action</td>
<td>Actions</td>
<td>Symbol</td>
<td align="right">Price</td>
<td align="right">Positions</td>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/web/javascripts/controllers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ demoApp.controller('DemoController', ['$scope', '$http', '$interval', '$location
labels: [''],
hideHover: 'true',
axes: false,
grid: false,
grid: true,
gridIntegers: true ,
hoverCallback: function (index, options, content, row) {
return row.bytes + ' bytes';
Expand Down
Loading