PAYARA-1402-Upgrade-HK2-to-2.5.0

payara · Feb 27, 2017 · 7c79dad · 7c79dad
1 parent 6c10c85
commit 7c79dad
Show file tree

Hide file tree

Showing 34 changed files with 491 additions and 48 deletions.
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
@@ -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.jar
         javax.ejb.jar
         javax.enterprise.deploy-api.jar
         javax.jms-api.jar

diff --git a/appserver/admin/payara_template/src/main/resources/config/default-web.xml b/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.jar
         javax.ejb.jar
         javax.enterprise.deploy-api.jar
         javax.jms-api.jar

diff --git a/.../main/java/com/sun/enterprise/resource/deployer/AdministeredObjectDefinitionDeployer.java b/.../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,26 @@ public List<Property> getProperty() {
             return administeredObjectProperties;
         }
 
+        @Override
+        public Property addProperty(Property property) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Property lookupProperty(String s) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Property removeProperty(String s) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Property removeProperty(Property property) {
+            throw new UnsupportedOperationException();
+        }
+
         public Property getProperty(String name) {
             String value = desc.getProperty(name);
             return new AdministeredObjectProperty(name, value);

diff --git a/...c/main/java/com/sun/enterprise/resource/deployer/ConnectionFactoryDefinitionDeployer.java b/...c/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) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Property lookupProperty(String s) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Property removeProperty(String s) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Property removeProperty(Property property) {
+            throw new UnsupportedOperationException();
+        }
+
         public Property getProperty(String name) {
             return null;
         }
@@ -638,7 +659,27 @@ public List<Property> getProperty() {
 
             return connectionFactoryProperties;
         }
-
+
+        @Override
+        public Property addProperty(Property property) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Property lookupProperty(String s) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Property removeProperty(String s) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Property removeProperty(Property property) {
+            throw new UnsupportedOperationException();
+        }
+
 
         public Property getProperty(String name) {
             String value = desc.getProperty(name);

diff --git a/...ain/java/com/sun/enterprise/resource/deployer/JMSConnectionFactoryDefinitionDeployer.java b/...ain/java/com/sun/enterprise/resource/deployer/JMSConnectionFactoryDefinitionDeployer.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;
 
@@ -306,6 +307,26 @@ public List<Property> getProperty() {
             return null;
         }
 
+        @Override
+        public Property addProperty(Property property) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Property lookupProperty(String s) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Property removeProperty(String s) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Property removeProperty(Property property) {
+            return null;
+        }
+
         public Property getProperty(String name) {
             return null;
         }
@@ -678,6 +699,26 @@ public List<Property> getProperty() {
             return jmsConnectionFactoryProperties;
         }
 
+        @Override
+        public Property addProperty(Property property) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Property lookupProperty(String s) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Property removeProperty(String s) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Property removeProperty(Property property) {
+            throw new UnsupportedOperationException();
+        }
+
         public Property getProperty(String name) {
             String value = desc.getProperty(name);
             return new JMSConnectionFactoryProperty(name, value);

diff --git a/.../src/main/java/com/sun/enterprise/resource/deployer/JMSDestinationDefinitionDeployer.java b/.../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,26 @@ public List<Property> getProperty() {
             return jmsDestinationProperties;
         }
 
+        @Override
+        public Property addProperty(Property property) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Property lookupProperty(String s) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Property removeProperty(String s) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Property removeProperty(Property property) {
+            throw new UnsupportedOperationException();
+        }
+
         public Property getProperty(String name) {
             String value = desc.getProperty(name);
             return new JMSDestinationProperty(name, value);

diff --git a/...ctors-runtime/src/main/java/com/sun/enterprise/resource/deployer/MailSessionDeployer.java b/...ctors-runtime/src/main/java/com/sun/enterprise/resource/deployer/MailSessionDeployer.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;
 
@@ -518,6 +519,26 @@ public List<Property> getProperty() {
             return props;
         }
 
+        @Override
+        public Property addProperty(Property property) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Property lookupProperty(String s) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Property removeProperty(String s) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Property removeProperty(Property property) {
+            throw new UnsupportedOperationException();
+        }
+
         @Override
         public Property getProperty(String name) {
             return new MailSessionProperty(name, desc.getProperty(name));

diff --git a/appserver/extras/embedded/build.xml b/appserver/extras/embedded/build.xml
@@ -40,7 +40,7 @@
     holder.
 
 -->
-<!-- Portions Copyright [2016] [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">

diff --git a/appserver/extras/javaee/manifest-jar/pom.xml b/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.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>

diff --git a/appserver/extras/payara-micro/payara-micro-microprofile-distribution/pom.xml b/appserver/extras/payara-micro/payara-micro-microprofile-distribution/pom.xml
@@ -112,8 +112,24 @@
             <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>
+        </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>
@@ -645,8 +661,9 @@
             <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>
         </dependency>
         <dependency>
             <groupId>javax.enterprise</groupId>