Skip to content

Commit

Permalink
remove references to endorsed and resolver, fix filenames in ts files
Browse files Browse the repository at this point in the history 
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
  • Loading branch information
@lukasj
lukasj committed Feb 21, 2022
1 parent 0c1dd66 commit 5718047
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 169 deletions.
25 changes: 2 additions & 23 deletions install/jaxws/bin/ts.jte
View file
@@ -1,5 +1,5 @@
#
# Copyright (c) 2009, 2021 Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2009, 2022 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 @@ -50,31 +50,11 @@ webServerPort.2=
# This is usually installed within a web container (glassfish
# or tomcat) so we default this value to @webcontainer.home.ri.
# See this property below.
# @endorsed.dirs If using JavaSE 6 or above, verify that the property
# endorsed.dirs is set to the location of the VI api jars
# for those technologies you wish to overrride. JavaSE 6
# contains an implementation of JAXWS 2.x which will conflict
# with JAXWS 2.2, therefore this property must be set so that
# JAXWS 2.2 will be used during the building of tests and
# during test execution. For details regarding how the
# Endorsed Standards Override Mechanism works, see
# http://java.sun.com/javase/6/docs/technotes/guides/standards
# @endorsed.dirs.ri If using JavaSE 6 or above, verify that the property
# endorsed.dirs is set to the location of the RI api jars
# for those technologies you wish to overrride. JavaSE 6
# contains an implementation of JAXWS 2.x which will conflict
# with JAXWS 2.2, therefore this property must be set so that
# JAXWS 2.2 will be used during the building of tests and
# during test execution. For details regarding how the
# Endorsed Standards Override Mechanism works, see
# http://java.sun.com/javase/6/docs/technotes/guides/standards
#################################################################################
jaxws.home=${webcontainer.home}
jaxws.home.ri=${webcontainer.home.ri}
jaxws.lib=${jaxws.home}/modules
jaxws.lib.ri=${jaxws.home.ri}/modules
endorsed.dirs=${jaxws.lib}
endorsed.dirs.ri=${jaxws.lib.ri}

###########################################################################
# @jaxws.classes should contain all Vendor specific jars/classes
Expand All @@ -100,7 +80,7 @@ catalog.path=${src.dir}/com/sun/ts/tests/jaxws/common/xml/catalog
# @ts.run.classpath.ri -- Classpath required by Java EE RI
# appclient container.
####################################################################
ts.harness.classpath=${ts.home}/lib/javatest.jar${pathsep}${ts.home}/lib/tsharness.jar${pathsep}${ts.home}/lib/jaxwstck.jar${pathsep}${ant.home}/lib/ant.jar${pathsep}${ts.home}/lib/jaxb-api.jar${pathsep}${ts.home}/lib/jaxb-xjc.jar${pathsep}${ts.home}/lib/jaxb-libs.jar${pathsep}${ts.home}/lib/jaxb-impl.jar
ts.harness.classpath=${ts.home}/lib/javatest.jar${pathsep}${ts.home}/lib/tsharness.jar${pathsep}${ts.home}/lib/jaxwstck.jar${pathsep}${ant.home}/lib/ant.jar${pathsep}${ts.home}/lib/jakarta.xml.bind-api.jar${pathsep}${ts.home}/lib/jaxb-xjc.jar${pathsep}${ts.home}/lib/jaxb-libs.jar${pathsep}${ts.home}/lib/jaxb-impl.jar

ts.classpath=${jaxws.classes}${pathsep}${ts.home}/lib/tsharness.jar${pathsep}${ts.home}/lib/jaxwstck.jar

Expand Down Expand Up @@ -541,7 +521,6 @@ javaee.home=${webcontainer.home}
# The xxxlogin and xxxpassword are used
# to set known server side creds for use
# with connector tests.
# @s1as.java.endorsed.dirs -- endorsed directory used by SJSAS
# @s1as.applicationRoot-- Location of application repository
# Only needed when running on windows
# @s1as.db.ext.dirs -- The extension directory for DB Type 2
Expand Down
30 changes: 4 additions & 26 deletions install/jaxws/bin/ts.jte.tomcat.jdk16
View file
@@ -1,5 +1,5 @@
#
# Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2009, 2022 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 @@ -50,41 +50,21 @@ webServerPort.2=
# This is usually installed within a web container (glassfish
# or tomcat) so we default this value to @webcontainer.home.ri.
# See this property below.
# @endorsed.dirs If using JavaSE 6 or above, verify that the property
# endorsed.dirs is set to the location of the VI api jars
# for those technologies you wish to overrride. JavaSE 6
# contains an implementation of JAXWS 2.x which will conflict
# with JAXWS 2.2, therefore this property must be set so that
# JAXWS 2.2 will be used during the building of tests and
# during test execution. For details regarding how the
# Endorsed Standards Override Mechanism works, see
# http://java.sun.com/javase/6/docs/technotes/guides/standards
# @endorsed.dirs.ri If using JavaSE 6 or above, verify that the property
# endorsed.dirs is set to the location of the RI api jars
# for those technologies you wish to overrride. JavaSE 6
# contains an implementation of JAXWS 2.x which will conflict
# with JAXWS 2.2, therefore this property must be set so that
# JAXWS 2.2 will be used during the building of tests and
# during test execution. For details regarding how the
# Endorsed Standards Override Mechanism works, see
# http://java.sun.com/javase/6/docs/technotes/guides/standards
#################################################################################
jaxws.home=${webcontainer.home}
jaxws.home.ri=${webcontainer.home.ri}
jaxws.lib=${jaxws.home}/shared/lib
jaxws.lib.ri=${jaxws.home.ri}/shared/lib
endorsed.dirs=${jaxws.home}/common/endorsed
endorsed.dirs.ri=${jaxws.home.ri}/common/endorsed

