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

FISH-5829 FISH-5830 GMBAL 4.0.3 and PFL 4.1.2 #5482

Merged
merged 3 commits into from
Nov 3, 2021
+17 −19
Merged

FISH-5829 FISH-5830 GMBAL 4.0.3 and PFL 4.1.2 #5482

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4d10c4
FISH-5829 FISH-5830 Gmbal 4.0.3 & PFL 4.1.2
Pandrex247 Nov 1, 2021
bd44541
FISH-5829 Add GMBAL property
Pandrex247 Nov 2, 2021
795e1ef
FISH-5829 FISH-5830 Copyright
Pandrex247 Nov 3, 2021
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
2 changes: 2 additions & 0 deletions appserver/admin/gf_template/src/main/resources/config/domain.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,7 @@
<thread-pool name="http-thread-pool" max-queue-size="4096"></thread-pool>
<thread-pool name="thread-pool-1" max-thread-pool-size="200" />
</thread-pools>
<system-property name="org.glassfish.gmbal.no.multipleUpperBoundsException" value="true"/>
</config>
<config name="default-config" dynamic-reconfiguration-enabled="true">
<payara-executor-service-configuration />
Expand Down Expand Up @@ -581,6 +582,7 @@
<system-property name="OSGI_SHELL_TELNET_PORT" value="26666" />
<system-property name="JAVA_DEBUGGER_PORT" value="29009" />
<system-property name="HZ_LISTENER_PORT" value="5900" />
<system-property name="org.glassfish.gmbal.no.multipleUpperBoundsException" value="true"/>
</config>
</configs>
<property name="administrative.domain.name" value="%%%DOMAIN_NAME%%%" />
Expand Down
2 changes: 2 additions & 0 deletions appserver/admin/gf_template_web/src/main/resources/config/domain.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@
<thread-pool name="http-thread-pool" max-queue-size="4096"></thread-pool>
<thread-pool name="thread-pool-1" max-thread-pool-size="200" />
</thread-pools>
<system-property name="org.glassfish.gmbal.no.multipleUpperBoundsException" value="true"/>
</config>
<config name="default-config" dynamic-reconfiguration-enabled="true">
<http-service>
Expand Down Expand Up @@ -571,6 +572,7 @@
<system-property name="OSGI_SHELL_TELNET_PORT" value="26666" />
<system-property name="JAVA_DEBUGGER_PORT" value="29009" />
<system-property name="HZ_LISTENER_PORT" value="5900" />
<system-property name="org.glassfish.gmbal.no.multipleUpperBoundsException" value="true"/>
</config>
</configs>
<property name="administrative.domain.name" value="%%%DOMAIN_NAME%%%" />
Expand Down
2 changes: 2 additions & 0 deletions appserver/admin/production_domain_template/src/main/resources/config/domain.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@
<system-property name="jersey.config.client.connectTimeout" value="300000" />
<system-property name="org.jboss.weld.clustering.rollingUpgradesIdDelimiter" value=".." />
<system-property name="org.jboss.weld.probe.allowRemoteAddress" value="127.0.0.1|::1|::1%.+|0:0:0:0:0:0:0:1|0:0:0:0:0:0:0:1%.+" />
<system-property name="org.glassfish.gmbal.no.multipleUpperBoundsException" value="true"/>
</config>

<config name="default-config" dynamic-reconfiguration-enabled="true">
Expand Down Expand Up @@ -507,6 +508,7 @@
<system-property name="HZ_LISTENER_PORT" value="5900" />
<system-property name="fish.payara.classloading.delegate" value="false" />
<system-property name="org.jboss.weld.clustering.rollingUpgradesIdDelimiter" value=".." />
<system-property name="org.glassfish.gmbal.no.multipleUpperBoundsException" value="true"/>
</config>
</configs>

