Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate Weld 5.0.0-Beta1 #23809

Merged
merged 2 commits into from
Feb 18, 2022
Merged

Integrate Weld 5.0.0-Beta1 #23809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f8134d
Integrate Expressly
arjantijms Feb 18, 2022
6d2deca
Integrate Weld 5.0.0-Beta1
arjantijms Feb 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions appserver/admin/admin-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
</dependency>
<!-- Dependency of Hibernate Validator -->
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion appserver/admin/template/src/main/resources/config/default-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@
<param-value>
/lib/
\lib\
jakarta.el.jar
expressly.jar
jakarta.el-api.jar
jakarta.servlet-api.jar
jakarta.servlet.jsp-api.jar
Expand Down
4 changes: 2 additions & 2 deletions appserver/admingui/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
<artifactId>jakarta.el-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
Expand Down
4 changes: 2 additions & 2 deletions appserver/connectors/admin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions appserver/extras/embedded/all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1549,8 +1549,8 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1051,8 +1051,8 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions appserver/extras/embedded/web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1005,8 +1005,8 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion appserver/extras/javaee/manifest-jar/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<configuration>
<archive>
<manifestEntries>
<Class-Path>../modules/jakarta.servlet-api.jar ../modules/jakarta.annotation-api.jar ../modules/jakarta.ejb-api.jar ../modules/jakarta.transaction-api.jar ../modules/jakarta.resource-api.jar ../modules/jakarta.authentication-api.jar ../modules/jakarta.authorization-api.jar ../modules/jakarta.xml.bind-api.jar ../modules/webservices-api-osgi.jar ../modules/jakarta.mail-api.jar ../modules/jakarta.activation-api.jar ../modules/jakarta.faces.jar ../modules/jakarta.servlet.jsp-api.jar ../modules/jakarta.el.jar ../modules/jakarta.el-api.jar ../modules/jakarta.servlet.jsp.jstl-api.jar ../modules/jakarta.persistence-api.jar ../modules/jakarta.jms-api.jar ../modules/hibernate-validator.jar ../modules/jakarta.validation-api.jar ../modules/cdi-api.jar ../modules/jakarta.ws.rs-api.jar ../modules/jakarta.json.jar ../modules/jakarta.json.bind-api.jar ../modules/jakarta.websocket-api.jar ../modules/jakarta.enterprise.concurrent-api.jar ../modules/jakarta.batch-api.jar ../modules/jakarta.inject-api.jar</Class-Path>
<Class-Path>../modules/jakarta.servlet-api.jar ../modules/jakarta.annotation-api.jar ../modules/jakarta.ejb-api.jar ../modules/jakarta.transaction-api.jar ../modules/jakarta.resource-api.jar ../modules/jakarta.authentication-api.jar ../modules/jakarta.authorization-api.jar ../modules/jakarta.xml.bind-api.jar ../modules/webservices-api-osgi.jar ../modules/jakarta.mail-api.jar ../modules/jakarta.activation-api.jar ../modules/jakarta.faces.jar ../modules/jakarta.servlet.jsp-api.jar ../modules/expressly.jar ../modules/jakarta.el-api.jar ../modules/jakarta.servlet.jsp.jstl-api.jar ../modules/jakarta.persistence-api.jar ../modules/jakarta.jms-api.jar ../modules/hibernate-validator.jar ../modules/jakarta.validation-api.jar ../modules/cdi-api.jar ../modules/jakarta.ws.rs-api.jar ../modules/jakarta.json.jar ../modules/jakarta.json.bind-api.jar ../modules/jakarta.websocket-api.jar ../modules/jakarta.enterprise.concurrent-api.jar ../modules/jakarta.batch-api.jar ../modules/jakarta.inject-api.jar</Class-Path>
<GlassFish-ServerExcluded>true</GlassFish-ServerExcluded>
</manifestEntries>
</archive>
Expand Down
4 changes: 2 additions & 2 deletions appserver/featuresets/web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1158,8 +1158,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand Down
4 changes: 2 additions & 2 deletions appserver/jdbc/admin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
<scope>test</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions appserver/jdbc/jdbc-runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions appserver/orb/orb-connector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
22 changes: 11 additions & 11 deletions appserver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@

