Merge pull request #9 from payara/master

sync
payara · Jun 7, 2019 · deb44da · deb44da
2 parents aa9cd57 + c5ddbc7
commit deb44da
Show file tree

Hide file tree

Showing 52 changed files with 447 additions and 377 deletions.
diff --git a/api/payara-api/pom.xml b/api/payara-api/pom.xml
@@ -2,7 +2,7 @@
 <!--
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  
-  Copyright (c) [2016-2018] Payara Foundation and/or its affiliates. All rights reserved.
+  Copyright (c) [2016-2019] Payara Foundation and/or its affiliates. All rights reserved.
  
   The contents of this file are subject to the terms of either the GNU
   General Public License Version 2 only ("GPL") or the Common Development

diff --git a/appserver/admin/gf_template/src/main/resources/config/default-web.xml b/appserver/admin/gf_template/src/main/resources/config/default-web.xml
@@ -331,7 +331,7 @@
         javax.ejb.jar
         javax.enterprise.deploy-api.jar
         javax.jms-api.jar
-        javax.mail.jar
+        jakarta.mail.jar
         javax.management.j2ee-api.jar
         javax.persistence.jar
         javax.resource-api.jar

diff --git a/appserver/admin/gf_template_web/src/main/resources/config/default-web.xml b/appserver/admin/gf_template_web/src/main/resources/config/default-web.xml
@@ -328,7 +328,7 @@
         javax.ejb.jar
         javax.enterprise.deploy-api.jar
         javax.jms-api.jar
-        javax.mail.jar
+        jakarta.mail.jar
         javax.management.j2ee-api.jar
         javax.persistence.jar
         javax.resource-api.jar

diff --git a/appserver/admin/production_domain_template/src/main/resources/config/default-web.xml b/appserver/admin/production_domain_template/src/main/resources/config/default-web.xml
@@ -313,7 +313,7 @@
         javax.ejb.jar
         javax.enterprise.deploy-api.jar
         javax.jms-api.jar
-        javax.mail.jar
+        jakarta.mail.jar
         javax.management.j2ee-api.jar
         javax.persistence.jar
         javax.resource-api.jar

diff --git a/appserver/admin/production_domain_template_web/src/main/resources/config/default-web.xml b/appserver/admin/production_domain_template_web/src/main/resources/config/default-web.xml
@@ -337,7 +337,7 @@
         javax.ejb.jar
         javax.enterprise.deploy-api.jar
         javax.jms-api.jar
-        javax.mail.jar
+        jakarta.mail.jar
         javax.management.j2ee-api.jar
         javax.persistence.jar
         javax.resource-api.jar

diff --git a/appserver/admingui/cluster/src/main/resources/shared/handlers.inc b/appserver/admingui/cluster/src/main/resources/shared/handlers.inc
@@ -49,26 +49,18 @@
 -->
 <handler id="gfj.checkNameExist">
     urlencode(value="#{requestScope.nameToCheck}" result="#{requestScope.encodedNameToCheck}");
