Merge pull request #27820 from neuwerk/jaxwsExcutorFat

neuwerk · web-flow · commit 6a88341b7b4f · 2024-03-08T09:22:08.000-06:00
JAX-WS: Add ManagedExecutor fat tests
diff --git a/dev/io.openliberty.jaxws.executor_fat/.classpath b/dev/io.openliberty.jaxws.executor_fat/.classpath
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="fat/src"/>
+	<classpathentry kind="src" path="test-applications/BT11AddNumbersImplService/src"/>
+	<classpathentry kind="src" path="test-applications/cxfclient/src"/>
+	<classpathentry kind="src" path="test-applications/defaultpackage/src"/>
+	<classpathentry kind="src" path="test-applications/simpleservice/src"/>
+	<classpathentry kind="src" path="test-applications/jaxws22mtom/src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/dev/io.openliberty.jaxws.executor_fat/.gitignore b/dev/io.openliberty.jaxws.executor_fat/.gitignore
@@ -0,0 +1,4 @@
+/bootstrapping.properties
+/.DS_Store
+publish/servers/**/*.war
+publish/files/*.zip
diff --git a/dev/io.openliberty.jaxws.executor_fat/.project b/dev/io.openliberty.jaxws.executor_fat/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>io.openliberty.jaxws.executor_fat</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>bndtools.core.bndbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>bndtools.core.bndnature</nature>
+	</natures>
+</projectDescription>
diff --git a/dev/io.openliberty.jaxws.executor_fat/.settings/bndtools.core.prefs b/dev/io.openliberty.jaxws.executor_fat/.settings/bndtools.core.prefs
@@ -0,0 +1,2 @@
+compileErrorAction=build
+eclipse.preferences.version=1
diff --git a/dev/io.openliberty.jaxws.executor_fat/.settings/org.eclipse.core.resources.prefs b/dev/io.openliberty.jaxws.executor_fat/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+#Ant properties
+#Automatically generated by the ant prepare.settings.files task
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/dev/io.openliberty.jaxws.executor_fat/.settings/org.eclipse.jdt.core.prefs b/dev/io.openliberty.jaxws.executor_fat/.settings/org.eclipse.jdt.core.prefs
diff --git a/dev/io.openliberty.jaxws.executor_fat/.settings/org.eclipse.wst.common.project.facet.core.xml b/dev/io.openliberty.jaxws.executor_fat/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="java" version="1.8"/>
+</faceted-project>
diff --git a/dev/io.openliberty.jaxws.executor_fat/.settings/org.eclipse.wst.ws.service.policy.prefs b/dev/io.openliberty.jaxws.executor_fat/.settings/org.eclipse.wst.ws.service.policy.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.wst.ws.service.policy.projectEnabled=false
diff --git a/dev/io.openliberty.jaxws.executor_fat/bnd.bnd b/dev/io.openliberty.jaxws.executor_fat/bnd.bnd
@@ -0,0 +1,50 @@
+#*******************************************************************************
+# Copyright (c) 2024 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#*******************************************************************************
+-include= ~../cnf/resources/bnd/bundle.props
+bVersion=1.0
+
+src: \
+  fat/src,\
+  test-applications/simpleservice/src
+  
+  
+fat.project: true
+
+# These features get added programmatically
+tested.features: \
+  concurrent-2.0, \
+  concurrent-3.0, \
+  jsp-2.2, \
+  servlet-3.1, \
+  pages-3.0, \
+  servlet-5.0, \
+  servlet-6.0, \
+  xmlBinding-3.0, \
+  xmlbinding-4.0, \
+  xmlWS-3.0, \
+  xmlws-4.0
+  
+-buildpath: \
+  com.ibm.websphere.javaee.annotation.1.2;version=latest,\
+  com.ibm.websphere.javaee.cdi.2.0;version=latest,\
+  com.ibm.websphere.javaee.jaxrs.2.1;version=latest,\
+  com.ibm.websphere.javaee.jsonb.1.0,\
+  com.ibm.websphere.javaee.jsonp.1.1,\
+  com.ibm.websphere.javaee.servlet.3.1;version=latest,\
+  com.ibm.websphere.javaee.concurrent.1.0;version=latest  
+  com.ibm.websphere.javaee.annotation.1.2,\
+  com.ibm.websphere.javaee.jaxb.2.2;version=latest,\
+  com.ibm.websphere.javaee.jaxws.2.2,\
+  com.ibm.websphere.javaee.jws.1.0;version=latest,\
+  com.ibm.websphere.javaee.wsdl4j.1.2;version=latest,\
+  fattest.simplicity,\
+  com.ibm.ws.jaxb.tools;version=latest,\
+  io.openliberty.org.apache.commons.logging;version=latest,\
+  com.ibm.ws.org.slf4j.jdk14;version=latest
diff --git a/dev/io.openliberty.jaxws.executor_fat/build.gradle b/dev/io.openliberty.jaxws.executor_fat/build.gradle
@@ -0,0 +1,10 @@
+/*******************************************************************************
+ * Copyright (c) 2024 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+addRequiredLibraries.dependsOn addJakartaTransformer
diff --git a/dev/io.openliberty.jaxws.executor_fat/fat/src/io/openliberty/jaxws/executor/FATSuite.java b/dev/io.openliberty.jaxws.executor_fat/fat/src/io/openliberty/jaxws/executor/FATSuite.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2024 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package io.openliberty.jaxws.executor;
+
+import org.junit.ClassRule;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+import componenttest.rules.repeater.JakartaEE10Action;
+import componenttest.rules.repeater.JakartaEE9Action;
+import componenttest.rules.repeater.EmptyAction;
+import componenttest.rules.repeater.RepeatTests;
+
+@RunWith(Suite.class)
+@SuiteClasses({
+                JAXWSExecutorTest.class
+})
+public class FATSuite {
+    @ClassRule
+    public static RepeatTests r = 
+        RepeatTests.with(new EmptyAction().fullFATOnly())
+                   .andWith(new JakartaEE9Action()).andWith(new JakartaEE10Action());
+}
diff --git a/dev/io.openliberty.jaxws.executor_fat/fat/src/io/openliberty/jaxws/executor/JAXWSExecutorTest.java b/dev/io.openliberty.jaxws.executor_fat/fat/src/io/openliberty/jaxws/executor/JAXWSExecutorTest.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2024 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package io.openliberty.jaxws.executor;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+
+import com.ibm.websphere.simplicity.ShrinkHelper;
+
+import componenttest.annotation.Server;
+import componenttest.annotation.TestServlet;
+import componenttest.custom.junit.runner.FATRunner;
+import componenttest.topology.impl.LibertyServer;
+import componenttest.topology.utils.FATServletClient;
+import io.openliberty.jaxws.fat.JAXWSExecutorTestServlet;
+
+@RunWith(FATRunner.class)
+public class JAXWSExecutorTest extends FATServletClient {
+    private static final String SERVLET_PATH = "simpleservice/JAXWSExecutorTestServlet";
+
+    @Server("jaxwsExecutorTest")
+    @TestServlet(servlet = JAXWSExecutorTestServlet.class, path = SERVLET_PATH)
+    public static LibertyServer server;
+
+    private static final String appName = "simpleservice";
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        WebArchive app = ShrinkWrap.create(WebArchive.class, appName + ".war")
+                        .addPackage("io.openliberty.jaxws.fat");
+        ShrinkHelper.exportDropinAppToServer(server, app);
+
+        server.addInstalledAppForValidation(appName);
+        server.startServer();
+    }
+
+    @AfterClass
+    public static void tearDown() throws Exception {
+        server.stopServer();
+    }
+}
diff --git a/dev/io.openliberty.jaxws.executor_fat/publish/servers/jaxwsExecutorTest/bootstrap.properties b/dev/io.openliberty.jaxws.executor_fat/publish/servers/jaxwsExecutorTest/bootstrap.properties
@@ -0,0 +1,6 @@
+bootstrap.include=../testports.properties
+#com.ibm.ws.logging.trace.specification=*=info=enabled:logservice=all=enabled:WSSECURITY=all=enabled:org.apache.cxf.phase.*=all=enabled:com.ibm.ws.jaxws.*=all=enabled:com.ibm.ws.ssl.*=all=enabled
+#com.ibm.ws.logging.trace.specification=*=info=enabled:logservice=all=enabled:org.apache.cxf.*=all=enabled:com.ibm.ws.wssecurity.*=all=enabled
+#com.ibm.ws.logging.trace.specification=*=info=enabled:logservice=all=enabled:WSSECURITY=all=enabled:WSS4J=all=enabled:org.apache.cxf.ws.security.message.*=all=enabled:org.apache.cxf.*=all=enabled:com.ibm.ws.jaxws.*=all=enabled
+#com.ibm.ws.logging.trace.specification=*=info=enabled:logservice=all=enabled:WSSECURITY=all=enabled:WSS4J=all=enabled:org.apache.cxf.ws.security.message.*=all=enabled:org.apache.cxf.phase.*=all=enabled:com.ibm.ws.wssecurity.*=all=enabled
+com.ibm.ws.logging.trace.specification=org.apache.cxf.*=all=enabled:com.ibm.ws.jaxws.*=all=enabled
diff --git a/dev/io.openliberty.jaxws.executor_fat/publish/servers/jaxwsExecutorTest/server.xml b/dev/io.openliberty.jaxws.executor_fat/publish/servers/jaxwsExecutorTest/server.xml
@@ -0,0 +1,37 @@
+<server>
+    <featureManager>
+      <feature>componenttest-1.0</feature>
+      <feature>concurrent-1.0</feature>
+      <feature>jaxws-2.2</feature>
+      <feature>jndi-1.0</feature>
+      <feature>servlet-4.0</feature>
+    </featureManager>
+
+	<include location="../fatTestPorts.xml"/>   
+
+    <managedScheduledExecutorService jndiName="concurrent/scheduledExecutor">
+      <contextService>
+        <classloaderContext/>
+        <jeeMetadataContext/>
+      </contextService>
+    </managedScheduledExecutorService>
+
+    <variable name="onError" value="FAIL"/>
+	
+	<javaPermission className="java.io.FilePermission" name="ALL FILES" actions="read"/>
+  	<javaPermission className="java.lang.reflect.ReflectPermission" name="suppressAccessChecks"/>
+	<javaPermission className="java.lang.RuntimePermission" name="accessClassInPackage.com.sun.org.apache.xerces.internal.dom" />
+  	<javaPermission className="java.lang.RuntimePermission" name="accessDeclaredMembers"/>    
+  	<javaPermission className="java.lang.RuntimePermission" name="createClassLoader"/>
+  	<javaPermission className="java.lang.RuntimePermission" name="getClassLoader"/>
+	<javaPermission className="java.lang.RuntimePermission" name="setContextClassLoader" />
+  	<javaPermission className="java.lang.RuntimePermission" name="setFactory"/>
+	<javaPermission className="java.net.NetPermission" name="setDefaultAuthenticator" />
+  	<javaPermission className="java.net.SocketPermission" name="*" actions="connect,resolve"/>
+  	<javaPermission className="java.net.URLPermission" name="http://192.168.1.6:8010/helloServer/PeopleService" actions="POST:Accept,SOAPAction,User-Agent" />
+	<javaPermission className="java.security.SecurityPermission" name="getPolicy"/>
+	<javaPermission className="java.util.PropertyPermission" name="*" actions="read"/>
+  	<javaPermission className="org.osgi.framework.ServicePermission" name="*" actions="get" />
+	<javaPermission className="org.osgi.framework.AdminPermission" name="*" actions="*" />
+  	<javaPermission className="javax.security.auth.AuthPermission" name="*" actions="getSubject" />
+</server>
diff --git a/dev/io.openliberty.jaxws.executor_fat/test-applications/simpleservice/resources/META-INF/permissions.xml b/dev/io.openliberty.jaxws.executor_fat/test-applications/simpleservice/resources/META-INF/permissions.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<permissions xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+        http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd"
+    version="7">
+    
+    <permission>
+   	   <class-name>java.util.PropertyPermission</class-name>
+   	   <name>*</name>
+   	   <actions>read</actions>
+    </permission>
+ 
+</permissions>
diff --git a/dev/io.openliberty.jaxws.executor_fat/test-applications/simpleservice/src/io/openliberty/jaxws/fat/JAXWSExecutorTestServlet.java b/dev/io.openliberty.jaxws.executor_fat/test-applications/simpleservice/src/io/openliberty/jaxws/fat/JAXWSExecutorTestServlet.java
diff --git a/dev/io.openliberty.jaxws.executor_fat/test-applications/simpleservice/src/io/openliberty/jaxws/fat/SimpleWebService.java b/dev/io.openliberty.jaxws.executor_fat/test-applications/simpleservice/src/io/openliberty/jaxws/fat/SimpleWebService.java
diff --git a/dev/io.openliberty.jaxws.executor_fat/test-applications/simpleservice/src/io/openliberty/jaxws/fat/SimpleWebServiceImpl.java b/dev/io.openliberty.jaxws.executor_fat/test-applications/simpleservice/src/io/openliberty/jaxws/fat/SimpleWebServiceImpl.java

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+compileErrorAction=build`
	`2`	`+eclipse.preferences.version=1`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+eclipse.preferences.version=1`
	`2`	`+org.eclipse.wst.ws.service.policy.projectEnabled=false`