Merge pull request #1471 from scottmarlow/remove_jws_tests

Follow on work to remove more web services + some related security manager permission checking tests
jakartaee · Aug 20, 2024 · e3a6947 · e3a6947
2 parents 99fbe51 + 4106493
commit e3a6947
Show file tree

Hide file tree

Showing 53 changed files with 1 addition and 3,615 deletions.
diff --git a/appclient/pom.xml b/appclient/pom.xml
@@ -98,27 +98,6 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>com.sun.xml.ws</groupId>
-                <artifactId>jaxws-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>hello-service-testapp</id>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <wsdlDirectory>${project.basedir}/src/main/java/com/sun/ts/tests/appclient/deploy/metadatacomplete/testapp/</wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>HelloService.wsdl</wsdlFile>
-                            </wsdlFiles>
-                            <packageName>com.sun.ts.tests.appclient.deploy.metadatacomplete.testapp</packageName>
-                            <sourceDestDir>${project.build.directory}/generated-sources/</sourceDestDir>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

diff --git a/...t/src/main/java/com/sun/ts/tests/appclient/deploy/metadatacomplete/testapp/HelloImpl.java b/...t/src/main/java/com/sun/ts/tests/appclient/deploy/metadatacomplete/testapp/HelloImpl.java
diff --git a/...rc/main/java/com/sun/ts/tests/appclient/deploy/metadatacomplete/testapp/HelloService.wsdl b/...rc/main/java/com/sun/ts/tests/appclient/deploy/metadatacomplete/testapp/HelloService.wsdl
diff --git a/.../java/com/sun/ts/tests/appclient/deploy/metadatacomplete/testapp/HelloService_schema1.xsd b/.../java/com/sun/ts/tests/appclient/deploy/metadatacomplete/testapp/HelloService_schema1.xsd
diff --git a/...c/main/java/com/sun/ts/tests/appclient/deploy/metadatacomplete/testapp/TestAppClient.java b/...c/main/java/com/sun/ts/tests/appclient/deploy/metadatacomplete/testapp/TestAppClient.java
@@ -38,7 +38,6 @@
 import jakarta.mail.Session;
 import jakarta.persistence.EntityManagerFactory;
 import jakarta.persistence.PersistenceUnit;
-import jakarta.xml.ws.WebServiceRef;
 
 @MailSessionDefinition(name = "java:comp/myMailSession", host = "smtp.gmail.com", transportProtocol = "smtps", properties = {
     "mail.debug=true" })
@@ -63,9 +62,6 @@ public class TestAppClient extends EETest {
   @EJB
   static DataStoreRemote dataStore;
 
-  @WebServiceRef(name = "service/HelloService")
-  static HelloService service;
-
   @Resource(lookup = "java:app/jms/TestConnectionFactory")
   private static ConnectionFactory testFac;
 
@@ -229,32 +225,6 @@ public void testEJBAnnotation() throws Exception {
     }
   }
 
-  /**
-   * @testName: testWebServiceRefAnnotation
-   *
-   * @assertion_ids: JavaEE:SPEC:323
-   *
-   * @test_Strategy:
-   *
-   *                 We check that:
-   *
-   *                 - When the meta-data complete attribute is set to
-   *                 true,WebServiceRef annotation should be ignored - as it is
-   *                 one of the annotations to which metadata-complete is
-   *                 applicable.
-   *
-   */
-  public void testWebServiceRefAnnotation() throws Exception {
-    try {
-      logMsg("service" + service);
-      if (null != service) {
-        throw new Exception("WebServiceRefAnnotation test failed!");
-      }
-    } catch (Exception e) {
-      throw new Exception("WebServiceRefAnnotation test failed: " + e, e);
-    }
-  }
-
   /**
    * @testName: testDataSourceDefinitionAnnotation
    *

diff --git a/...a/com/sun/ts/tests/appclient/deploy/metadatacomplete/testapp/files/TestAppClient.java.src b/...a/com/sun/ts/tests/appclient/deploy/metadatacomplete/testapp/files/TestAppClient.java.src
@@ -30,7 +30,6 @@ import com.sun.javatest.Status;
 import jakarta.mail.Session;
 import jakarta.mail.MailSessionDefinition;
 import jakarta.ejb.EJB;
-import jakarta.xml.ws.WebServiceRef;
 import jakarta.annotation.sql.DataSourceDefinition;
 import jakarta.jms.JMSConnectionFactoryDefinition;
 import jakarta.jms.JMSDestinationDefinition;
@@ -76,8 +75,6 @@ public class TestAppClient extends EETest
   private static Session session;
   @EJB
   static DataStoreRemote dataStore;
-  @WebServiceRef(name="service/HelloService")
-  static HelloService service;
   @Resource(lookup="java:app/jms/TestConnectionFactory")
   private static ConnectionFactory testFac;
   @Resource(lookup="java:app/jms/TestQ")
@@ -268,36 +265,6 @@ public class TestAppClient extends EETest
 	}
     }
 
-	/**
-     * @testName:  testWebServiceRefAnnotation
-     *
-     * @assertion_ids: JavaEE:SPEC:323
-     *
-     * @test_Strategy: 
-     *
-     *    We check that:
-     *
-     *      - When the meta-data complete attribute is set to true,WebServiceRef annotation should be ignored
-	 *      - as it is one of the annotations to which metadat-complete is applicable. 
-     *      
-     */
-    public void testWebServiceRefAnnotation() throws Exception {
-
-        try {
-
-
-		//logMsg("datastore"+dataStore);
-        logMsg("service"+service);		
-        if(null != service){
-			throw new Exception("WebServiceRefAnnotation test failed!");
-		}
-
-	    }
-         catch (Exception e) {
-            throw new Exception("WebServiceRefAnnotation test failed: " + e, e);
-	}
-    }
-
 	/**
      * @testName:  testDataSourceDefinitionAnnotation
      *