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

Remove many security api references #1347

Merged
merged 1 commit into from
Jul 1, 2024
Merged

Remove many security api references #1347

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
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
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
149 changes: 1 addition & 148 deletions bin/xml/impl/glassfish/s1as.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,6 @@
<echo message="enable.tx.interop" />
<echo message="disable.tx.interop" />
<echo message="delete.tx.interop" />
<echo message="enable.jacc" />
<echo message="disable.jacc" />
<echo message="enable.wss.providers" />
<echo message="disable.wss.providers" />
</target>
Expand Down Expand Up @@ -1033,7 +1031,7 @@
<property name="run.client.args" value=""/>
<property name="buffering.enabled" value="false"/>
<property name="test.areas" value="appclient, connector, jaxws, jstl,
samples, webservices12, assembly, ejb, jacc,
samples, webservices12, assembly, ejb,
jdbc, jta, servlet, ejb30, javamail, jms,
jws, signaturetest, xa, integration,
jsf,
Expand Down Expand Up @@ -1248,151 +1246,6 @@
</target>


<target name="config.jaspic" >
<antcall target="enable.tssv"/>
</target>


<target name="unconfig.jaspic" >
<antcall target="disable.tssv"/>
</target>


<!-- Enable configuration required by JASPIC TSSV (Test Suite SPI Verifier) -->
<target name="enable.tssv" depends="configPlatform">

<antcall target="copy.tssv.jar"/>
<antcall target="copy.tssv.config.files"/>

<antcall target="create.tssv.vm.options"/>

<!-- Restart server -->
<antcall target="restart.server" />

<!-- we need to deploy our jaspic log file processor -->
<fileset id="jaspic_util"
dir="${ts.home}/dist/"
includes="com/sun/ts/tests/jaspic/util/jaspic_util_web.war"/>
<ts.glassfish.deploy>
<fileset refid="jaspic_util"/>
</ts.glassfish.deploy>
</target>


<!-- copy jaspic's tssv.jar (Test Suite SPI Verifier) to the instance lib dir -->
<target name="copy.tssv.jar">
<copy file="${ts.home}/lib/tssv.jar"
tofile="${javaee.home}/lib/tssv.jar" overwrite="yes" />
</target>


<!-- copy jaspic's tssv.config.files to the instance lib dir -->
<target name="copy.tssv.config.files">
<translatepath propname="s1as.lib" />

<!-- copy ProviderConfiguration.xml file -->
<copy file="${ts.home}/src/com/sun/ts/tests/jaspic/tssv/config/ProviderConfiguration.xml"
tofile="${provider.configuration.file}" overwrite="yes" />

<!-- copy provider-configuration.xsd file -->
<copy file="${ts.home}/src/com/sun/ts/tests/jaspic/tssv/config/provider-configuration.xsd"
tofile="${schema.file.location}/provider-configuration.xsd" overwrite="yes" />

</target>


<target name="delete.tssv.jar">
<delete file="${javaee.home}/lib/tssv.jar" quiet="true"/>
</target>


<target name="delete.tssv.config.files">
<delete file="${javaee.home}/lib/tssv.jar" quiet="true"/>
<delete file="${provider.configuration.file}" quiet="true"/>
<delete file="${schema.file.location}/provider-configuration.xsd" quiet="true"/>
</target>


<!-- this creates jvm props that are needed to successfully run jaspic tests -->
<target name="create.tssv.vm.options" depends="configPlatform">

<!-- copy our security propertys that will get appended to system security props
(eg java.security props) by use of: "java -Djava.security.properties=..." -->
<echo message="Copying jaspic security property file to ${s1as.domain}/${server.config.dir}/ts.java.security" />
<copy file="${bin.dir}/ts.java.security"
tofile="${s1as.domain}/${server.config.dir}/ts.java.security" overwrite="yes" />

<antcall target="create-one-jvm-option" >
<param name="jvm.options" value=" -Djava.security.properties=${server.domain}/${server.config.dir}/ts.java.security"/>
</antcall>

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

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

<antcall target="create-one-jvm-option" >
<param name="jvm.options" value=" -Dprovider.configuration.file=${provider.configuration.file}"/>
</antcall>

<antcall target="create-jvm-options" >
<param name="jvm.options" value=" -Djava.security.manager"/>
</antcall>

</target>


<!--
Disable the configuration required by TSSV (Test Suite SPI Verifier)
-->
<target name="disable.tssv" depends="configPlatform">
<!-- we need to deploy our jaspic log file processor -->
<fileset id="jaspic_util"
dir="${ts.home}/dist/"
includes="com/sun/ts/tests/jaspic/util/jaspic_util_web.war"/>

<ts.glassfish.undeploy>
<fileset refid="jaspic_util"/>
</ts.glassfish.undeploy>

<antcall target="delete.tssv.vm.options"/>
<!-- Restart server -->
<antcall target="restart.server" />
</target>


<target name="delete.tssv.vm.options" depends="configPlatform">

<echo message="Removing jaspic security property file: ${s1as.domain}/${server.config.dir}/ts.java.security" />
<delete file="${s1as.domain}/${server.config.dir}/ts.java.security" quiet="true"/>

<antcall target="delete-one-jvm-option" >
<param name="jvm.options" value=" -Djava.security.properties=${s1as.asenv.loc}/ts.java.security"/>
</antcall>

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

<antcall target="delete-one-jvm-option" >
<param name="jvm.options" value=" -Dprovider.configuration.file=${provider.configuration.file}"/>
</antcall>
</target>

<target name="enable.security.manager" depends="configPlatform">
<antcall target="create-jvm-options" >
<param name="jvm.options" value=" -Djava.security.manager"/>
</antcall>
</target>
<target name="disable.security.manager" depends="configPlatform">
<antcall target="delete-jvm-options" >
<param name="jvm.options" value=" -Djava.security.manager"/>
</antcall>
</target>

<target name="start.javadb.asadmin" depends="configPlatform">
<exec executable="${exec.asadmin}" failifexecutionfails="false">
<arg line="${exec.asadmin.part2}" />
Expand Down
Loading