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

Include the deployment descriptors in the output artifact. #1338

Merged
merged 21 commits into from
Jul 14, 2024
+176,731 −159,141
Merged

Include the deployment descriptors in the output artifact. #1338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
145c7c7
Include the deployment descriptors in the output artifact.
starksm64 Jun 21, 2024
3c9574b
Update the remaining artifacts to include the container descriptors
starksm64 Jun 26, 2024
8012fe2
See if this is causing the build check failure
starksm64 Jun 26, 2024
ed75e16
Update Concurrency TCK to 3.1.0
arjantijms Jun 25, 2024
ca16901
Restore Missing EJB Test Classes (#1340)
brideck Jun 26, 2024
f3ff495
Refactor JSONP platform tests in servlet vehicle (#1318)
alwin-joseph Jun 26, 2024
8fba192
JSONB Platform TCK: Refactor the tests in servlet vehicle (#1316)
alwin-joseph Jun 26, 2024
1c7c129
JSTL Test Fix(tckrefactor branch) for issues/255 in JDK21 due to spac…
alwin-joseph Jun 26, 2024
5ec3108
Update rest TCK to 4.0.0
arjantijms Jun 26, 2024
eea37ac
Remove reference to removed module
arjantijms Jun 26, 2024
f818343
JMS Standalone TCK test refactor with Junit. (#1185)
gurunrao Jun 27, 2024
8766f5e
Satisfy spotless and import boms to set versions correctly for junit etc
arjantijms Jun 27, 2024
ddfa63e
More spotless and updating client libs
arjantijms Jun 27, 2024
3554349
Update WebSocket TCK to 2.2.0
arjantijms Jun 29, 2024
0f79713
Merge in the jacc/pom.xml deletion to resolve conflicts
starksm64 Jul 14, 2024
91b9849
Fix copyrights and other clean up (#1345)
pnicolucci Jul 2, 2024
243ea8d
Generate the vehicle template code into the source tree
starksm64 Jul 11, 2024
9d436f6
Added runner for expression language TCK 6.0.0
arjantijms Jul 11, 2024
ce2667d
Use GF 8 M6
arjantijms Jul 11, 2024
c49bfbb
Fix poluted classpath and not testing what we thought we were
arjantijms Jul 12, 2024
c1dd77c
Merge in the jacc/pom.xml deletion to resolve conflicts
starksm64 Jul 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
env.label = "jakartaee-tck-pod-${UUID.randomUUID().toString()}"

default_suites=[ "samples", "signaturetest/javaee" ]
default_tcks=["caj", "connector", "el", "jacc", "jaxws", "jms", "jpa", "jsp", "jstl", "jta", "saaj", "servlet", "websocket"]
default_tcks=["caj", "connector", "el", "jaxws", "jms", "jpa", "jsp", "jstl", "jta", "saaj", "servlet", "websocket"]

def cts_suites = params.test_suites != null ? params.test_suites.split() : default_suites
def tcks = params.standalone_tcks != null ? params.standalone_tcks.split() : default_tcks
Expand Down Expand Up @@ -190,7 +190,7 @@ spec:
description: 'Run the full EE compliance testsuite or a standalone tck' )
string(name: 'test_suites', defaultValue: 'connector ejb ejb30/bb ejb30/lite/appexception ejb30/lite/async ejb30/lite/basic ejb30/lite/ejbcontext ejb30/lite/enventry ejb30/lite/interceptor ejb30/lite/lookup ejb30/lite/naming ejb30/lite/nointerface ejb30/lite/packaging ejb30/lite/singleton ejb30/lite/stateful ejb30/lite/tx ejb30/lite/view ejb30/lite/xmloverride ejb30/assembly ejb30/timer ejb30/webservice ejb30/zombie ejb30/misc ejb30/sec ejb32 el integration jacc javaee javamail jaxrs jdbc_appclient jdbc_ejb jdbc_jsp jdbc_servlet jms_appclient jms_ejb jms_jsp jms_servlet jpa_appmanaged jpa_appmanagedNoTx jpa_pmservlet jpa_puservlet jpa_stateful3 jpa_stateless3 jsonb jsonp jsp jstl jta jws samples servlet signaturetest/javaee webservices12 webservices13 websocket xa',
description: 'Space separated list of Test suites to run')
string(name: 'standalone_tcks', defaultValue: 'caj connector el jacc jaxws jms jpa jsp jstl jta saaj servlet websocket',
string(name: 'standalone_tcks', defaultValue: 'caj connector el jaxws jms jpa jsp jstl jta saaj servlet websocket',
description: 'Space separated list of standalone TCKs to build and run')
string(name: 'USER_KEYWORDS',
defaultValue: '',
Expand Down
13 changes: 13 additions & 0 deletions appclient/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,19 @@
</dependencies>

<build>
<!-- Include the container descriptors in the output artifact -->
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<excludes>
<exclude>**/build.xml</exclude>
</excludes>
</resource>
</resources>

<plugins>
<!-- do not publish this artifact to Maven repositories -->
<plugin>
Expand Down
12 changes: 12 additions & 0 deletions assembly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,18 @@
</dependency>
</dependencies>
<build>
<!-- Include the container descriptors in the output artifact -->
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<excludes>
<exclude>**/build.xml</exclude>
</excludes>
</resource>
</resources>
<plugins>
<!-- do not publish this artifact to Maven repositories -->
<plugin>
Expand Down
43 changes: 6 additions & 37 deletions bin/coverage-build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@
<property name="spec.stylesheet" value="${ts.tools.home}/docs/xsl/assertions/spec_assertions.xsl"/>
<property name="api.html.assertion.file" value="api-assertions.html"/>
<property name="spec.html.assertion.file" value="spec-assertions.html"/>
<property name="srcdirs" value="appclient,ejb,integration,jacc,jsf,jstl,assembly,
ejb30,internal,jaspic,jdbc,jsonb,jta,saaj,concurrency,ejb32,
<property name="srcdirs" value="appclient,ejb,integration,jsf,jstl,assembly,
ejb30,internal,jdbc,jsonb,jta,saaj,concurrency,ejb32,
javaee,jaxrs,jms,jsonp,jws,samples,common,connector,el,javamail,servlet,
webservices13,websocket,xa,jaxws,jpa,jsp,securityapi,webservices12"/>
webservices13,websocket,xa,jaxws,jpa,jsp,webservices12"/>

<taskdef resource="net/sf/antcontrib/antlib.xml"
classpath="${ts.home}/lib/ant-contrib-1.0b3.jar"/>
Expand Down Expand Up @@ -311,10 +311,10 @@
<!-- Removed Jakarta Deployment, jaxws, saaj and jws from the code coverage as the corresponding -->
<!-- tests are no more part of Java EE 8 CTS -->
<target name="all" depends="start.log,
jta,jdbc,ejb,connector,jaspic,
jsp,el,servlet,jms,jacc,javaee,jstl,jpa,
jta,jdbc,ejb,connector,
jsp,el,servlet,jms,javaee,jstl,jpa,
jaxrs,webservices,jsf,
concurrency,websocket,securityapi">
concurrency,websocket">
<antcall target="generate.exec.summary"/>
<antcall target="generate.index.page"/>
<antcall target="set.permissions"/>
Expand Down Expand Up @@ -349,16 +349,6 @@
<!-- Targets to create the assertion coverage numbers for each technology area -->
<!-- ############################################################################ -->

<target name="securityapi">
<antcall target="calculate.coverage">
<param name="api.coverage.dir" value="${coverage.base.dir}/securityapi_1_0/api"/>
<param name="spec.coverage.dir" value="${coverage.base.dir}/securityapi_1_0/spec"/>
<param name="api.assertions" value="${ts.docs.dir}/securityapi/SecurityAPIJavadocAssertions.xml"/>
<param name="spec.assertions" value="${ts.docs.dir}/securityapi/SecurityAPISpecAssertions.xml"/>
<param name="test.src.dir" value="/securityapi"/>
</antcall>
</target>

<target name="javaee">
<for param="srcdir" list="${srcdirs}"
trim="true" delimiter=",">
Expand Down Expand Up @@ -395,17 +385,6 @@
</antcall>
</target>

<target name="jaspic">
<antcall target="calculate.coverage">
<param name="spec.coverage.dir" value="${coverage.base.dir}/jaspic_1_1/spec"/>
<param name="spec.assertions" value="${ts.docs.dir}/jaspic/JASPICSpecAssertions.xml"/>
<param name="api.coverage.dir" value="${coverage.base.dir}/jaspic_1_1/api"/>
<param name="api.assertions" value="${ts.docs.dir}/jaspic/JASPICJavadocAssertions.xml"/>
<param name="test.src.dir" value="/jaspic"/>
<param name="filter.string" value="JASPIC"/>
</antcall>
</target>

<target name="jaxws">
<antcall target="calculate.coverage">
<param name="api.coverage.dir" value="${coverage.base.dir}/jaxws_2_2/api"/>
Expand Down Expand Up @@ -510,16 +489,6 @@
</antcall>
</target>

<target name="jacc">
<antcall target="calculate.coverage">
<param name="api.coverage.dir" value="${coverage.base.dir}/jacc_1_5/api"/>
<param name="spec.coverage.dir" value="${coverage.base.dir}/jacc_1_5/spec"/>
<param name="api.assertions" value="${ts.docs.dir}/jacc/JACCJavaDocAssertions.xml"/>
<param name="spec.assertions" value="${ts.docs.dir}/jacc/JACCSpecAssertions.xml"/>
<param name="test.src.dir" value="/jacc"/>
</antcall>
</target>

<target name="webservices">
<for param="srcdir" list="${srcdirs}"
trim="true" delimiter=",">
Expand Down
85 changes: 0 additions & 85 deletions bin/xml/impl/glassfish/common.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1315,20 +1315,6 @@
<copy file="${javaee.home}/lib/appclient/wss-client-config.xml"
tofile="${javaee.home}/lib/appclient/wss-client-config.xml.orig" overwrite="yes">
</copy>

<copy file="${ts.home}/src/com/sun/ts/tests/jaspic/ejb/xms/wss-client-config.xml"
tofile="${javaee.home}/lib/appclient/wss-client-config.xml" overwrite="yes">
</copy>

<copy file="${ts.home}/src/com/sun/ts/tests/jaspic/ejb/xms/${sun-acc.xml.template}"
tofile="${javaee.home}/lib/install/templates/${sun-acc.xml.template}" overwrite="yes">
<filterset begintoken="%%%" endtoken="%%%">
<filter token="INSTALL_ROOT" value="${javaee.home}" />
<filter token="SERVER_NAME" value="${s1as.admin.host}" />
<filter token="ORB_LISTENER_PORT" value="${orb.port.ri}" />
</filterset>
</copy>

</target>

<target name="enable.server.provider" >
Expand Down Expand Up @@ -1387,12 +1373,6 @@
<antcall target="restart.server" />
</target>

<!--
Enable the configuration required by jacc
-->
<target name="enable.jacc" depends="configPlatform" >
<antcall target="create.jacc.vm.options"/>
</target>

<!--
config the required jvm options for the JPA tests
Expand All @@ -1409,71 +1389,6 @@
</antcall>
</target>

<!--
This target was created because we have tools, namely the runcts ant task,
that would like to be able to add the JVM options for Jakarta Authorization but not call
server restart. This was due to techical glitches when restarting the server
from a spawned process in the task.
-->
<target name="create.jacc.vm.options" depends="configPlatform">
<antcall target="create-jvm-options" >
<param name="jvm.options" value=" -Djakarta.security.jacc.policy.provider=com.sun.ts.tests.jacc.provider.TSPolicy"/>
</antcall>

<antcall target="create-jvm-options" >
<param name="jvm.options" value=" -Dvendor.jakarta.security.jacc.policy.provider=com.sun.enterprise.security.jacc.provider.SimplePolicyProvider"/>
</antcall>

<antcall target="create-jvm-options" >
<param name="jvm.options" value=" -Djakarta.security.jacc.PolicyConfigurationFactory.provider=com.sun.ts.tests.jacc.provider.TSPolicyConfigurationFactoryImpl"/>
</antcall>

<antcall target="create-jvm-options" >
<param name="jvm.options" value=" -Dvendor.jakarta.security.jacc.PolicyConfigurationFactory.provider=com.sun.enterprise.security.jacc.provider.SimplePolicyConfigurationFactory "/>
</antcall>

<antcall target="create-one-jvm-option" >
<param name="jvm.options" value=" -Dlog.file.location=${log.file.location}"/>
</antcall>
</target>

<!--
Disable jacc configuration
-->
<target name="disable.jacc" depends="configPlatform" >
<antcall target="delete.jacc.vm.options"/>
<antcall target="restart.server"/>
</target>


<!--
This target was created because we have tools, namely the runcts ant task,
that would like to be able to remove the JVM options for Jakarta Authorization but not call
server restart. This was due to techical glitches when restarting the server
from a spawned process in the task.
-->
<target name="delete.jacc.vm.options" depends="configPlatform">
<antcall target="delete-jvm-options" >
<param name="jvm.options" value=" -Djakarta.security.jacc.policy.provider=com.sun.ts.tests.jacc.provider.TSPolicy"/>
</antcall>

<antcall target="delete-jvm-options" >
<param name="jvm.options" value=" -Dvendor.jakarta.security.jacc.policy.provider=com.sun.enterprise.security.jacc.provider.SimplePolicyProvider"/>
</antcall>

<antcall target="delete-jvm-options" >
<param name="jvm.options" value=" -Djakarta.security.jacc.PolicyConfigurationFactory.provider=com.sun.ts.tests.jacc.provider.TSPolicyConfigurationFactoryImpl"/>
</antcall>

<antcall target="delete-jvm-options" >
<param name="jvm.options" value=" -Dvendor.jakarta.security.jacc.PolicyConfigurationFactory.provider=com.sun.enterprise.security.jacc.provider.SimplePolicyConfigurationFactory "/>
</antcall>

<antcall target="delete-one-jvm-option" >
<param name="jvm.options" value=" -Dlog.file.location=${log.file.location}"/>
</antcall>
</target>


<!--
Get the platform version and store the return value in
Expand Down
Loading
Loading