###########################################################################
# @jaxws.classes should contain all Vendor specific jars/classes
###########################################################################
jaxws.classes=${jaxws.lib}/FastInfoset.jar${pathsep}${jaxws.lib}/gmbal-api-only.jar${pathsep}${jaxws.lib}/ha-api.jar${pathsep}${jaxws.lib}/jakarta.annotation.jar${pathsep}${jaxws.lib}/jakarta.xml.soap-api.jar${pathsep}${endorsed.dirs}/jaxb-api.jar${pathsep}${jaxws.lib}/jaxb-impl.jar${pathsep}${jaxws.lib}/jaxb-xjc.jar${pathsep}${jaxws.lib}/jaxb-jxc.jar${pathsep}${jaxws.lib}/jaxb-core.jar${pathsep}${endorsed.dirs}/jaxws-api.jar${pathsep}${jaxws.lib}/jaxws-rt.jar${pathsep}${jaxws.lib}/jaxws-tools.jar${pathsep}${jaxws.lib}/jsr181-api.jar${pathsep}${jaxws.lib}/mail.jar${pathsep}${jaxws.lib}/management-api.jar${pathsep}${jaxws.lib}/mimepull.jar${pathsep}${jaxws.lib}/policy.jar${pathsep}${jaxws.lib}/resolver.jar${pathsep}${jaxws.lib}/saaj-impl.jar${pathsep}${jaxws.lib}/stax-ex.jar${pathsep}${jaxws.lib}/stax2-api.jar${pathsep}${jaxws.lib}/streambuffer.jar${pathsep}${jaxws.lib}/woodstox-core-asl.jar
jaxws.classes=${jaxws.lib}/FastInfoset.jar${pathsep}${jaxws.lib}/gmbal-api-only.jar${pathsep}${jaxws.lib}/ha-api.jar${pathsep}${jaxws.lib}/jakarta.annotation.jar${pathsep}${jaxws.lib}/jakarta.xml.soap-api.jar${pathsep}${jaxws.lib}/jakarta.xml.bind-api.jar${pathsep}${jaxws.lib}/jaxb-impl.jar${pathsep}${jaxws.lib}/jaxb-xjc.jar${pathsep}${jaxws.lib}/jaxb-jxc.jar${pathsep}${jaxws.lib}/jaxb-core.jar${pathsep}${jaxws.lib}/jakarta.xml.ws-api.jar${pathsep}${jaxws.lib}/jaxws-rt.jar${pathsep}${jaxws.lib}/jaxws-tools.jar${pathsep}${jaxws.lib}/jsr181-api.jar${pathsep}${jaxws.lib}/mail.jar${pathsep}${jaxws.lib}/management-api.jar${pathsep}${jaxws.lib}/mimepull.jar${pathsep}${jaxws.lib}/policy.jar${pathsep}${jaxws.lib}/saaj-impl.jar${pathsep}${jaxws.lib}/stax-ex.jar${pathsep}${jaxws.lib}/stax2-api.jar${pathsep}${jaxws.lib}/streambuffer.jar${pathsep}${jaxws.lib}/woodstox-core-asl.jar