<!-- CDI -->
<cdi-api.version>4.0.0.Beta3</cdi-api.version>
<weld.version>5.0.0.Alpha2</weld.version>
<weld.version>5.0.0.Beta1</weld.version>
<jboss.classfilewriter.version>1.2.5.Final</jboss.classfilewriter.version>

<!-- Jakarta MVC -->
Expand Down Expand Up @@ -373,11 +373,11 @@
<version>${hibernate-validator.version}</version>
</dependency>

<!-- Jakarta Expression Language Impl -->
<!-- Expressly - Jakarta Expression Language Impl -->
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<version>${jakarta.el.version}</version>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
<version>${expressly.version}</version>
</dependency>

<!-- Jakarta Enterprise beans -->
Expand Down Expand Up @@ -937,15 +937,15 @@
</spec>
<spec>
<artifact>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<version>${jakarta.el.version}</version>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
<version>${expressly.version}</version>
</artifact>
<jarType>impl</jarType>
<specVersion>3.0</specVersion>
<implVersion>3.0.0</implVersion>
<specVersion>5.0</specVersion>
<implVersion>5.0.0</implVersion>
<apiPackage>jakarta.el</apiPackage>
<implNamespace>com.sun.el</implNamespace>
<implNamespace>org.glassfish.expressly</implNamespace>
</spec>
<spec>
<artifact>
Expand Down
4 changes: 2 additions & 2 deletions appserver/resources/mail/mail-connector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions appserver/resources/resources-connector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions appserver/tests/appserv-tests/devtests/web/elBigDecimal/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<target name="compile">
<javac
srcdir="."
classpath="${env.APS_HOME}/lib/reportbuilder.jar;${env.S1AS_HOME}/modules/jakarta.el.jar;${env.S1AS_HOME}/modules/jakarta.el-api.jar"
classpath="${env.APS_HOME}/lib/reportbuilder.jar;${env.S1AS_HOME}/modules/expressly.jar;${env.S1AS_HOME}/modules/jakarta.el-api.jar"
includes="WebTest.java"/>

</target>
Expand All @@ -46,7 +46,7 @@
<java classname="WebTest" fork="true">
<classpath>
<pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/jakarta.el.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/expressly.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/jakarta.el-api.jar"/>
<pathelement location="."/>
</classpath>
Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/tck/faces/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@
<tck-setting key="impl.vi.deploy.dir" value="${webServerHome}/domains/domain1/autodeploy"/>
<tck-setting key="impl.deploy.timeout.multiplier" value="960"/>

<tck-setting key="jsf.classes" value="${webServerHome}/modules/cdi-api.jar;${webServerHome}/modules/jakarta.servlet.jsp.jstl-api.jar;${webServerHome}/modules/jakarta.inject.jar;${webServerHome}/modules/jakarta.faces.jar;${webServerHome}/modules/jakarta.servlet.jsp-api.jar;${webServerHome}/modules/jakarta.servlet-api.jar;${webServerHome}/modules/jakarta.el.jar"/>
<tck-setting key="jsf.classes" value="${webServerHome}/modules/cdi-api.jar;${webServerHome}/modules/jakarta.servlet.jsp.jstl-api.jar;${webServerHome}/modules/jakarta.inject.jar;${webServerHome}/modules/jakarta.faces.jar;${webServerHome}/modules/jakarta.servlet.jsp-api.jar;${webServerHome}/modules/jakarta.servlet-api.jar;${webServerHome}/modules/expressly.jar"/>

<limit maxwait="60">
<exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
Expand Down
4 changes: 2 additions & 2 deletions appserver/web/war-util/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
<artifactId>jakarta.el-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
Expand Down
4 changes: 2 additions & 2 deletions appserver/web/web-glue/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@
<artifactId>jakarta.el-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.main.admin</groupId>
Expand Down
46 changes: 4 additions & 42 deletions ...ver/web/weld-integration/src/main/java/org/glassfish/weld/services/ProxyServicesImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, 2018-2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2022 Contributors to the Eclipse Foundation
* Copyright (c) 2010, 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
Expand All @@ -17,16 +17,14 @@