-    gf.checkIfEndPointExist(endpoint="#{sessionScope.REST_URL}/clusters/cluster/#{requestScope.encodedNameToCheck}", exists="#{requestScope.exx}");
-    if (#{requestScope.exx}){
-        setAttribute(key="nameAlreadyExists" value="#{true}");
-    }
-    if ("!#{requestScope.exx}"){
-        gf.checkIfEndPointExist(endpoint="#{sessionScope.REST_URL}/servers/server/#{requestScope.encodedNameToCheck}", exists="#{requestScope.exx}");
-    }
-    if ("!#{requestScope.exx}"){
-        gf.checkIfEndPointExist(endpoint="#{sessionScope.REST_URL}/depployment-groups/deployment-group/#{requestScope.encodedNameToCheck}", exists="#{requestScope.exx}");
-    }
-   if (#{requestScope.exx}){
-        setAttribute(key="nameAlreadyExists" value="#{true}");
+    gf.checkIfEndPointExist(endpoint="#{sessionScope.REST_URL}/clusters/cluster/#{requestScope.encodedNameToCheck}", exists="#{requestScope.nameAlreadyExists}");
+
+    if ("!#{requestScope.nameAlreadyExists}"){
+        gf.checkIfEndPointExist(endpoint="#{sessionScope.REST_URL}/servers/server/#{requestScope.encodedNameToCheck}", exists="#{requestScope.nameAlreadyExists}");
     }
-    if ("!#{requestScope.exx}"){
-        gf.checkIfEndPointExist(endpoint="#{sessionScope.REST_URL}/configs/config/#{requestScope.encodedNameToCheck}", exists="#{requestScope.exx}");
+    if ("!#{requestScope.nameAlreadyExists}"){
+        gf.checkIfEndPointExist(endpoint="#{sessionScope.REST_URL}/deployment-groups/deployment-group/#{requestScope.encodedNameToCheck}", exists="##{requestScope.nameAlreadyExists}");
     }
-    if (#{requestScope.exx}){
-        setAttribute(key="nameAlreadyExists" value="#{true}");
+    if ("!#{requestScope.nameAlreadyExists}"){
+        gf.checkIfEndPointExist(endpoint="#{sessionScope.REST_URL}/configs/config/#{requestScope.encodedNameToCheck}", exists="#{requestScope.nameAlreadyExists}");
     }
-    if ("!#{requestScope.exx}"){
+    if ("!#{requestScope.nameAlreadyExists}"){
         gf.checkIfEndPointExist(endpoint="#{sessionScope.REST_URL}/nodes/node/#{requestScope.encodedNameToCheck}", exists="#{requestScope.nameAlreadyExists}");
     }
 

diff --git a/appserver/admingui/core/pom.xml b/appserver/admingui/core/pom.xml
@@ -192,8 +192,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency> <!-- for FindBugs -->
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
             <scope>provided</scope>
         </dependency> 
         <dependency> <!-- for FindBugs -->

diff --git a/appserver/admingui/payara-console-extras/pom.xml b/appserver/admingui/payara-console-extras/pom.xml
@@ -3,7 +3,7 @@
 
 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-   Copyright (c) [2016-2017] Payara Foundation and/or its affiliates. All rights reserved.
+   Copyright (c) [2016-2019] Payara Foundation and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
@@ -97,8 +97,8 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.json</groupId>
-            <artifactId>javax.json-api</artifactId>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/appserver/appclient/client/acc/pom.xml b/appserver/appclient/client/acc/pom.xml
@@ -420,7 +420,7 @@
       <dependency>
         <scope>runtime</scope>
         <groupId>org.glassfish</groupId>
-        <artifactId>javax.json</artifactId>
+        <artifactId>jakarta.json</artifactId>
       </dependency>
 
       <!-- CDI support -->

diff --git a/appserver/common/container-common/pom.xml b/appserver/common/container-common/pom.xml
@@ -133,7 +133,7 @@
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
-            <artifactId>javax.mail</artifactId>
+            <artifactId>jakarta.mail</artifactId>
         </dependency>
         <dependency>
             <groupId>org.glassfish.main.security</groupId>

diff --git a/...s-runtime/src/main/java/com/sun/enterprise/resource/naming/AdministeredObjectFactory.java b/...s-runtime/src/main/java/com/sun/enterprise/resource/naming/AdministeredObjectFactory.java
@@ -92,7 +92,7 @@ public Object getObjectInstance(Object obj,
         if (runtime.isACCRuntime() || runtime.isNonACCRuntime()) {
             ConnectorDescriptor connectorDescriptor = null;
             try {
-                Context ic = new InitialContext();
+                Context ic = new InitialContext(env);
                 String descriptorJNDIName = ConnectorAdminServiceUtils.
                         getReservePrefixedJNDINameForDescriptor(moduleName);
                 connectorDescriptor = (ConnectorDescriptor) ic.lookup(descriptorJNDIName);

diff --git a/appserver/docker/pom.xml b/appserver/docker/pom.xml
@@ -32,14 +32,14 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.glassfish</groupId>
-            <artifactId>javax.json</artifactId>
+            <artifactId>jakarta.json</artifactId>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>

diff --git a/appserver/ejb/ejb-http-remoting/client/pom.xml b/appserver/ejb/ejb-http-remoting/client/pom.xml
@@ -123,8 +123,8 @@
             <artifactId>jersey-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.json</groupId>
-            <artifactId>javax.json-api</artifactId>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-api</artifactId>
         </dependency>
 
         <dependency>

diff --git a/appserver/ejb/ejb-http-remoting/endpoint/pom.xml b/appserver/ejb/ejb-http-remoting/endpoint/pom.xml
@@ -71,13 +71,13 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.json</groupId>
-            <artifactId>javax.json-api</artifactId>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/appserver/extras/javaee/manifest-jar/pom.xml b/appserver/extras/javaee/manifest-jar/pom.xml
@@ -59,7 +59,7 @@
                 <configuration>
                     <archive>
 	                <manifestEntries>
-                            <Class-Path>../modules/javax.servlet-api.jar ../modules/javax.annotation-api.jar ../modules/javax.ejb-api.jar ../modules/javax.transaction-api.jar ../modules/javax.enterprise.deploy-api.jar ../modules/javax.management.j2ee-api.jar ../modules/javax.resource-api.jar ../modules/jakarta.security.auth.message-api.jar ../modules/javax.security.jacc-api.jar ../modules/webservices-osgi.jar ../modules/jaxb-osgi.jar ../modules/jakarta.xml.bind-api.jar ../modules/webservices-api-osgi.jar ../modules/javax.xml.rpc-api.jar ../modules/javax.xml.registry-api.jar ../modules/javax.mail.jar ../modules/jakarta.faces.jar ../modules/javax.servlet.jsp-api.jar ../modules/javax.el.jar ../modules/javax.servlet.jsp.jstl-api.jar ../modules/javax.persistence.jar ../modules/javax.jms-api.jar ../modules/hibernate-validator.jar ../modules/cdi-api.jar ../../mq/lib/jaxm-api.jar ../modules/javax.ws.rs-api.jar ../modules/javax.json.jar ../modules/javax.websocket-api.jar ../modules/javax.enterprise.concurrent-api.jar ../modules/javax.batch-api.jar</Class-Path>
+                      <Class-Path>../modules/javax.servlet-api.jar ../modules/javax.annotation-api.jar ../modules/javax.ejb-api.jar ../modules/javax.transaction-api.jar ../modules/javax.enterprise.deploy-api.jar ../modules/javax.management.j2ee-api.jar ../modules/javax.resource-api.jar ../modules/jakarta.security.auth.message-api.jar ../modules/javax.security.jacc-api.jar ../modules/webservices-osgi.jar ../modules/jaxb-osgi.jar ../modules/jakarta.xml.bind-api.jar ../modules/webservices-api-osgi.jar ../modules/javax.xml.rpc-api.jar ../modules/javax.xml.registry-api.jar ../modules/jakarta.mail.jar ../modules/jakarta.faces.jar ../modules/javax.servlet.jsp-api.jar ../modules/javax.el.jar ../modules/javax.servlet.jsp.jstl-api.jar ../modules/javax.persistence.jar ../modules/javax.jms-api.jar ../modules/hibernate-validator.jar ../modules/cdi-api.jar ../../mq/lib/jaxm-api.jar ../modules/jakarta.ws.rs-api.jar ../modules/jakarta.json.jar ../modules/javax.websocket-api.jar ../modules/javax.enterprise.concurrent-api.jar ../modules/javax.batch-api.jar</Class-Path>
 	                    <GlassFish-ServerExcluded>true</GlassFish-ServerExcluded>
 	                </manifestEntries>
                     </archive>

diff --git a/appserver/javaee-api/javax.javaee-api/pom.xml b/appserver/javaee-api/javax.javaee-api/pom.xml
@@ -125,13 +125,13 @@
             <optional>true</optional>
         </dependency>
         <!--
-            using com.sun.mail.java.mail instead of javax.mail:javax.mail-api
-            because javax.mail has a dependency to com.sun.mail classes,
+            using com.sun.mail.java.mail instead of jakarta.mail:jakarta.mail-api
+            because jakarta.mail has a dependency to com.sun.mail classes,
             but the pom does not bring the dependency.
         -->
         <dependency>
             <groupId>com.sun.mail</groupId>
-            <artifactId>javax.mail</artifactId>
+            <artifactId>jakarta.mail</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.resource</groupId>

diff --git a/appserver/javaee-api/javax.javaee-web-api/pom.xml b/appserver/javaee-api/javax.javaee-web-api/pom.xml
@@ -153,8 +153,8 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -163,8 +163,8 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>javax.json</groupId>
-            <artifactId>javax.json-api</artifactId>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-api</artifactId>
             <optional>true</optional>
         </dependency>        
         <dependency>

diff --git a/appserver/packager/glassfish-common-web/pom.xml b/appserver/packager/glassfish-common-web/pom.xml
@@ -317,7 +317,7 @@
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
-            <artifactId>javax.mail</artifactId>
+            <artifactId>jakarta.mail</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -356,8 +356,8 @@
             <artifactId>webservices-extra-jdk-packages</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.xml.ws</groupId>
-            <artifactId>jaxws-api</artifactId>
+            <groupId>jakarta.xml.ws</groupId>
+            <artifactId>jakarta.xml.ws-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.sun.istack</groupId>

diff --git a/appserver/packager/json/pom.xml b/appserver/packager/json/pom.xml
@@ -40,7 +40,7 @@
     holder.
 
 -->
-<!-- Portions Copyright [2017] [Payara Foundation and/or its affiliates] -->
+<!-- Portions Copyright [2017-2019] [Payara Foundation and/or its affiliates] -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -124,7 +124,7 @@
     <dependencies>
         <dependency>
             <groupId>org.glassfish</groupId>
-            <artifactId>javax.json</artifactId>
+            <artifactId>jakarta.json</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>

diff --git a/...profile/metrics/src/main/java/fish/payara/microprofile/metrics/impl/WeightedSnapshot.java b/...profile/metrics/src/main/java/fish/payara/microprofile/metrics/impl/WeightedSnapshot.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  * 
- *    Copyright (c) [2018] Payara Foundation and/or its affiliates. All rights reserved.
+ *    Copyright (c) [2018-2019] Payara Foundation and/or its affiliates. All rights reserved.
  * 
  *     The contents of this file are subject to the terms of either the GNU
  *     General Public License Version 2 only ("GPL") or the Common Development
@@ -94,7 +94,7 @@ public WeightedSnapshot(Collection<WeightedSample> values) {
 
         for (int i = 0; i < copy.length; i++) {
             this.values[i] = copy[i].value;
-            this.normWeights[i] = copy[i].weight / sumWeight;
+            this.normWeights[i] = sumWeight == 0d ? 0d : copy[i].weight / sumWeight;
         }
 
         for (int i = 1; i < copy.length; i++) {

diff --git a/appserver/payara-appserver-modules/rest-monitoring/rest-monitoring-war/pom.xml b/appserver/payara-appserver-modules/rest-monitoring/rest-monitoring-war/pom.xml
@@ -2,7 +2,7 @@
 <!--
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-  Copyright (c) [2016-2018] Payara Foundation and/or its affiliates. All rights reserved.
+  Copyright (c) [2016-2019] Payara Foundation and/or its affiliates. All rights reserved.
 
   The contents of this file are subject to the terms of either the GNU
   General Public License Version 2 only ("GPL") or the Common Development
@@ -62,8 +62,8 @@
             <artifactId>jackson-databind</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.json</groupId>
-            <artifactId>javax.json-api</artifactId>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-api</artifactId>
         </dependency>
         <dependency>
             <groupId>javax</groupId>

diff --git a/appserver/payara-appserver-modules/security-openid/pom.xml b/appserver/payara-appserver-modules/security-openid/pom.xml
@@ -2,7 +2,7 @@
 <!--
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
- Copyright (c) [2018] Payara Foundation and/or its affiliates. All rights reserved.
+ Copyright (c) [2018-2019] Payara Foundation and/or its affiliates. All rights reserved.
 
  The contents of this file are subject to the terms of either the GNU
  General Public License Version 2 only ("GPL") or the Common Development
@@ -82,13 +82,13 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.json</groupId>
-            <artifactId>javax.json-api</artifactId>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -174,4 +174,4 @@
         </resources>
     </build>
 
-</project>
+</project>