Skip to content

Commit 525bc63

Browse files
SmithaSubbaraoSmithaSubbarao
authored
Merge pull request #32740 from SmithaSubbarao/spring-4-concurrency-mbean-tests
DNM: Add Spring-4.0 Concurrency and MBean app support
2 parents a0429fb + b76f24a commit 525bc63

File tree

45 files changed

+1318
-12
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1318
-12
lines changed

‎dev/io.openliberty.springboot.fat30.mbean.app/src/main/java/io/openliberty/springboot/support/version30/test/mbean/app/MBeanConfiguration.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/*******************************************************************************
2+
* Copyright (c) 2025 IBM Corporation and others.
3+
* All rights reserved. This program and the accompanying materials
4+
* are made available under the terms of the Eclipse Public License 2.0
5+
* which accompanies this distribution, and is available at
6+
* http://www.eclipse.org/legal/epl-2.0/
7+
*
8+
* SPDX-License-Identifier: EPL-2.0
9+
*
10+
* Contributors:
11+
* IBM Corporation - initial API and implementation
12+
*******************************************************************************/
113
package io.openliberty.springboot.support.version30.test.mbean.app;
214

315
import java.lang.management.ManagementFactory;

‎dev/io.openliberty.springboot.fat30_fat/fat/src/com/ibm/ws/springboot/support/fat/FATSuite.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@
7676
ValidationTests30War.class,
7777
AopWebAppTests30.class,
7878
AopSpringBootAppTests30.class,
79-
MBeanAppTests20.class,
80-
MBeanAppTests20War.class,
79+
MBeanAppTests30.class,
80+
MBeanAppTests30War.class,
8181
HTTPMetricsNoContextRootTest.class,
8282
HTTPMetricsWithContextRootTest.class
8383
})

‎dev/io.openliberty.springboot.fat30_fat/fat/src/com/ibm/ws/springboot/support/fat/MBeanAppAbstractTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void checkMBeanServerConnection(MBeanServerConnection mbsc) throws Except
6969
assertTrue("Expected that server ID starts with bean",
7070
serverDelegate.getMBeanServerId().startsWith("WebSphere"));
7171

72-
Object[] params_set1 = { "Hello", "MBeanAppTests20" };
72+
Object[] params_set1 = { "Hello", "MBeanAppTests30" };
7373
String[] signature_set1 = { "java.lang.String", "java.lang.String" };
7474

7575
System.out.println("Default domain of MBeanServerConnection is: " + mbsc.getDefaultDomain());
@@ -82,7 +82,7 @@ public void checkMBeanServerConnection(MBeanServerConnection mbsc) throws Except
8282
System.out.println("This is the result of the JMX invoked MBean operation for Get Message: " + result1.toString());
8383
assertEquals("Hello", result1);
8484

85-
Object[] params_set2 = { "MBeanAppTests20" };
85+
Object[] params_set2 = { "MBeanAppTests30" };
8686
String[] signature_set2 = { "java.lang.String" };
8787

8888
mbsc.invoke(on1, "incrementCounter", params_set2, signature_set2);

‎dev/io.openliberty.springboot.fat30_fat/fat/src/com/ibm/ws/springboot/support/fat/MBeanAppTests20.java‎ renamed to ‎dev/io.openliberty.springboot.fat30_fat/fat/src/com/ibm/ws/springboot/support/fat/MBeanAppTests30.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import componenttest.custom.junit.runner.FATRunner;
2020

2121
@RunWith(FATRunner.class)
22-
public class MBeanAppTests20 extends MBeanAppAbstractTests {
22+
public class MBeanAppTests30 extends MBeanAppAbstractTests {
2323

2424
@Override
2525
public Set<String> getFeatures() {

‎dev/io.openliberty.springboot.fat30_fat/fat/src/com/ibm/ws/springboot/support/fat/MBeanAppTests20War.java‎ renamed to ‎dev/io.openliberty.springboot.fat30_fat/fat/src/com/ibm/ws/springboot/support/fat/MBeanAppTests30War.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import componenttest.custom.junit.runner.FATRunner;
2020

2121
@RunWith(FATRunner.class)
22-
public class MBeanAppTests20War extends MBeanAppAbstractTests {
22+
public class MBeanAppTests30War extends MBeanAppAbstractTests {
2323

2424
@Override
2525
public Set<String> getFeatures() {

‎dev/io.openliberty.springboot.fat40.concurrency.app/.classpath‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" path="src/main/java"/>
4+
<classpathentry kind="src" path="src/main/resources"/>
5+
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
6+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
7+
<classpathentry kind="output" path="bin"/>
8+
</classpath>

‎dev/io.openliberty.springboot.fat40.concurrency.app/.gitattributes‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/gradlew text eol=lf
2+
*.bat text eol=crlf
3+
*.jar binary

‎dev/io.openliberty.springboot.fat40.concurrency.app/.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/bin/
2+
/bin_test/
3+
/generated/
4+

‎dev/io.openliberty.springboot.fat40.concurrency.app/.project‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>io.openliberty.springboot.fat40.concurrency.app</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>bndtools.core.bndbuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>bndtools.core.bndnature</nature>
22+
</natures>
23+
</projectDescription>

‎dev/io.openliberty.springboot.fat40.concurrency.app/.settings/bndtools.core.prefs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
compileErrorAction=build
2+
eclipse.preferences.version=1

0 commit comments

Comments
 (0)