PAYARA-1402-Upgrade-HK2-to-2.5.0

appserver/admin/gf_template/src/main/resources/config/default-web.xml

@@ -40,7 +40,7 @@
     holder.
 
 -->
-<!-- Portions Copyright [2016] [Payara Foundation] -->
+<!-- // Portions Copyright [2016-2017] [Payara Foundation and/or its affiliates] -->
 
 <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
 
@@ -327,7 +327,7 @@
         javax.servlet.jsp.jar
         jspcaching-connector.jar
         web-glue.jar
-        bean-validator.jar
+        hibernate-validator-payara-p1.jar
         javax.ejb.jar
         javax.enterprise.deploy-api.jar
         javax.jms-api.jar

appserver/admin/payara_template/src/main/resources/config/default-web.xml

@@ -14,7 +14,7 @@
  * When distributing the software, include this License Header Notice in each
  * file and include the License file at packager/legal/LICENSE.txt.
  -->
-<!-- Portions Copyright [2016] [Payara Foundation] -->
+<!-- // Portions Copyright [2016-2017] [Payara Foundation and/or its affiliates] -->
 
 <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
 
@@ -309,7 +309,7 @@
         javax.servlet.jsp.jar
         jspcaching-connector.jar
         web-glue.jar
-        bean-validator.jar
+        hibernate-validator-payara-p1.jar
         javax.ejb.jar
         javax.enterprise.deploy-api.jar
         javax.jms-api.jar

appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/AdministeredObjectDefinitionDeployer.java

@@ -37,6 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
+// Portions Copyright [2017] [Payara Foundation and/or its affiliates]
 
 package com.sun.enterprise.resource.deployer;
 
@@ -336,6 +337,29 @@ public List<Property> getProperty() {
             return administeredObjectProperties;
         }
 
