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.

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

eclipse-ee4j#212 - Remove Jakarta Management #308

Closed
Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ spec:
description: 'Database to be used for running CTS. Currently only JavaDB is supported.' )
choice(name: 'BUILD_TYPE', choices: 'CTS\nSTANDALONE-TCK',
description: 'Run the full EE compliance testsuite or a standalone tck' )
string(name: 'test_suites', defaultValue: 'compat12 compat13 concurrency 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 j2eetools jacc jaspic javaee javamail jaxr jaxrpc jaxrs jbatch 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 jsf jsonb jsonp jsp jstl jta jws rmiiiop samples securityapi servlet signaturetest/javaee webservices webservices12 webservices13 websocket xa',
string(name: 'test_suites', defaultValue: 'compat12 compat13 concurrency 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 jaspic javaee javamail jaxr jaxrpc jaxrs jbatch 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 jsf jsonb jsonp jsp jstl jta jws rmiiiop samples securityapi servlet signaturetest/javaee webservices webservices12 webservices13 websocket xa',
description: 'Space separated list of Test suites to run')
string(name: 'standalone_tcks', defaultValue: 'caj concurrency connector el jacc jaspic jaxr jaxrpc jaxrs jaxws jms jpa jsf jsp jsonb jsonp jstl jta saaj securityapi servlet websocket',
description: 'Space separated list of standalone TCKs to build and run')
Expand Down
16 changes: 3 additions & 13 deletions bin/coverage-build.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--

Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -101,7 +101,7 @@
<property name="spec.html.assertion.file" value="spec-assertions.html"/>
<property name="srcdirs" value="appclient,compat12,ejb,integration,jacc,jaxr,jsf,jstl,rmiiiop,assembly,
compat13,ejb30,internal,jaspic,jaxrpc,jdbc,jsonb,jta,saaj,concurrency,ejb32,interop,
javaee,jaxrs,jms,jsonp,jws,samples,common,connector,el,j2eetools,javamail,servlet,
javaee,jaxrs,jms,jsonp,jws,samples,common,connector,el,javamail,servlet,
webservices13,websocket,webservices,xa,jaxws,jpa,jsp,securityapi,webservices12"/>

<taskdef resource="net/sf/antcontrib/antlib.xml"
Expand Down Expand Up @@ -332,7 +332,7 @@

<!-- 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,jaxr,j2eetools-mgt,
<target name="all" depends="start.log,jaxr,
jta,jdbc,ejb,connector,jaspic,
jsp,el,servlet,jms,jacc,javaee,jstl,jpa,
jaxrpc,jaxrs,webservices,jsf,jsonp,
Expand Down Expand Up @@ -514,16 +514,6 @@
</antcall>
</target>

<target name="j2eetools-mgt">
<antcall target="calculate.coverage">
<param name="api.coverage.dir" value="${coverage.base.dir}/j2eemgmt_1_1/api"/>
<param name="spec.coverage.dir" value="${coverage.base.dir}/j2eemgmt_1_1/spec"/>
<param name="api.assertions" value="${ts.docs.dir}/j2eemgmt/J2EEMGMTJavadocAssertions.xml"/>
<param name="spec.assertions" value="${ts.docs.dir}/j2eemgmt/J2EEMGMTSpecAssertions.xml"/>
<param name="test.src.dir" value="/j2eetools/mgmt"/>
</antcall>
</target>

<target name="jta">
<antcall target="calculate.coverage">
<param name="api.coverage.dir" value="${coverage.base.dir}/jta_1_1/api"/>
Expand Down
4 changes: 2 additions & 2 deletions bin/xml/impl/glassfish/s1as.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--

Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -1228,7 +1228,7 @@
<property name="ant.opts" value=""/>
<property name="run.client.args" value=""/>
<property name="buffering.enabled" value="false"/>
<property name="test.areas" value="appclient, connector, j2eetools, jaxws, jstl,
<property name="test.areas" value="appclient, connector, jaxws, jstl,
samples, webservices12, assembly, ejb, jacc,
jdbc, jta, servlet, ejb30, javamail, jms,
jws, signaturetest, xa, compat12, integration,
Expand Down
1 change: 0 additions & 1 deletion docker/fix_classpaths.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ sed -i 's/javax.json.bind-api.jar/jakarta.json.bind-api.jar/g' ${CTS_HOME}/jakar
sed -i 's/javax.json.jar/jakarta.json.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.json-api.jar/jakarta.json.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.mail.jar/jakarta.mail.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.management.j2ee-api.jar/jakarta.management.j2ee-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.persistence.jar/jakarta.persistence.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.resource-api.jar/jakarta.resource-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.security.auth.message-api.jar/jakarta.security.auth.message-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
Expand Down
2 changes: 1 addition & 1 deletion docker/run_jakartaeetck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ sed -i "s/^wsgen.ant.classname=.*/wsgen.ant.classname=$\{ri.wsgen.ant.classname\
sed -i "s/^wsimport.ant.classname=.*/wsimport.ant.classname=$\{ri.wsimport.ant.classname\}/g" ts.jte

if [[ "$PROFILE" == "web" || "$PROFILE" == "WEB" ]]; then
sed -i "s/^javaee.level=.*/javaee.level=web connector jaxws jaxb javamail javaeemgmt jacc jaspic wsmd/g" ts.jte
sed -i "s/^javaee.level=.*/javaee.level=web connector jaxws jaxb javamail jacc jaspic wsmd/g" ts.jte
sed -i "s/^optional.tech.packages.to.ignore=.*/optional.tech.packages.to.ignore=javax.xml.rpc.handler/g" ts.jte
fi

Expand Down
3 changes: 1 addition & 2 deletions install/j2eemgmt/common/ts.jte
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2002, 2020 Oracle and/or its affiliates. All rights reserved.
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -114,4 +114,3 @@ ts_home=${TS_HOME}
#These properties are needed for signaturetest.
###############################################################
sigTestClasspath=${J2EE_HOME}$/lib$/j2ee.jar$:${JAVA_HOME}$/jre$/lib$/rt.jar
sigTestUrl=file:${TS_HOME}/src/com/sun/ts/tests/j2eetools/mgmt/sig/j2eemgmtSigFile.sig
62 changes: 0 additions & 62 deletions install/j2eemgmt/other/vehicle.properties

This file was deleted.

3 changes: 1 addition & 2 deletions install/jacc/bin/build.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -61,7 +61,6 @@
com/sun/ts/tests/signaturetests/el/**/*.java,
com/sun/ts/tests/signaturetests/jaspic/**/*.java,
com/sun/ts/tests/signaturetests/javaee/**/*.java,
com/sun/ts/tests/signaturetests/javaeemgmt/**/*.java,
com/sun/ts/tests/signaturetests/jaxm/**/*.java,
com/sun/ts/tests/signaturetests/jaxrpc/**/*.java,
com/sun/ts/tests/signaturetests/jaxr/**/*.java,
Expand Down
1 change: 0 additions & 1 deletion install/jakartaee/bin/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
com/sun/ts/tests/assembly,
com/sun/ts/tests/jta,
com/sun/ts/tests/samples,
com/sun/ts/tests/j2eetools/mgmt,
com/sun/ts/tests/jaxr,
com/sun/ts/tests/jms,
com/sun/ts/tests/jsonp,
Expand Down
2 changes: 0 additions & 2 deletions install/jakartaee/bin/sig-test-pkg-list.txt
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,6 @@ jakarta.mail.event
jakarta.mail.internet
jakarta.mail.search
jakarta.mail.util
javax.management.j2ee
javax.management.j2ee.statistics
javax.naming
jakarta.persistence
jakarta.persistence.criteria
Expand Down
2 changes: 0 additions & 2 deletions install/jakartaee/bin/sig-test-pkg-list_se9.txt
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,6 @@ jakarta.mail.event
jakarta.mail.internet
jakarta.mail.search
jakarta.mail.util
javax.management.j2ee
javax.management.j2ee.statistics
javax.naming
jakarta.persistence
jakarta.persistence.criteria
Expand Down
6 changes: 3 additions & 3 deletions install/jakartaee/bin/ts.jte
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,10 @@ javatest.timeout.factor=1
# technologies.
# Known optional technologies for Web Profile include:
# "batch", "jaxrpc", "jaxr", "connector", "jaxb",
# "jms", "javamail", "javaeemgmt", "jacc", "jaspic", "wsmd"
# "jms", "javamail", "jacc", "jaspic", "wsmd"
# ex 1/ javaee.level=web connector jms jacc jaxrpc
# ex 2/ javaee.level=web jaspic
# ex 3/ javaee.level=web jms connector javaeemgmt
# ex 3/ javaee.level=web jms connector
# ex 4/ etc...
#
# Note 1: spaces separate multiple entries
Expand Down Expand Up @@ -182,7 +182,7 @@ javatest.timeout.factor=1
# (see comments for optional.tech.packages.to.ignore below)
#
###############################################################################
#javaee.level=web connector jaxws jaxb javamail javaeemgmt jacc jaspic wsmd
#javaee.level=web connector jaxws jaxb javamail jacc jaspic wsmd
javaee.level=full jaxr jaxrpc


Expand Down
Loading