address review comments, rename SunRILoginContext

Signed-off-by: alwin-joseph <alwin.joseph@oracle.com>
scottmarlow · Feb 24, 2021 · f9b17c5 · f9b17c5
1 parent 32631b8
commit f9b17c5
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 30 deletions.
diff --git a/docker/build_jakartaeetck.sh b/docker/build_jakartaeetck.sh
@@ -97,8 +97,6 @@ mkdir -p $JAKARTA_JARS/endorsed
 
 mvn -f $BASEDIR/docker/pom.xml dependency:copy-dependencies -DoutputDirectory="${JAKARTA_JARS}/modules" -Dmdep.stripVersion=true
 
-#TODO : security jar is required to compile SunRILoginContext.java, look for alternative way to remove this dependency
-#wget --progress=bar:force --no-cache https://repo1.maven.org/maven2/org/glassfish/security/security/3.1.1/security-3.1.1.jar -O ${JAKARTA_JARS}/modules/security.jar
 
 ls $JAKARTA_JARS/modules/
 

diff --git a/install/connector/bin/ts.jte b/install/connector/bin/ts.jte
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2021 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
@@ -441,7 +441,7 @@ impl.deploy.timeout.multiplier=10
 # @porting.ts.HttpsURLConnection.class.1  VI of
 #    com.sun.ts.lib.porting.TSHttpsURLConnectionInterface
 ###############################################################
-porting.ts.login.class.1=com.sun.ts.lib.implementation.sun.javaee.SunRILoginContext
+porting.ts.login.class.1=com.sun.ts.lib.implementation.sun.javaee.GlassFishLoginContext
 porting.ts.url.class.1=com.sun.ts.lib.implementation.sun.common.SunRIURL
 porting.ts.HttpsURLConnection.class.1=com.sun.ts.lib.implementation.sun.javaee.SunRIHttpsURLConnection
 

diff --git a/install/connector/bin/ts.jte.jdk11 b/install/connector/bin/ts.jte.jdk11
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2021 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
@@ -440,7 +440,7 @@ impl.deploy.timeout.multiplier=10
 # @porting.ts.HttpsURLConnection.class.1  VI of
 #    com.sun.ts.lib.porting.TSHttpsURLConnectionInterface
 ###############################################################
-porting.ts.login.class.1=com.sun.ts.lib.implementation.sun.javaee.SunRILoginContext
+porting.ts.login.class.1=com.sun.ts.lib.implementation.sun.javaee.GlassFishLoginContext
 porting.ts.url.class.1=com.sun.ts.lib.implementation.sun.common.SunRIURL
 porting.ts.HttpsURLConnection.class.1=com.sun.ts.lib.implementation.sun.javaee.SunRIHttpsURLConnection
 

diff --git a/install/j2eemgmt/bin/ts.jte b/install/j2eemgmt/bin/ts.jte
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2021 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
@@ -202,15 +202,15 @@ sun.porting_server.port=2002
 
 #Porting class names for Vendor J2EE Implementation #1
 porting.ts.deploy.class.1=com.sun.ts.lib.implementation.sun.javaee.SunRIDeployment
-porting.ts.login.class.1=com.sun.ts.lib.implementation.sun.javaee.SunRILoginContext
+porting.ts.login.class.1=com.sun.ts.lib.implementation.sun.javaee.GlassFishLoginContext
 porting.ts.url.class.1=com.sun.ts.lib.implementation.sun.common.SunRIURL
 porting.ts.jms.class.1=com.sun.ts.lib.implementation.sun.javaee.SunRIJMSAdmin
 porting.ts.ctsHttpsURLConnection.class.1=com.sun.ts.lib.implementation.sun.javaee.SunRIHttpsURLConnection
 
 
 #Porting class names for Sun RI J2EE Implementation #2 (must be Sun's RI)
 porting.ts.deploy.class.2=com.sun.ts.lib.implementation.sun.javaee.SunRIDeploymentSeparateVM