###########################################################################
# @jaxws.classes.ri should contain all RI specific jars/classes
###########################################################################
jaxws.classes.ri=${jaxws.lib.ri}/FastInfoset.jar${pathsep}${jaxws.lib.ri}/gmbal-api-only.jar${pathsep}${jaxws.lib.ri}/ha-api.jar${pathsep}${jaxws.lib.ri}/jakarta.annotation.jar${pathsep}${jaxws.lib.ri}/jakarta.xml.soap-api.jar${pathsep}${endorsed.dirs.ri}/jaxb-api.jar${pathsep}${jaxws.lib.ri}/jaxb-impl.jar${pathsep}${jaxws.lib.ri}/jaxb-xjc.jar${pathsep}${jaxws.lib.ri}/jaxb-jxc.jar${pathsep}${jaxws.lib.ri}/jaxb-core.jar${pathsep}${endorsed.dirs.ri}/jaxws-api.jar${pathsep}${jaxws.lib.ri}/jaxws-rt.jar${pathsep}${jaxws.lib.ri}/jaxws-tools.jar${pathsep}${jaxws.lib.ri}/jsr181-api.jar${pathsep}${jaxws.lib.ri}/mail.jar${pathsep}${jaxws.lib.ri}/management-api.jar${pathsep}${jaxws.lib.ri}/mimepull.jar${pathsep}${jaxws.lib.ri}/policy.jar${pathsep}${jaxws.lib.ri}/resolver.jar${pathsep}${jaxws.lib.ri}/saaj-impl.jar${pathsep}${jaxws.lib.ri}/stax-ex.jar${pathsep}${jaxws.lib.ri}/stax2-api.jar${pathsep}${jaxws.lib.ri}/streambuffer.jar${pathsep}${jaxws.lib.ri}/woodstox-core-asl.jar
jaxws.classes.ri=${jaxws.lib.ri}/FastInfoset.jar${pathsep}${jaxws.lib.ri}/gmbal-api-only.jar${pathsep}${jaxws.lib.ri}/ha-api.jar${pathsep}${jaxws.lib.ri}/jakarta.annotation.jar${pathsep}${jaxws.lib.ri}/jakarta.xml.soap-api.jar${pathsep}${jaxws.lib.ri}/jakarta.xml.bind-api.jar${pathsep}${jaxws.lib.ri}/jaxb-impl.jar${pathsep}${jaxws.lib.ri}/jaxb-xjc.jar${pathsep}${jaxws.lib.ri}/jaxb-jxc.jar${pathsep}${jaxws.lib.ri}/jaxb-core.jar${pathsep}${jaxws.lib.ri}/jakarta.xml.ws-api.jar${pathsep}${jaxws.lib.ri}/jaxws-rt.jar${pathsep}${jaxws.lib.ri}/jaxws-tools.jar${pathsep}${jaxws.lib.ri}/jsr181-api.jar${pathsep}${jaxws.lib.ri}/mail.jar${pathsep}${jaxws.lib.ri}/management-api.jar${pathsep}${jaxws.lib.ri}/mimepull.jar${pathsep}${jaxws.lib.ri}/policy.jar${jaxws.lib}${pathsep}${jaxws.lib.ri}/saaj-impl.jar${pathsep}${jaxws.lib.ri}/stax-ex.jar${pathsep}${jaxws.lib.ri}/stax2-api.jar${pathsep}${jaxws.lib.ri}/streambuffer.jar${pathsep}${jaxws.lib.ri}/woodstox-core-asl.jar

###########################################################################
# @catalog.path Path to catalog file for use with catalog tests
Expand All @@ -100,7 +80,7 @@ catalog.path=${src.dir}/com/sun/ts/tests/jaxws/common/xml/catalog
# @ts.run.classpath.ri -- Classpath required by Java EE RI
# appclient container.
####################################################################
ts.harness.classpath=${ts.home}/lib/javatest.jar${pathsep}${ts.home}/lib/tsharness.jar${pathsep}${ts.home}/lib/jaxwstck.jar${pathsep}${ant.home}/lib/ant.jar${pathsep}${ts.home}/lib/jaxb-api.jar${pathsep}${ts.home}/lib/jaxb-xjc.jar${pathsep}${ts.home}/lib/jaxb-libs.jar${pathsep}${ts.home}/lib/jaxb-impl.jar
ts.harness.classpath=${ts.home}/lib/javatest.jar${pathsep}${ts.home}/lib/tsharness.jar${pathsep}${ts.home}/lib/jaxwstck.jar${pathsep}${ant.home}/lib/ant.jar${pathsep}${ts.home}/lib/jakarta.xml.bind-api.jar${pathsep}${ts.home}/lib/jaxb-xjc.jar${pathsep}${ts.home}/lib/jaxb-libs.jar${pathsep}${ts.home}/lib/jaxb-impl.jar

ts.classpath=${jaxws.classes}${pathsep}${ts.home}/lib/tsharness.jar${pathsep}${ts.home}/lib/jaxwstck.jar

Expand Down Expand Up @@ -380,7 +360,6 @@ command.testExecute=com.sun.ts.lib.harness.ExecTSTestCmd \
-Djava.security.policy="${bin.dir}/harness.policy" \
-Djava.security.manager \
-Ddeliverable.class=${deliverable.class} \
-Djava.endorsed.dirs=${endorsed.dirs} \
$testExecuteClass $testExecuteArgs

# This execute line runs against the RI implementation
Expand All @@ -394,7 +373,6 @@ command.testExecute2=com.sun.ts.lib.harness.ExecTSTestCmd \
-Djava.security.policy="${bin.dir}/harness.policy" \
-Djava.security.manager \
-Ddeliverable.class=${deliverable.class} \
-Djava.endorsed.dirs=${endorsed.dirs.ri} \
$testExecuteClass $testExecuteArgs

#########################################################################
Expand Down

0 comments on commit 5718047

Please sign in to comment.