+        @Override
+        public Property addProperty(Property property) {
+            desc.getProperties().put(property.getName(), property);
+            return property;
+        }
+
+        @Override
+        public Property lookupProperty(String s) {
+            return getProperty(s);
+        }
+
+        @Override
+        public Property removeProperty(String s) {
+            Property property = lookupProperty(s);
+            desc.getProperties().remove(s);
+            return property;
+        }
+
+        @Override
+        public Property removeProperty(Property property) {
+            return removeProperty(property.getName());
+        }
+
         public Property getProperty(String name) {
             String value = desc.getProperty(name);
             return new AdministeredObjectProperty(name, value);

appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectionFactoryDefinitionDeployer.java

@@ -37,6 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
+// Portions Copyright [2017] [Payara Foundation and/or its affiliates]
 
 package com.sun.enterprise.resource.deployer;
 
@@ -302,6 +303,26 @@ public List<Property> getProperty() {
             return null;
         }
 
+        @Override
+        public Property addProperty(Property property) {
+            return null;
+        }
+
+        @Override
+        public Property lookupProperty(String s) {
+            return null;
+        }
+
+        @Override
+        public Property removeProperty(String s) {
+            return null;
+        }
+
+        @Override
+        public Property removeProperty(Property property) {
+            return null;
+        }
+
         public Property getProperty(String name) {
             return null;
         }
@@ -638,7 +659,29 @@ public List<Property> getProperty() {
 
             return connectionFactoryProperties;
         }
-
+
+        @Override
+        public Property addProperty(Property property) {
+            desc.getProperties().put(property.getName(), property);
+            return property;
+        }
+
+        @Override
+        public Property lookupProperty(String s) {
+            return getProperty(s);
+        }
+
+        @Override
+        public Property removeProperty(String s) {
+            Property property = lookupProperty(s);
+            desc.getProperties().remove(s);
+            return property;
+        }
+
+        @Override
+        public Property removeProperty(Property property) {
+            return removeProperty(property.getName());
+        }
 
         public Property getProperty(String name) {
             String value = desc.getProperty(name);

appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/JMSConnectionFactoryDefinitionDeployer.java

@@ -38,7 +38,6 @@
  * holder.
  */
 // Portions Copyright [2016-2017] [Payara Foundation and/or its affiliates]
-
 package com.sun.enterprise.resource.deployer;
 
 import com.sun.appserv.connectors.internal.api.ConnectorConstants;
@@ -310,6 +309,26 @@ public List<Property> getProperty() {
             return null;
         }
 
+        @Override
+        public Property addProperty(Property property) {
+            return null;
+        }
+
+        @Override
+        public Property lookupProperty(String s) {
+            return null;
+        }
+
+        @Override
+        public Property removeProperty(String s) {
+            return null;
+        }
+
+        @Override
+        public Property removeProperty(Property property) {
+            return null;
+        }
+
         public Property getProperty(String name) {
             return null;
         }
@@ -705,6 +724,29 @@ public List<Property> getProperty() {
             return jmsConnectionFactoryProperties;
         }
 
+        @Override
+        public Property addProperty(Property property) {
+            desc.getProperties().put(property.getName(), property);
+            return property;
+        }
+
+        @Override
+        public Property lookupProperty(String s) {
+            return getProperty(s);
+        }
+
+        @Override
+        public Property removeProperty(String s) {
+            Property property = lookupProperty(s);
+            desc.getProperties().remove(s);
+            return property;
+        }
+
+        @Override
+        public Property removeProperty(Property property) {
+            return removeProperty(property.getName());
+        }
+
         public Property getProperty(String name) {
             String value = desc.getProperty(name);
             return new JMSConnectionFactoryProperty(name, value);

appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/JMSDestinationDefinitionDeployer.java

@@ -37,6 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
+// Portions Copyright [2017] [Payara Foundation and/or its affiliates]
 
 package com.sun.enterprise.resource.deployer;
 
@@ -345,6 +346,29 @@ public List<Property> getProperty() {
             return jmsDestinationProperties;
         }
 
+        @Override
+        public Property addProperty(Property property) {
+            desc.getProperties().put(property.getName(), property);
+            return property;
+        }
+
+        @Override
+        public Property lookupProperty(String s) {
+            return getProperty(s);
+        }
+
+        @Override
+        public Property removeProperty(String s) {
+            Property property = lookupProperty(s);
+            desc.getProperties().remove(s);
+            return property;
+        }
+
+        @Override
+        public Property removeProperty(Property property) {
+            return removeProperty(property.getName());
+        }
+
         public Property getProperty(String name) {
             String value = desc.getProperty(name);
             return new JMSDestinationProperty(name, value);

appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/MailSessionDeployer.java

@@ -39,6 +39,7 @@
  *
  * Portions Copyright [2017] Payara Foundation and/or affiliates
  */
+// Portions Copyright [2017] [Payara Foundation and/or its affiliates]
 
 package com.sun.enterprise.resource.deployer;
 
@@ -68,10 +69,7 @@
 import javax.inject.Provider;
 import javax.naming.NamingException;
 import java.beans.PropertyVetoException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -542,6 +540,29 @@ public List<Property> getProperty() {
             return props;
         }
 
+        @Override
+        public Property addProperty(Property property) {
+            desc.getProperties().put(property.getName(), property);
+            return property;
+        }
+
+        @Override
+        public Property lookupProperty(String s) {
+            return (Property) desc.getProperties().get(s);
+        }
+
+        @Override
+        public Property removeProperty(String s) {
+            Property property = lookupProperty(s);
+            desc.getProperties().remove(s);
+            return property;
+        }
+
+        @Override
+        public Property removeProperty(Property property) {
+            return removeProperty(property.getName());
+        }
+
         @Override
         public Property getProperty(String name) {
             return new MailSessionProperty(name, desc.getProperty(name));

appserver/extras/embedded/build.xml

@@ -40,7 +40,7 @@
     holder.
 
 -->
-<!-- Portions Copyright [2016-2017] [Payara Foundation] -->
+<!-- Portions Copyright [2016-2017] [Payara Foundation and/or its affiliates] -->
 
 <project name="glassfish-embedded-all" default="create.distribution" basedir=".">
     <property name="rootdir" value="target"/>
@@ -88,16 +88,7 @@
             </fileset>
         </unzip>
 
-	<mkdir dir="${rootdir}/temp"/>
-
-        <!-- Massage Bean Validation -->
-        <mkdir dir="${rootdir}/beanvtemp" />
-        <unzip dest="${rootdir}/beanvtemp">
-            <fileset file="${modulesdir}/bean-validator.jar"/>
-        </unzip>
-        <delete file="${modulesdir}/bean-validator.jar"/>
-        <delete dir="${rootdir}/beanvtemp/org/jboss/logging"/>
-        <jar basedir="${rootdir}/beanvtemp" destfile="${modulesdir}/bean-validator.jar"/>
+    	<mkdir dir="${rootdir}/temp"/>
      </target>
 
      <target name="removeJarsNotNeeded">

appserver/extras/javaee/manifest-jar/pom.xml

@@ -40,6 +40,7 @@
     holder.
 
 -->
+<!-- Portions Copyright [2017] [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>
@@ -58,7 +59,7 @@
                 <configuration>
                     <archive>
 	                <manifestEntries>
-				<Class-Path>../modules/javax.servlet-api.jar ../modules/endorsed/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/javax.security.auth.message-api.jar ../modules/javax.security.jacc-api.jar ../modules/webservices-osgi.jar ../modules/jaxb-osgi.jar ../modules/endorsed/jaxb-api.jar ../modules/endorsed/webservices-api-osgi.jar ../modules/javax.xml.rpc-api.jar ../modules/javax.xml.registry-api.jar ../modules/javax.mail.jar ../modules/javax.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/bean-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/endorsed/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/javax.security.auth.message-api.jar ../modules/javax.security.jacc-api.jar ../modules/webservices-osgi.jar ../modules/jaxb-osgi.jar ../modules/endorsed/jaxb-api.jar ../modules/endorsed/webservices-api-osgi.jar ../modules/javax.xml.rpc-api.jar ../modules/javax.xml.registry-api.jar ../modules/javax.mail.jar ../modules/javax.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-payara-p1.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>
 	                    <GlassFish-ServerExcluded>true</GlassFish-ServerExcluded>
 	                </manifestEntries>
                     </archive>

appserver/extras/payara-micro/payara-micro-microprofile-distribution/pom.xml

@@ -153,8 +153,25 @@
             <artifactId>asm-all-repackaged</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.hk2.external</groupId>
-            <artifactId>bean-validator</artifactId>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>${hibernate.validator.version}</version>
+            <classifier>payara-p1</classifier>
+        </dependency>
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>${javax.validation.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml</groupId>
+            <artifactId>classmate</artifactId>
+            <version>${classmate.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging</artifactId>
+            <version>${jboss.logging.version}</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.hk2.external</groupId>
@@ -686,8 +703,10 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.hk2.external</groupId>
-            <artifactId>bean-validator-cdi</artifactId>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator-cdi</artifactId>
+            <version>${hibernate.validator.version}</version>
+            <classifier>payara-p1</classifier>
         </dependency>
         <dependency>
             <groupId>javax.enterprise</groupId>