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

Jump to bottom

Follow on work to remove more web services + some related security manager permission checking tests #1471

Merged
merged 3 commits into from
Aug 20, 2024
Merged

Follow on work to remove more web services + some related security manager permission checking tests #1471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa1d092
remove web services tests as all optional technologies are removed fr…
scottmarlow Aug 20, 2024
07e8ee4
Restore ejb30 TLogger class
scottmarlow Aug 20, 2024
4106493
remove web services tests as all optional technologies are removed fr…
scottmarlow Aug 20, 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
21 changes: 0 additions & 21 deletions appclient/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
29 changes: 0 additions & 29 deletions ...t/src/main/java/com/sun/ts/tests/appclient/deploy/metadatacomplete/testapp/HelloImpl.java
View file
Open in desktop

This file was deleted.

57 changes: 0 additions & 57 deletions ...rc/main/java/com/sun/ts/tests/appclient/deploy/metadatacomplete/testapp/HelloService.wsdl
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions .../java/com/sun/ts/tests/appclient/deploy/metadatacomplete/testapp/HelloService_schema1.xsd
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions ...c/main/java/com/sun/ts/tests/appclient/deploy/metadatacomplete/testapp/TestAppClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" })
Expand All @@ -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;

Expand Down Expand Up @@ -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
*
Expand Down
33 changes: 0 additions & 33 deletions ...a/com/sun/ts/tests/appclient/deploy/metadatacomplete/testapp/files/TestAppClient.java.src
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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
*
Expand Down
Loading