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

Add glassfish configuration to pass integration tests #1628

Merged
merged 1 commit into from
Nov 5, 2024
Merged

Add glassfish configuration to pass integration tests #1628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions glassfish-runner/integration-platform-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,6 @@
<additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/javadb/lib/derby.jar</additionalClasspathElement>
<additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/security.jar</additionalClasspathElement>
<additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/security-ee.jar</additionalClasspathElement>
<!-- <additionalClasspathElement>${project.directory}/glassfishporting.jar</additionalClasspathElement> -->
</additionalClasspathElements>
<includes>
<include>com/sun/ts/tests/integration/**/*Test*.java</include>
Expand All @@ -549,6 +548,9 @@
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
<glassfish.home>${project.build.directory}/${glassfish.toplevel.dir}</glassfish.home>
<glassfish.postBootCommands>set server-config.network-config.protocols.protocol.http-listener-1.http.trace-enabled=true
set server-config.network-config.network-listeners.network-listener.http-listener-2.enabled=true
set server-config.network-config.network-listeners.network-listener.http-listener-2.port=1044
set server-config.network-config.network-listeners.network-listener.http-listener-1.port=8080
create-file-user --groups guest --passwordfile ${project.basedir}/javajoe.pass javajoe
create-file-user --groups staff:mgr --passwordfile ${project.basedir}/j2ee.pass j2ee
create-jdbc-connection-pool --restype javax.sql.DataSource --datasourceclassname org.apache.derby.jdbc.ClientDataSource --property DatabaseName=derbyDB:serverName=localhost:portNumber=1527:user=cts1:password=cts1:connectionAttributes="create=true" --steadypoolsize 32 --maxpoolsize 64 cts-derby-pool
Expand All @@ -574,7 +576,7 @@

<profiles>
<profile>
<id>full</id>
<id>platform</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
Expand Down
2 changes: 1 addition & 1 deletion integration/src/main/java/com/sun/ts/tests/integration/sec/secbasicssl/ClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive
// The component jars built by the package target
integration_sec_secbasicssl_ear.addAsModule(integration_sec_secbasicssl_web);
URL earResURL = Client.class.getResource("integration_sec_secbasicssl.ear.sun-application.xml");
integration_sec_secbasicssl_web.addAsWebInfResource(earResURL, "sun-application.xml");
integration_sec_secbasicssl_ear.addAsManifestResource(earResURL, "sun-application.xml");



Expand Down