package org.glassfish.weld.services;

import com.sun.ejb.codegen.ClassGenerator;

import java.security.AccessController;
import java.security.PrivilegedAction;
import java.security.PrivilegedExceptionAction;
import java.security.ProtectionDomain;

import org.glassfish.hk2.api.ServiceLocator;
import org.glassfish.internal.api.ClassLoaderHierarchy;
import org.jboss.weld.serialization.spi.ProxyServices;

import com.sun.ejb.codegen.ClassGenerator;

/**
* An implementation of the {@link ProxyServices}.
* <p>
Expand All @@ -52,42 +50,6 @@ public ProxyServicesImpl(final ServiceLocator services) {
classLoaderHierarchy = services.getService(ClassLoaderHierarchy.class);
}


@Deprecated
@Override
public boolean supportsClassDefining() {
// true is mandatory since Weld 4.0.1.SP1, because default method impl returns false
// and cdi_all tests then fail
return true;
}


@Deprecated
@Override
public ClassLoader getClassLoader(final Class<?> proxiedBeanType) {
if (System.getSecurityManager() == null) {
return getClassLoaderforBean(proxiedBeanType);
}
final PrivilegedAction<ClassLoader> action = () -> getClassLoaderforBean(proxiedBeanType);
return AccessController.doPrivileged(action);
}


@Deprecated
@Override
public Class<?> loadBeanClass(final String className) {
try {
if (System.getSecurityManager() == null) {
return loadClassByThreadCL(className);
}
final PrivilegedExceptionAction<Class<?>> action = () -> loadClassByThreadCL(className);
return AccessController.doPrivileged(action);
} catch (final Exception ex) {
throw new WeldProxyException("Failed to load the bean class: " + className, ex);
}
}


@Override
public Class<?> defineClass(final Class<?> originalClass, final String className, final byte[] classBytes,
final int off, final int len) throws ClassFormatError {
Expand Down
4 changes: 2 additions & 2 deletions nucleus/admin/config-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions nucleus/admin/rest/rest-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions nucleus/core/kernel/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,8 @@
</dependency>
<!-- Dependency of Hibernate Validator -->
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
<scope>test</scope>
</dependency>
<!-- Required by the cluster replication despite we don't do any - ConfigAttributeSetTest fails without it -->
Expand Down
2 changes: 1 addition & 1 deletion nucleus/distributions/nucleus-common/src/main/resources/bin/jspc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
AS_INSTALL=`dirname $0`/..
AS_INSTALL_LIB=$AS_INSTALL/modules
JSP_IMPL=$AS_INSTALL_LIB/wasp.jar
EL_IMPL=$AS_INSTALL_LIB/jakarta.el.jar:$AS_INSTALL_LIB/jakarta.el-api.jar
EL_IMPL=$AS_INSTALL_LIB/expressly:$AS_INSTALL_LIB/jakarta.el-api.jar
JSTL_IMPL=$AS_INSTALL_LIB/jakarta.servlet.jsp.jstl.jar
AS_LIB=$AS_INSTALL/lib
JAVAEE_API=$AS_LIB/javaee.jar
Expand Down
2 changes: 1 addition & 1 deletion nucleus/distributions/nucleus-common/src/main/resources/bin/jspc.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ REM

set AS_INSTALL_LIB=%~dp0..\modules
set JSP_IMPL=%AS_INSTALL_LIB%\wasp.jar
set EL_IMPL=%AS_INSTALL_LIB%\jakarta.el.jar;%AS_INSTALL_LIB%\jakarta.el-api.jar
set EL_IMPL=%AS_INSTALL_LIB%\expressly;%AS_INSTALL_LIB%\jakarta.el-api.jar
set JSTL_IMPL=%AS_INSTALL_LIB%\jakarta.servlet.jsp.jstl.jar
set AS_LIB=%~dp0..\lib
set JAVAEE_API=%AS_LIB%\javaee.jar
Expand Down
4 changes: 2 additions & 2 deletions nucleus/featuresets/atomic/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,8 +380,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand Down
4 changes: 2 additions & 2 deletions nucleus/hk2/hk2-config/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Loading