Expand Down
2 changes: 2 additions & 0 deletions appserver/admin/production_domain_template_web/src/main/resources/config/domain.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@
<system-property name="jersey.config.client.connectTimeout" value="300000" />
<system-property name="org.jboss.weld.clustering.rollingUpgradesIdDelimiter" value=".." />
<system-property name="org.jboss.weld.probe.allowRemoteAddress" value="127.0.0.1|::1|::1%.+|0:0:0:0:0:0:0:1|0:0:0:0:0:0:0:1%.+" />
<system-property name="org.glassfish.gmbal.no.multipleUpperBoundsException" value="true"/>
</config>
<config name="default-config" dynamic-reconfiguration-enabled="true">
<http-service>
Expand Down Expand Up @@ -523,6 +524,7 @@
<system-property name="HZ_LISTENER_PORT" value="5900" />
<system-property name="fish.payara.classloading.delegate" value="false" />
<system-property name="org.jboss.weld.clustering.rollingUpgradesIdDelimiter" value=".." />
<system-property name="org.glassfish.gmbal.no.multipleUpperBoundsException" value="true"/>
</config>
</configs>
<property name="administrative.domain.name" value="%%%DOMAIN_NAME%%%" />
Expand Down
4 changes: 0 additions & 4 deletions appserver/orb/orb-iiop/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,6 @@
<groupId>org.glassfish.pfl</groupId>
<artifactId>pfl-dynamic</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.pfl</groupId>
<artifactId>pfl-asm</artifactId>
</dependency>
<dependency>
<groupId>fish.payara.server.internal.orb</groupId>
<artifactId>orb-connector</artifactId>
Expand Down
7 changes: 5 additions & 2 deletions ...min/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/CompositeUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,12 @@
* only if the new code is made subject to such option by the copyright
* holder.
*/
//Portions Copyright [2016-2019] [Payara Foundation and/or affiliates]
//Portions Copyright [2016-2021] [Payara Foundation and/or affiliates]
package org.glassfish.admin.rest.composite;

import com.sun.enterprise.util.LocalStringManagerImpl;
import com.sun.enterprise.admin.report.ActionReporter;

import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
Expand Down Expand Up @@ -84,6 +85,7 @@
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;

import org.glassfish.admin.rest.RestExtension;
import org.glassfish.admin.rest.RestLogging;
import org.glassfish.admin.rest.composite.metadata.AttributeReference;
Expand All @@ -106,7 +108,8 @@
import org.glassfish.internal.api.Globals;
import org.glassfish.jersey.media.sse.EventOutput;

import static org.glassfish.pfl.objectweb.asm.Opcodes.*;
import static org.objectweb.asm.Opcodes.*;

import org.jvnet.hk2.config.Attribute;
import org.jvnet.hk2.config.MessageInterpolatorImpl;

Expand Down
5 changes: 0 additions & 5 deletions nucleus/packager/nucleus-corba-base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,6 @@
<groupId>org.glassfish.corba</groupId>
<artifactId>glassfish-corba-internal-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.pfl</groupId>
<artifactId>pfl-asm</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.glassfish.pfl</groupId>
<artifactId>pfl-basic</artifactId>
Expand Down
9 changes: 2 additions & 7 deletions nucleus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@
<trilead-ssh2.version>build-217-jenkins-16</trilead-ssh2.version>

<!-- Primitive Function Library (PFL); a library of simple utilities used by Glassfish -->
<pfl.version>4.0.2.payara-p1</pfl.version>
<pfl.version>4.1.2</pfl.version>
<!-- GlassFish MBean Annotation Library -->
<gmbal.version>4.0.0</gmbal.version>
<gmbal.version>4.0.3</gmbal.version>
<antlr.version>2.7.7</antlr.version>

<commons-io.version>2.11.0</commons-io.version>
Expand Down Expand Up @@ -864,11 +864,6 @@ Parent is ${project.parent}</echo>
<artifactId>pfl-basic-tools</artifactId>
<version>${pfl.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.pfl</groupId>
<artifactId>pfl-asm</artifactId>
<version>${pfl.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.pfl</groupId>
<artifactId>pfl-tf</artifactId>
Expand Down