-porting.ts.login.class.2=com.sun.ts.lib.implementation.sun.javaee.SunRILoginContext
+porting.ts.login.class.2=com.sun.ts.lib.implementation.sun.javaee.GlassFishLoginContext
 porting.ts.url.class.2=com.sun.ts.lib.implementation.sun.common.SunRIURL
 porting.ts.jms.class.2=com.sun.ts.lib.implementation.sun.javaee.SunRIJMSAdmin
 porting.ts.ctsHttpsURLConnection.class.2=com.sun.ts.lib.implementation.sun.javaee.SunRIHttpsURLConnection

diff --git a/install/jacc/bin/build.xml b/install/jacc/bin/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2021 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
@@ -109,7 +109,6 @@
                             ${lib.pkg.dir}/deliverable/jacc/**,
                             ${provider.dir}/**,
                             ${lib.pkg.dir}/implementation/sun/javaee/SunRIHttpsURLConnection.java,
-                            ${lib.pkg.dir}/implementation/sun/javaee/SunRILoginContext.java,
                             ${lib.pkg.dir}/implementation/sun/common/SunRIURL.java">
             <classpath>
                 <pathelement path="${ts.lib.classpath}" />
@@ -124,7 +123,6 @@
             <include name="${lib.pkg.dir}/deliverable/tck/*.class"/>
             <include name="${lib.pkg.dir}/deliverable/jacc/*"/>
             <include name="${lib.pkg.dir}/implementation/sun/javaee/SunRIHttpsURLConnection.class"/>
-            <include name="${lib.pkg.dir}/implementation/sun/javaee/SunRILoginContext.class"/>
             <include name="${lib.pkg.dir}/implementation/sun/common/SunRIURL.class"/>
         </ts.lib.jar>
         <echo message="The TCK specific library jar, 'jacctck.jar', has been built."/>

diff --git a/install/jakartaee/bin/ts.jte b/install/jakartaee/bin/ts.jte
@@ -1603,13 +1603,13 @@ porting.ts.deploy.class.2=com.sun.ts.lib.implementation.sun.javaee.glassfish.Aut
 # @porting.ts.HttpsURLConnection.class.2  RI of
 #    com.sun.ts.lib.porting.TSHttpsURLConnectionInterface
 ###############################################################
-porting.ts.login.class.1=com.sun.ts.lib.implementation.sun.javaee.SunRILoginContext
+porting.ts.login.class.1=com.sun.ts.lib.implementation.sun.javaee.GlassFishLoginContext
 porting.ts.url.class.1=com.sun.ts.lib.implementation.sun.common.SunRIURL
 porting.ts.jms.class.1=com.sun.ts.lib.implementation.sun.javaee.SunRIJMSAdmin
 porting.ts.HttpsURLConnection.class.1=com.sun.ts.lib.implementation.sun.javaee.SunRIHttpsURLConnection
 
 ##Porting class names for Sun RI Java EE Implementation #2 (must be Sun's RI)
-porting.ts.login.class.2=com.sun.ts.lib.implementation.sun.javaee.SunRILoginContext
+porting.ts.login.class.2=com.sun.ts.lib.implementation.sun.javaee.GlassFishLoginContext
 porting.ts.url.class.2=com.sun.ts.lib.implementation.sun.common.SunRIURL
 porting.ts.jms.class.2=com.sun.ts.lib.implementation.sun.javaee.SunRIJMSAdmin
 porting.ts.HttpsURLConnection.class.2=com.sun.ts.lib.implementation.sun.javaee.SunRIHttpsURLConnection

diff --git a/install/jakartaee/bin/ts.jte.jdk11 b/install/jakartaee/bin/ts.jte.jdk11
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2021 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
@@ -1584,13 +1584,13 @@ porting.ts.deploy.class.2=com.sun.ts.lib.implementation.sun.javaee.glassfish.Aut
 # @porting.ts.HttpsURLConnection.class.2  RI of
 #    com.sun.ts.lib.porting.TSHttpsURLConnectionInterface
 ###############################################################
-porting.ts.login.class.1=com.sun.ts.lib.implementation.sun.javaee.SunRILoginContext
+porting.ts.login.class.1=com.sun.ts.lib.implementation.sun.javaee.GlassFishLoginContext
 porting.ts.url.class.1=com.sun.ts.lib.implementation.sun.common.SunRIURL
 porting.ts.jms.class.1=com.sun.ts.lib.implementation.sun.javaee.SunRIJMSAdmin
 porting.ts.HttpsURLConnection.class.1=com.sun.ts.lib.implementation.sun.javaee.SunRIHttpsURLConnection
 
 ##Porting class names for Sun RI Java EE Implementation #2 (must be Sun's RI)
-porting.ts.login.class.2=com.sun.ts.lib.implementation.sun.javaee.SunRILoginContext
+porting.ts.login.class.2=com.sun.ts.lib.implementation.sun.javaee.GlassFishLoginContext
 porting.ts.url.class.2=com.sun.ts.lib.implementation.sun.common.SunRIURL
 porting.ts.jms.class.2=com.sun.ts.lib.implementation.sun.javaee.SunRIJMSAdmin
 porting.ts.HttpsURLConnection.class.2=com.sun.ts.lib.implementation.sun.javaee.SunRIHttpsURLConnection

diff --git a/install/jakartaee/bin/ts.jte.jdk9 b/install/jakartaee/bin/ts.jte.jdk9
@@ -1609,13 +1609,13 @@ porting.ts.deploy.class.2=com.sun.ts.lib.implementation.sun.javaee.glassfish.Aut
 # @porting.ts.HttpsURLConnection.class.2  RI of
 #    com.sun.ts.lib.porting.TSHttpsURLConnectionInterface
 ###############################################################
-porting.ts.login.class.1=com.sun.ts.lib.implementation.sun.javaee.SunRILoginContext
+porting.ts.login.class.1=com.sun.ts.lib.implementation.sun.javaee.GlassFishLoginContext
 porting.ts.url.class.1=com.sun.ts.lib.implementation.sun.common.SunRIURL
 porting.ts.jms.class.1=com.sun.ts.lib.implementation.sun.javaee.SunRIJMSAdmin
 porting.ts.HttpsURLConnection.class.1=com.sun.ts.lib.implementation.sun.javaee.SunRIHttpsURLConnection
 
 ##Porting class names for Sun RI Java EE Implementation #2 (must be Sun's RI)
-porting.ts.login.class.2=com.sun.ts.lib.implementation.sun.javaee.SunRILoginContext
+porting.ts.login.class.2=com.sun.ts.lib.implementation.sun.javaee.GlassFishLoginContext
 porting.ts.url.class.2=com.sun.ts.lib.implementation.sun.common.SunRIURL
 porting.ts.jms.class.2=com.sun.ts.lib.implementation.sun.javaee.SunRIJMSAdmin
 porting.ts.HttpsURLConnection.class.2=com.sun.ts.lib.implementation.sun.javaee.SunRIHttpsURLConnection

diff --git a/install/jaspic/bin/build.xml b/install/jaspic/bin/build.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2021 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
@@ -339,7 +339,6 @@
                   excludes="${lib.pkg.dir}/implementation/sun/javaee/SunRIDeployment.java,
                             ${lib.pkg.dir}/implementation/sun/javaee/SunRIDeployment1*.java,
                             ${lib.pkg.dir}/implementation/sun/javaee/SunRIDeployment2*.java,
-                            ${lib.pkg.dir}/implementation/sun/javaee/SunRILoginContext*.java,
                             ${lib.pkg.dir}/implementation/sun/javaee/SunRIPorting*.java,
                             ${lib.pkg.dir}/implementation/sun/javaee/SunRIDeploymentSeparateVM*.java,
                             ${lib.pkg.dir}/implementation/sun/javaee/six/**">

diff --git a/install/jaspic/bin/ts.jte b/install/jaspic/bin/ts.jte
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2021 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
@@ -578,7 +578,7 @@ deployment_port.1=${s1as.admin.port}
 # @porting.ts.HttpsURLConnection.class.1  VI of
 #    com.sun.ts.lib.porting.TSHttpsURLConnectionInterface
 ###############################################################
-porting.ts.login.class.1=com.sun.ts.lib.implementation.sun.javaee.SunRILoginContext
+porting.ts.login.class.1=com.sun.ts.lib.implementation.sun.javaee.GlassFishLoginContext
 porting.ts.url.class.1=com.sun.ts.lib.implementation.sun.common.SunRIURL
 porting.ts.jms.class.1=com.sun.ts.lib.implementation.sun.javaee.SunRIJMSAdmin
 porting.ts.HttpsURLConnection.class.1=com.sun.ts.lib.implementation.sun.javaee.SunRIHttpsURLConnection
@@ -592,7 +592,7 @@ porting.ts.HttpsURLConnection.class.1=com.sun.ts.lib.implementation.sun.javaee.S
 # satisfy some requirements for properly lookups.
 ###############################################################
 porting.ts.deploy2.class.2=com.sun.ts.lib.implementation.sun.javaee.SunRIDeployment2
-porting.ts.login.class.2=com.sun.ts.lib.implementation.sun.javaee.SunRILoginContext
+porting.ts.login.class.2=com.sun.ts.lib.implementation.sun.javaee.GlassFishLoginContext
 porting.ts.url.class.2=com.sun.ts.lib.implementation.sun.common.SunRIURL
 porting.ts.jms.class.2=com.sun.ts.lib.implementation.sun.javaee.SunRIJMSAdmin
 porting.ts.HttpsURLConnection.class.2=com.sun.ts.lib.implementation.sun.javaee.SunRIHttpsURLConnection

diff --git a/install/jaspic/bin/ts.jte.jdk11 b/install/jaspic/bin/ts.jte.jdk11
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2021 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
@@ -574,7 +574,7 @@ deployment_port.1=${s1as.admin.port}
 # @porting.ts.HttpsURLConnection.class.1  VI of
 #    com.sun.ts.lib.porting.TSHttpsURLConnectionInterface
 ###############################################################
-porting.ts.login.class.1=com.sun.ts.lib.implementation.sun.javaee.SunRILoginContext
+porting.ts.login.class.1=com.sun.ts.lib.implementation.sun.javaee.GlassFishLoginContext
 porting.ts.url.class.1=com.sun.ts.lib.implementation.sun.common.SunRIURL
 porting.ts.jms.class.1=com.sun.ts.lib.implementation.sun.javaee.SunRIJMSAdmin
 porting.ts.HttpsURLConnection.class.1=com.sun.ts.lib.implementation.sun.javaee.SunRIHttpsURLConnection
@@ -588,7 +588,7 @@ porting.ts.HttpsURLConnection.class.1=com.sun.ts.lib.implementation.sun.javaee.S
 # satisfy some requirements for properly lookups.
 ###############################################################
 porting.ts.deploy2.class.2=com.sun.ts.lib.implementation.sun.javaee.SunRIDeployment2
-porting.ts.login.class.2=com.sun.ts.lib.implementation.sun.javaee.SunRILoginContext
+porting.ts.login.class.2=com.sun.ts.lib.implementation.sun.javaee.GlassFishLoginContext
 porting.ts.url.class.2=com.sun.ts.lib.implementation.sun.common.SunRIURL
 porting.ts.jms.class.2=com.sun.ts.lib.implementation.sun.javaee.SunRIJMSAdmin
 porting.ts.HttpsURLConnection.class.2=com.sun.ts.lib.implementation.sun.javaee.SunRIHttpsURLConnection

diff --git a/lib/glassfishporting.jar b/lib/glassfishporting.jar
diff --git a/...ion/sun/javaee/SunRILoginContext.java.src → ...sun/javaee/GlassFishLoginContext.java.src b/...ion/sun/javaee/SunRILoginContext.java.src → ...sun/javaee/GlassFishLoginContext.java.src
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -24,15 +24,15 @@ import com.sun.enterprise.security.auth.login.*;
  * TSLoginContext provides the implementation specific code for allowing a
  * program to login as a specific user.
  */
-public class SunRILoginContext implements TSLoginContextInterface {
+public class GlassFishLoginContext implements TSLoginContextInterface {
 
   private int USERNAME_PASSWORD = 1;
 
   /**
    * Provides LoginContext needed to perform login.
    *
    */
-  public SunRILoginContext() throws Exception {
+  public GlassFishLoginContext() throws Exception {
   }
 
   /**