Merge pull request #23555 from dmatej/reverted-security-core
Revert "Additional other small cleanups - add missing @Override etc"
diff --git a/appserver/appclient/client/acc-standalone/fixup.xml b/appserver/appclient/client/acc-standalone/fixup.xml
deleted file mode 100644
index 5244620..0000000
--- a/appserver/appclient/client/acc-standalone/fixup.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
- Copyright (c) 2010, 2020 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
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="glassfish v3, app client library fix-up" default="fixup.library" basedir=".">
- <property name="mq.dir.path" value="../../mq"/>
- <property name="mq.lib" value="${mq.dir.path}/lib"/>
- <property name="jmsra.apps.dir" value="../lib/install/applications/jmsra"/>
- <property name="mq.classpath.additions" value="${mq.lib}/imq.jar ${mq.lib}/imqadmin.jar ${mq.lib}/imqutil.jar ${mq.lib}/fscontext.jar ${jmsra.apps.dir}/imqjmsra.jar"/>
-
- <property name="ds-jdbcra.classpath.additions" value="../lib/install/applications/__ds_jdbc_ra/__ds_jdbc_ra.jar"/>
- <property name="cp-jdbcra.classpath.additions" value="../lib/install/applications/__cp_jdbc_ra/__cp_jdbc_ra.jar"/>
- <property name="xa-jdbcra.classpath.additions" value="../lib/install/applications/__xa_jdbc_ra/__xa_jdbc_ra.jar"/>
- <property name="dm-jdbcra.classpath.additions" value="../lib/install/applications/__dm_jdbc_ra/__dm_jdbc_ra.jar"/>
- <property name="derby.jar.classpath.additions" value="../../javadb/lib/derby.jar ../../javadb/lib/derbyclient.jar ../../javadb/lib/derbynet.jar ../../javadb/lib/derbytools.jar ../../javadb/lib/derbyrun.jar"/>
- <property name="jaxr-ra.classpath.additions" value="../lib/install/applications/jaxr-ra/jaxr-ra.jar"/>
- <property name="resources-runtime.classpath.additions" value="../modules/resources-runtime.jar"/>
- <property name="mail-connector.classpath.additions" value="../modules/mail-connector.jar"/>
- <property name="mail-runtime.classpath.additions" value="../modules/mail-runtime.jar"/>
- <property name="jdbc-runtime.classpath.additions" value="../modules/jdbc-runtime.jar"/>
- <property name="jdbc-config.classpath.additions" value="../modules/jdbc-config.jar"/>
- <property name="aix.additions" value="../modules/aixporting-repackaged.jar"/>
- <property name="entitybean-container.additions" value="../modules/entitybean-container.jar"/>
- <property name="weld.classpath.additions" value="../modules/weld-osgi-bundle.jar"/>
-
- <property name="classpath.additions" value=" ${resources-runtime.classpath.additions} ${mail-connector.classpath.additions} ${mail-runtime.classpath.additions} ${mq.classpath.additions} ${ds-jdbcra.classpath.additions} ${cp-jdbcra.classpath.additions} ${xa-jdbcra.classpath.additions} ${dm-jdbcra.classpath.additions} ${derby.jar.classpath.additions} ${jaxr-ra.classpath.additions} ${entitybean-container.additions} ${jdbc-runtime.classpath.additions} ${jdbc-config.classpath.additions} ${weld.classpath.additions}"/>
- <property name="classpath.conditional.additions" value="${aix.additions}"/>
- <target name="fixup.library">
- <unzip src="${output.dir}/${output.file}" dest="${stage.dir}">
- <patternset>
- <include name="META-INF/MANIFEST.MF"/>
- </patternset>
- </unzip>
-
- <replace file="${classpath.file}">
- <!-- replace the colons used as path separators with blanks -->
- <replacefilter token=":" value=" "/>
-
- <!-- replace incorrect entries ../modules/x.jar for JARs that will actually reside in the
- endorsed subdirectory with ../modules/endorsed/x.jar -->
-
- <replacefilter token="../modules/weld-se-shaded.jar" value="../lib/appclient/weld-se-shaded.jar"/>
-
- <!--
- The jakarta.mail JAR will reference activation.jar, because it is
- built to work with Java SE 1.4 and later. Prior to Java SE 6
- activation was separate from the Java SE libraries and so
- mail must refer to it explicitly. But GlassFish requires
- Java SE 11 and there will be no activation.jar.
- So remove it so jar indexing (which would help
- optimize Java Web Start) will not fail due to a missing JAR.
- -->
- <!--
- As of Jakarta Mail 2.0 and Jakarta EE 9, Jakarta Mail
- references jakarta.activation.jar, which is NOT included
- in Java SE, but IS included in GlassFish, so we don't
- need to remove it here.
- <replacefilter token=" ../modules/activation.jar" value=""/>>
- -->
- </replace>
-
- <!-- define the classpath property -->
- <property file="${classpath.file}"/>
-
- <!--
- Entries in zip (and JAR) files have two-second timestamp resolution. The
- next sleep makes sure that the time stamp on the updated manifest
- file will later than the original manifest's time + two seconds;
- this make sure the zip task will actually replace the manifest
- in the JAR file.
-
- Also, the manifest task seems not to update the timestamp on the
- manifest file, so we need to explicitly touch it after updating
- the manifest.
- -->
- <sleep seconds="5"/>
- <manifest mode="update" file="${stage.dir}/META-INF/MANIFEST.MF">
- <attribute name="Class-Path" value="${classpath} ${classpath.additions} ${classpath.conditional.additions}"/>
- <attribute name="GlassFish-Conditional-Additions" value="${classpath.conditional.additions}"/>
- </manifest>
- <touch file="${stage.dir}/META-INF/MANIFEST.MF"/>
-
- <!-- Update the JAR file with the revised manifest -->
- <zip destfile="${output.dir}/${output.file}" basedir="${stage.dir}" update="true" includes="META-INF/MANIFEST.MF"/>
- <echo>Manifest Class-Path updated</echo>
- </target>
-</project>
diff --git a/appserver/appclient/client/acc-standalone/pom.xml b/appserver/appclient/client/acc-standalone/pom.xml
index ac6def8..0dc8c7f 100755
--- a/appserver/appclient/client/acc-standalone/pom.xml
+++ b/appserver/appclient/client/acc-standalone/pom.xml
@@ -17,21 +17,10 @@
-->
-<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/xsd/maven-4.0.0.xsd"><!--
- This module builds the free-standing JAR file for the app client
- container which can be run without using an OSGi implementation.
-
- This module contains little source of its own but mostly packages a JAR
- with a manifest Class-Path that specifies all the OSGi JARs on which
- it directly or indirectly depends.
-
- Note that additional JARs which clients might need but which are not
- declared as dependencies are added by updating the generated manifest's
- Class-Path using some ant tasks. The nicer way to do this would be to
- create a custom plug-in which would delegate most of the work to the
- archiver but would augment the generated Class-Path with the extra JARs.
- Perhaps later.
- -->
+<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/xsd/maven-4.0.0.xsd"
+>
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -44,7 +33,15 @@
<artifactId>gf-client</artifactId>
<packaging>glassfish-jar</packaging>
- <name>Client library (including ACC)</name>
+ <name>Client Library (including ACC)</name>
+ <description>
+ This module builds the free-standing JAR file for the app client
+ container which can be run without using an OSGi implementation.
+
+ This module contains little source of its own but mostly packages a JAR
+ with a manifest Class-Path that specifies all the OSGi JARs on which
+ it directly or indirectly depends.
+ </description>
<developers>
<developer>
@@ -60,114 +57,99 @@
</developers>
<properties>
- <classpath.file>${project.build.directory}/tmp/classpath.txt</classpath.file>
- <!--
- Property settings used for adding parts to the Class-Path used to
- be defined here. They are now in the fixup.xml file instead so
- the pom is less changeable.
- -->
+ <path.apps>../lib/install/applications</path.apps>
+ <path.appclient>../lib/appclient</path.appclient>
+ <path.derby>../../javadb/lib</path.derby>
+ <path.mq>../../mq/lib</path.mq>
+
+ <classpath.derby>${path.derby}/derby.jar ${path.derby}/derbyclient.jar ${path.derby}/derbynet.jar ${path.derby}/derbytools.jar ${path.derby}/derbyrun.jar</classpath.derby>
+ <classpath.jaxrra>${path.apps}/jaxr-ra/jaxr-ra.jar</classpath.jaxrra>
+ <classpath.jdbcra>${path.apps}/__ds_jdbc_ra/__ds_jdbc_ra.jar ${path.apps}/__cp_jdbc_ra/__cp_jdbc_ra.jar ${path.apps}/__xa_jdbc_ra/__xa_jdbc_ra.jar ${path.apps}/__dm_jdbc_ra/__dm_jdbc_ra.jar</classpath.jdbcra>
+ <classpath.mq>${path.mq}/imq.jar ${path.mq}/imqadmin.jar ${path.mq}/imqutil.jar ${path.mq}/fscontext.jar ${path.apps}/jmsra/imqjmsra.jar</classpath.mq>
+ <classpath.weld>${path.appclient}/weld-se-shaded.jar</classpath.weld>
+
+ <classpath.additions>${classpath.mq} ${classpath.derby} ${classpath.jaxrra} ${classpath.jdbcra} ${classpath.weld}</classpath.additions>
</properties>
<dependencies>
- <!--
- We specify the ACC's OSGi JAR as a dependency.
- The maven-jar-plugin will do the work of finding the transitive
- closure of it and the modules on which it depends to build the
- accurate Class-Path for the manifest.
- -->
+ <!-- Dependencies are used just to generate the Class-Path attribute of the manifest -->
<dependency>
<groupId>org.glassfish.main.appclient</groupId>
<artifactId>gf-client-module</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <!-- weld-se-shaded has an explicit path, would cause redundant line -->
+ <groupId>org.jboss.weld.se</groupId>
+ <artifactId>weld-se-shaded</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.glassfish.main.jdbc</groupId>
+ <artifactId>jdbc-runtime</artifactId>
+ <version>${project.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.main.resources</groupId>
+ <artifactId>resources-runtime</artifactId>
+ <version>${project.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.main.persistence</groupId>
+ <artifactId>entitybean-container</artifactId>
+ <version>${project.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-osgi-bundle</artifactId>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
<build>
<plugins>
- <!--
- Create a text file containing the generated class path. This
- file is used in the ant tasks when the original Class-Path is
- augmented. Note: we force the path separator to be a colon
- because the plug-in will use the platform-specific separator
- otherwise. The ant logic replaces colons with spaces to
- reformat the contents of the file so it's useful in the manifest.
- -->
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-classpath-file</id>
- <phase>process-sources</phase>
- <goals>
- <goal>build-classpath</goal>
- </goals>
- <configuration>
- <outputFile>${classpath.file}</outputFile>
- <outputFilterFile>true</outputFilterFile>
- <pathSeparator>:</pathSeparator>
- <fileSeparator>/</fileSeparator>
- <prefix>../modules</prefix>
- <stripVersion>true</stripVersion>
- <excludeArtifactIds>jakarta.json</excludeArtifactIds>
- <excludeArtifactIds>jakarta.inject</excludeArtifactIds>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
-
- <!--
- Includes only the agent class. All the rest are in
- the OSGi module.
- -->
-
- <archive>
-
-<!-- We need the index eventually but until the plug-in itself knows the correct
-classpath we must comment this out, or else the index reflects nothing in
-this or the downstream JARs and so attempts to find things fail.
-
- <index>true</index>
--->
- <manifest>
- <mainClass>org.glassfish.appclient.client.AppClientFacade</mainClass>
- <packageName>org.glassfish.appclient.client.acc</packageName>
- <addClasspath>true</addClasspath>
- <classpathLayoutType>custom</classpathLayoutType>
- <customClasspathLayout>../modules/$${artifact.artifactId}$${dashClassifier?}.$${artifact.extension}</customClasspathLayout>
- </manifest>
- <manifestEntries>
- <PreMain-Class>org.glassfish.appclient.client.acc.agent.AppClientContainerAgent</PreMain-Class>
- <GlassFish-ServerExcluded>true</GlassFish-ServerExcluded>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>fixup-jar-classpath</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <property name="output.file" value="${project.build.finalName}.jar" />
- <property name="output.dir" value="${project.build.directory}" />
- <property name="stage.dir" value="${project.build.directory}/stage" />
- <property name="classpath.file" value="${classpath.file}" />
- <ant antfile="${basedir}/fixup.xml" />
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>false</addClasspath>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>org.glassfish.appclient.client.AppClientFacade</mainClass>
+ <packageName>org.glassfish.appclient.client.acc</packageName>
+ <addClasspath>true</addClasspath>
+ <classpathPrefix>../modules/</classpathPrefix>
+ <classpathLayoutType>custom</classpathLayoutType>
+ <customClasspathLayout>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</customClasspathLayout>
+ </manifest>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <manifestEntries>
+ <PreMain-Class>org.glassfish.appclient.client.acc.agent.AppClientContainerAgent</PreMain-Class>
+ <GlassFish-ServerExcluded>true</GlassFish-ServerExcluded>
+ <Class-Path>${classpath.additions}</Class-Path>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/AdminObjectManager.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/AdminObjectManager.java
index a26e42d..05791b6 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/AdminObjectManager.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/AdminObjectManager.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -250,7 +251,7 @@
"ConnectorRuntime for resource adapter.", cre);
String msg = localStrings.getLocalString(
"admin.mbeans.rmb.ao_intf_impl_check_failed",
- "Could not determine admin object resource information of Resource Adapter [ {0} ] for" +
+ "Could not determine admin object resource information of Resource Adapter [ {0} ] for " +
"resType [ {1} ] and classname [ {2} ] ",
raName, resType, className) + " " + cre.getLocalizedMessage();
return new ResourceStatus(ResourceStatus.FAILURE, msg);
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteAdminObject.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteAdminObject.java
index 04bd360..5f8d85e 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteAdminObject.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteAdminObject.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -95,7 +96,7 @@
if (domain.getConfigNamed(target)!=null) {
if (resourceUtil.getTargetsReferringResourceRef(jndiName).size() > 0) {
report.setMessage(localStrings.getLocalString("delete.admin.object.resource-ref.exist",
- "admin-object [ {0} ] is referenced in an" +
+ "admin-object [ {0} ] is referenced in an " +
"instance/cluster target, Use delete-resource-ref on appropriate target",
jndiName));
report.setActionExitCode(ActionReport.ExitCode.FAILURE);
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorResource.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorResource.java
index d45b5aa..9708590 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorResource.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorResource.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -114,7 +115,7 @@
if ("domain".equals(target)) {
if (resourceUtil.getTargetsReferringResourceRef(jndiName).size() > 0) {
report.setMessage(localStrings.getLocalString("delete.connector.resource.resource-ref.exist",
- "connector-resource [ {0} ] is referenced in an" +
+ "connector-resource [ {0} ] is referenced in an " +
"instance/cluster target, Use delete-resource-ref on appropriate target",
jndiName));
report.setActionExitCode(ActionReport.ExitCode.FAILURE);
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorWorkSecurityMaps.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorWorkSecurityMaps.java
index 0df1655..cd9bec6 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorWorkSecurityMaps.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorWorkSecurityMaps.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -94,7 +95,7 @@
if (!foundWSM) {
report.setMessage(localStrings.getLocalString(
"list.connector.work.security.maps.workSecurityMapNotFound",
- "Nothing to list. Either the resource adapter {0} does not exist or the" +
+ "Nothing to list. Either the resource adapter {0} does not exist or the " +
"resource adapter {0} is not associated with any work security map.", raName));
}
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ActiveResourceAdapterImpl.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ActiveResourceAdapterImpl.java
index a9e3ee5..ff581cd 100755
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ActiveResourceAdapterImpl.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ActiveResourceAdapterImpl.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -166,7 +167,7 @@
//connector pool and resource creation fails.
_logger.log(Level.SEVERE, "rardeployment.defaultpoolresourcecreation.failed", cre);
if(_logger.isLoggable(Level.FINE)) {
- _logger.log(Level.FINE, "Error while trying to create the default connector" +
+ _logger.log(Level.FINE, "Error while trying to create the default connector, " +
"connection pool and resource", cre);
}
} catch (Exception e) {
@@ -174,7 +175,7 @@
//connector pool and resource creation fails.
_logger.log(Level.SEVERE, "rardeployment.defaultpoolresourcecreation.failed", e);
if(_logger.isLoggable(Level.FINE)) {
- _logger.log(Level.FINE, "Error while trying to create the default connector" +
+ _logger.log(Level.FINE, "Error while trying to create the default connector, " +
"connection pool and resource", e);
}
}
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ConnectionManagerImpl.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ConnectionManagerImpl.java
index 4d0887a..04457df 100755
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ConnectionManagerImpl.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ConnectionManagerImpl.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -207,7 +208,7 @@
if (prin == null) {
if (getLogger().isLoggable(Level.FINE)) {
getLogger().log(Level.FINE, "default-resource-principal not"
- + "specified for " + jndiNameToUse + ". Defaulting to"
+ + " specified for " + jndiNameToUse + ". Defaulting to"
+ " user/password specified in the pool");
}
prin = defaultPrin;
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/AdministeredObjectDefinitionHandler.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/AdministeredObjectDefinitionHandler.java
index 0adf66e..ecb3c27 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/AdministeredObjectDefinitionHandler.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/AdministeredObjectDefinitionHandler.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -99,7 +100,7 @@
context instanceof EjbContext ||
context instanceof EjbInterceptorContext )) {
if (logger.isLoggable(Level.FINEST)) {
- logger.log(Level.FINEST, "Ignoring @AdministeredObjectDefinition annotation processing as the class is" +
+ logger.log(Level.FINEST, "Ignoring @AdministeredObjectDefinition annotation processing as the class is " +
"an EJB class and context is not one of EJBContext");
}
return false;
@@ -111,7 +112,7 @@
if (ejbDescriptor == null || ejbDescriptor.length == 0) {
if (logger.isLoggable(Level.FINEST)) {
logger.log(Level.FINEST, "Ignoring @AdministeredObjectDefinition annotation processing as the class " +
- "[ " + annotatedClass + " ] is" +
+ "[ " + annotatedClass + " ] is " +
"not an EJB class and the context is EJBContext");
}
return false;
@@ -136,7 +137,7 @@
if(ejbDescs != null && ejbDescs.length > 0){
if (logger.isLoggable(Level.FINEST)) {
logger.log(Level.FINEST, "Ignoring @AdministeredObjectDefinition annotation processing as the class " +
- "[ " + annotatedClass + " ] is" +
+ "[ " + annotatedClass + " ] is " +
"not an Web class and the context is WebContext");
}
return false;
@@ -144,7 +145,7 @@
if (logger.isLoggable(Level.FINEST)) {
logger.log(Level.FINEST, "Ignoring @AdministeredObjectDefinition annotation processing " +
"as the class " +
- "[ " + annotatedClass + " ] is" +
+ "[ " + annotatedClass + " ] is " +
"not an Web class and the context is WebContext");
}
return false;
@@ -159,7 +160,7 @@
if (logger.isLoggable(Level.FINEST)) {
logger.log(Level.FINEST, "Ignoring @AdministeredObjectDefinition annotation processing " +
"as the class " +
- "[ " + annotatedClass + " ] is" +
+ "[ " + annotatedClass + " ] is " +
"not an Web class, an interceptor and the context is WebContext");
}
return false;
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/ConnectionDefinitionHandler.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/ConnectionDefinitionHandler.java
index 5f56cba..89690f6 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/ConnectionDefinitionHandler.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/ConnectionDefinitionHandler.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -91,7 +92,7 @@
//TODO V3 how to handle (ii)
//}
} else {
- getFailureResult(element, "Cant handle ConnectionDefinition annotation as the annotated class does not" +
+ getFailureResult(element, "Cant handle ConnectionDefinition annotation as the annotated class does not " +
"implement ManagedConnectionFactory", true);
}
}
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/ConnectionFactoryDefinitionHandler.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/ConnectionFactoryDefinitionHandler.java
index 5bf74a8..ed23682 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/ConnectionFactoryDefinitionHandler.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/ConnectionFactoryDefinitionHandler.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -101,7 +102,7 @@
context instanceof EjbContext ||
context instanceof EjbInterceptorContext )) {
if (logger.isLoggable(Level.FINEST)) {
- logger.log(Level.FINEST, "Ignoring @ConnectionFactoryDefinition annotation processing as the class is" +
+ logger.log(Level.FINEST, "Ignoring @ConnectionFactoryDefinition annotation processing as the class is " +
"an EJB class and context is not one of EJBContext");
}
return false;
@@ -113,7 +114,7 @@
if (ejbDescriptor == null || ejbDescriptor.length == 0) {
if (logger.isLoggable(Level.FINEST)) {
logger.log(Level.FINEST, "Ignoring @ConnectionFactoryDefinition annotation processing as the class " +
- "[ " + annotatedClass + " ] is" +
+ "[ " + annotatedClass + " ] is " +
"not an EJB class and the context is EJBContext");
}
return false;
@@ -122,7 +123,7 @@
if (!(context instanceof WebBundleContext || context instanceof WebComponentsContext
|| context instanceof WebComponentContext )) {
if (logger.isLoggable(Level.FINEST)) {
- logger.log(Level.FINEST, "Ignoring @ConnectionFactoryDefinition annotation processing as the class is" +
+ logger.log(Level.FINEST, "Ignoring @ConnectionFactoryDefinition annotation processing as the class is " +
"an Web class and context is not one of WebContext");
}
return false;
@@ -138,7 +139,7 @@
if(ejbDescs != null && ejbDescs.length > 0){
if (logger.isLoggable(Level.FINEST)) {
logger.log(Level.FINEST, "Ignoring @ConnectionFactoryDefinition annotation processing as the class " +
- "[ " + annotatedClass + " ] is" +
+ "[ " + annotatedClass + " ] is " +
"not an Web class and the context is WebContext");
}
return false;
@@ -146,7 +147,7 @@
if (logger.isLoggable(Level.FINEST)) {
logger.log(Level.FINEST, "Ignoring @ConnectionFactoryDefinition annotation processing " +
"as the class " +
- "[ " + annotatedClass + " ] is" +
+ "[ " + annotatedClass + " ] is " +
"not an Web class and the context is WebContext");
}
return false;
@@ -161,7 +162,7 @@
if (logger.isLoggable(Level.FINEST)) {
logger.log(Level.FINEST, "Ignoring @ConnectionFactoryDefinition annotation processing " +
"as the class " +
- "[ " + annotatedClass + " ] is" +
+ "[ " + annotatedClass + " ] is " +
"not an Web class, an interceptor and the context is WebContext");
}
return false;
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorConfigParserUtils.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorConfigParserUtils.java
index 9684f9c..eae4b0a 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorConfigParserUtils.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorConfigParserUtils.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -151,7 +152,7 @@
"rardeployment.error_associating_ra",e);
if (_logger.isLoggable(Level.FINE)) {
_logger.log(Level.FINE,
- "Exception while associating the resource adapter"
+ "Exception while associating the resource adapter "
+ "to the JavaBean", e);
}
}
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorDDTransformUtils.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorDDTransformUtils.java
index d0e99f8..d1d4f7e 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorDDTransformUtils.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorDDTransformUtils.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -269,13 +270,13 @@
} catch (IOException e) {
_logger.info(e.getMessage());
if(_logger.isLoggable(Level.FINE)) {
- _logger.log(Level.FINE, "Error while trying to read connector" +
+ _logger.log(Level.FINE, "Error while trying to read connector " +
"descriptor to get resource-adapter properties", e);
}
} catch (SAXException e) {
_logger.info(e.getMessage());
if(_logger.isLoggable(Level.FINE)) {
- _logger.log(Level.FINE, "Error while trying to read connector" +
+ _logger.log(Level.FINE, "Error while trying to read connector " +
"descriptor to get resource-adapter properties", e);
}
}
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/RARUtils.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/RARUtils.java
index a8d43b6..d72b1c4 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/RARUtils.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/RARUtils.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -229,7 +230,7 @@
} catch (ClassNotFoundException e) {
_logger.info(e.getMessage());
if(_logger.isLoggable(Level.FINE)) {
- _logger.log(Level.FINE, "Unable to find class while trying to read connector" +
+ _logger.log(Level.FINE, "Unable to find class while trying to read connector " +
"descriptor to get resource-adapter properties", e);
}
ConnectorRuntimeException cre = new ConnectorRuntimeException("unable to find class : " + beanClassName);
@@ -263,7 +264,7 @@
} catch (IOException ioe) {
_logger.info(ioe.getMessage());
if (_logger.isLoggable(Level.FINE)) {
- _logger.log(Level.FINE, "IO Error while trying to read connector"
+ _logger.log(Level.FINE, "IO Error while trying to read connector "
+ "descriptor to get resource-adapter properties", ioe);
}
ConnectorRuntimeException cre = new ConnectorRuntimeException(
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/AbstractConnectorResourceDeployer.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/AbstractConnectorResourceDeployer.java
index 79b06a4..4cd302d 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/AbstractConnectorResourceDeployer.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/AbstractConnectorResourceDeployer.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -128,7 +129,7 @@
//check whether these RARs are referenced by app-scoped-resources ?
if (ResourceUtil.getActualModuleNameWithExtension(module.getName()).equals(embeddedRARName)) {
throw new ResourceConflictException("Existing resources refer RAR " +
- "[ " + embeddedRARName + " ] which is" +
+ "[ " + embeddedRARName + " ] which is " +
"not present in the re-deployed application ["+appName+"] anymore. " +
"re-deploy the application after resolving the conflicts");
}
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/naming/AdministeredObjectFactory.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/naming/AdministeredObjectFactory.java
index ee4d60c..8296031 100755
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/naming/AdministeredObjectFactory.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/naming/AdministeredObjectFactory.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -85,7 +86,7 @@
ClassLoader loader = Thread.currentThread().getContextClassLoader();
if (runtime.checkAccessibility(moduleName, loader) == false) {
- throw new NamingException("Only the application that has the embedded resource" +
+ throw new NamingException("Only the application that has the embedded resource " +
"adapter can access the resource adapter");
}
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolTxHelper.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolTxHelper.java
index b72803d..1cfdebf 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolTxHelper.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolTxHelper.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -175,7 +176,7 @@
set.add(resource);
} catch (ClassCastException e) {
if (_logger.isLoggable(Level.FINE)) {
- _logger.log(Level.FINE, "Pool [ " + poolInfo + " ]: resourceEnlisted:"
+ _logger.log(Level.FINE, "Pool [ " + poolInfo + " ]: resourceEnlisted: "
+ "transaction is not J2EETransaction but a " + tran.getClass().getName(), e);
}
}
diff --git a/appserver/extras/embedded/shell/fixup.xml b/appserver/extras/embedded/shell/fixup.xml
deleted file mode 100644
index a79cf41..0000000
--- a/appserver/extras/embedded/shell/fixup.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
- Copyright (c) 2010, 2018 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
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="glassfish v3, embedded shell fix-up" default="fixup.library" basedir=".">
- <property name="derby.jar.classpath.additions" value="../../../javadb/lib/derby.jar ../../../javadb/lib/derbyclient.jar ../../../javadb/lib/derbynet.jar ../../../javadb/lib/derbytools.jar ../../../javadb/lib/derbyrun.jar"/>
- <property name="endorsed.jar.classpath.additions" value="../../modules/jakarta.annotation-api.jar ../../modules/jakarta.xml.bind-api.jar ../../modules/webservices-api-osgi.jar"/>
- <property name="classpath.additions" value="${derby.jar.classpath.additions} ${endorsed.jar.classpath.additions}"/>
- <target name="fixup.library">
- <unzip src="${output.dir}/${output.file}" dest="${stage.dir}">
- <patternset>
- <include name="META-INF/MANIFEST.MF"/>
- </patternset>
- </unzip>
-
- <!-- replace the colons used as path separators with blanks -->
- <replace file="${classpath.file}" token=":" value=" "/>
-
- <!-- define the classpath property -->
- <property file="${classpath.file}"/>
-
- <!--
- Entries in zip (and JAR) files have two-second timestamp resolution. The
- next sleep makes sure that the time stamp on the updated manifest
- file will later than the original manifest's time + two seconds;
- this make sure the zip task will actually replacde the manifest
- in the JAR file.
-
- Also, the manifest task seems not to update the timestamp on the
- manifest file, so we need to explicitly touch it after updating
- the manifest.
- -->
- <sleep seconds="5"/>
- <manifest mode="update" file="${stage.dir}/META-INF/MANIFEST.MF">
- <attribute name="Class-Path" value="${classpath} ${classpath.additions}"/>
- <attribute name="Bundle-SymbolicName" value="${bundlename}"/>
- </manifest>
- <touch file="${stage.dir}/META-INF/MANIFEST.MF"/>
-
- <!-- Update the JAR file with the revised manifest -->
- <zip destfile="${output.dir}/${output.file}" basedir="${stage.dir}" update="true" includes="META-INF/MANIFEST.MF"/>
- <echo>Manifest Class-Path updated</echo>
- </target>
-</project>
diff --git a/appserver/extras/embedded/shell/glassfish-embedded-shell/pom.xml b/appserver/extras/embedded/shell/glassfish-embedded-shell/pom.xml
index b92f848..9c43866 100755
--- a/appserver/extras/embedded/shell/glassfish-embedded-shell/pom.xml
+++ b/appserver/extras/embedded/shell/glassfish-embedded-shell/pom.xml
@@ -18,99 +18,24 @@
-->
<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>
+
<parent>
<groupId>org.glassfish.main.extras</groupId>
<artifactId>extras</artifactId>
<version>6.2.1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
+
<artifactId>glassfish-embedded-shell</artifactId>
<name>Embedded GlassFish Shell</name>
-
<properties>
- <classpath.file>${project.build.directory}/tmp/classpath.txt</classpath.file>
+ <path.derby>../../../javadb/lib</path.derby>
+ <classpath.derby>${path.derby}/derby.jar ${path.derby}/derbyclient.jar ${path.derby}/derbynet.jar ${path.derby}/derbytools.jar ${path.derby}/derbyrun.jar</classpath.derby>
</properties>
- <build>
- <plugins>
- <!--
- Create a text file containing the generated class path. This
- file is used in the ant tasks when the original Class-Path is
- augmented. Note: we force the path separator to be a colon
- because the plug-in will use the platform-specific separator
- otherwise. The ant logic replaces colons with spaces to
- reformat the contents of the file so it's useful in the manifest.
- -->
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-classpath-file</id>
- <phase>process-sources</phase>
- <goals>
- <goal>build-classpath</goal>
- </goals>
- <configuration>
- <outputFile>${classpath.file}</outputFile>
- <outputFilterFile>true</outputFilterFile>
- <pathSeparator>:</pathSeparator>
- <fileSeparator>/</fileSeparator>
- <prefix>../../modules</prefix>
- <stripVersion>true</stripVersion>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- <classpathLayoutType>custom</classpathLayoutType>
- <customClasspathLayout>../../modules/$${artifact.artifactId}$${dashClassifier?}.$${artifact.extension}</customClasspathLayout>
- </manifest>
- </archive>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>fixup-jar-classpath</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <ant antfile="../fixup.xml">
- <property name="output.file" value="${project.build.finalName}.jar" />
- <property name="output.dir" value="${project.build.directory}" />
- <property name="stage.dir" value="${project.build.directory}/stage" />
- <property name="classpath.file" value="${classpath.file}" />
- <property name="bundlename" value="org.glassfish.embedded.shell" />
- <property name="install.dir.name" value="${install.dir.name}" />
- </ant>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
- <!--
- The maven-jar-plugin will do the work of finding the transitive
- closure of it and the modules on which it depends to build the
- accurate Class-Path for the manifest.
- -->
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-core</artifactId>
@@ -126,5 +51,39 @@
<version>${project.version}</version>
</dependency>
- </dependencies>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.metro</groupId>
+ <artifactId>webservices-api-osgi</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <classpathPrefix>../../modules/</classpathPrefix>
+ <classpathLayoutType>custom</classpathLayoutType>
+ <customClasspathLayout>$${artifact.artifactId}$${dashClassifier?}.$${artifact.extension}</customClasspathLayout>
+ </manifest>
+ <manifestEntries>
+ <Bundle-SymbolicName>org.glassfish.embedded.shell</Bundle-SymbolicName>
+ <Class-Path>${classpath.derby}</Class-Path>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
index 7ee8203..552a7aa 100755
--- a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
+++ b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
@@ -29,90 +29,13 @@
<artifactId>glassfish-embedded-static-shell</artifactId>
<name>Embedded GlassFish Static Shell</name>
- <packaging>jar</packaging>
<properties>
- <classpath.file>${project.build.directory}/tmp/classpath.txt</classpath.file>
+ <path.derby>../../../javadb/lib</path.derby>
+ <classpath.derby>${path.derby}/derby.jar ${path.derby}/derbyclient.jar ${path.derby}/derbynet.jar ${path.derby}/derbytools.jar ${path.derby}/derbyrun.jar</classpath.derby>
</properties>
- <build>
- <plugins>
- <!--
- Create a text file containing the generated class path. This
- file is used in the ant tasks when the original Class-Path is
- augmented. Note: we force the path separator to be a colon
- because the plug-in will use the platform-specific separator
- otherwise. The ant logic replaces colons with spaces to
- reformat the contents of the file so it's useful in the manifest.
- -->
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-classpath-file</id>
- <phase>process-sources</phase>
- <goals>
- <goal>build-classpath</goal>
- </goals>
- <configuration>
- <outputFile>${classpath.file}</outputFile>
- <outputFilterFile>true</outputFilterFile>
- <pathSeparator>:</pathSeparator>
- <fileSeparator>/</fileSeparator>
- <prefix>../../modules</prefix>
- <stripVersion>true</stripVersion>
- <excludeArtifactIds>jsftemplating, jakarta.json, jakarta.json-api</excludeArtifactIds>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- <classpathLayoutType>custom</classpathLayoutType>
- <customClasspathLayout>../../modules/$${artifact.artifactId}$${dashClassifier?}.$${artifact.extension}</customClasspathLayout>
- </manifest>
- </archive>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>fixup-jar-classpath</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <ant antfile="../fixup.xml">
- <property name="output.file" value="${project.build.finalName}.jar" />
- <property name="output.dir" value="${project.build.directory}" />
- <property name="stage.dir" value="${project.build.directory}/stage" />
- <property name="classpath.file" value="${classpath.file}" />
- <property name="bundlename" value="org.glassfish.embedded.static-shell" />
- </ant>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
- <!--
- The maven-jar-plugin will do the work of finding the transitive
- closure of it and the modules on which it depends to build the
- accurate Class-Path for the manifest.
- -->
- <!-- glassfish-cmp -->
<dependency>
<groupId>org.glassfish.external</groupId>
<artifactId>antlr</artifactId>
@@ -1427,5 +1350,27 @@
<artifactId>woodstox-core</artifactId>
<optional>true</optional>
</dependency>
- </dependencies>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <classpathPrefix>../../modules/</classpathPrefix>
+ <classpathLayoutType>custom</classpathLayoutType>
+ <customClasspathLayout>$${artifact.artifactId}$${dashClassifier?}.$${artifact.extension}</customClasspathLayout>
+ </manifest>
+ <manifestEntries>
+ <Bundle-SymbolicName>org.glassfish.embedded.static-shell</Bundle-SymbolicName>
+ <Class-Path>${classpath.derby}</Class-Path>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/JDBCResourceManager.java b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/JDBCResourceManager.java
index 60ca344..a4d2a9f 100644
--- a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/JDBCResourceManager.java
+++ b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/JDBCResourceManager.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -222,7 +223,7 @@
if ("domain".equals(target)) {
if (resourceUtil.getTargetsReferringResourceRef(jndiName).size() > 0) {
String msg = localStrings.getLocalString("delete.jdbc.resource.resource-ref.exist",
- "jdbc-resource [ {0} ] is referenced in an" +
+ "jdbc-resource [ {0} ] is referenced in an " +
"instance/cluster target, Use delete-resource-ref on appropriate target",
jndiName);
return new ResourceStatus(ResourceStatus.FAILURE, msg);
diff --git a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/ManagedConnectionFactoryImpl.java b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/ManagedConnectionFactoryImpl.java
index 008bfc9..59f307b 100644
--- a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/ManagedConnectionFactoryImpl.java
+++ b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/ManagedConnectionFactoryImpl.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -789,7 +790,7 @@
} else {
//Validation Failed
_logger.log(Level.SEVERE, "jdbc.set_custom_validation_class_name_failure", className);
- throw new ResourceException("The Custom validation class name is" +
+ throw new ResourceException("The Custom validation class name is " +
"not valid as it does not implement " +
ConnectionValidation.class.getName());
}
diff --git a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/deployer/JdbcConnectionPoolDeployer.java b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/deployer/JdbcConnectionPoolDeployer.java
index 6a7bab8..4d1f2dc 100644
--- a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/deployer/JdbcConnectionPoolDeployer.java
+++ b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/deployer/JdbcConnectionPoolDeployer.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -749,7 +750,7 @@
if (connConnPool == null) {
- throw new ConnectorRuntimeException("Unable to create ConnectorConnectionPool" +
+ throw new ConnectorRuntimeException("Unable to create ConnectorConnectionPool " +
"from JDBC connection pool");
}
diff --git a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/deployment/annotation/handlers/DataSourceDefinitionHandler.java b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/deployment/annotation/handlers/DataSourceDefinitionHandler.java
index 3518da6..ccbb37f 100644
--- a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/deployment/annotation/handlers/DataSourceDefinitionHandler.java
+++ b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/deployment/annotation/handlers/DataSourceDefinitionHandler.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -99,7 +100,7 @@
context instanceof EjbInterceptorContext
)) {
if (logger.isLoggable(Level.FINEST)) {
- logger.log(Level.FINEST, "Ignoring @DataSourceDefinition annotation processing as the class is" +
+ logger.log(Level.FINEST, "Ignoring @DataSourceDefinition annotation processing as the class is " +
"an EJB class and context is not one of EJBContext");
}
return false;
@@ -111,7 +112,7 @@
if (ejbDescriptor == null || ejbDescriptor.length == 0) {
if (logger.isLoggable(Level.FINEST)) {
logger.log(Level.FINEST, "Ignoring @DataSourceDefinition annotation processing as the class " +
- "[ " + annotatedClass + " ] is" +
+ "[ " + annotatedClass + " ] is " +
"not an EJB class and the context is EJBContext");
}
return false;
@@ -120,7 +121,7 @@
if (!(context instanceof WebBundleContext || context instanceof WebComponentsContext
|| context instanceof WebComponentContext )) {
if (logger.isLoggable(Level.FINEST)) {
- logger.log(Level.FINEST, "Ignoring @DataSourceDefinition annotation processing as the class is" +
+ logger.log(Level.FINEST, "Ignoring @DataSourceDefinition annotation processing as the class is " +
"an Web class and context is not one of WebContext");
}
return false;
@@ -136,7 +137,7 @@
if(ejbDescs != null && ejbDescs.length > 0){
if (logger.isLoggable(Level.FINEST)) {
logger.log(Level.FINEST, "Ignoring @DataSourceDefinition annotation processing as the class " +
- "[ " + annotatedClass + " ] is" +
+ "[ " + annotatedClass + " ] is " +
"not an Web class and the context is WebContext");
}
return false;
@@ -144,7 +145,7 @@
if (logger.isLoggable(Level.FINEST)) {
logger.log(Level.FINEST, "Ignoring @DataSourceDefinition annotation processing " +
"as the class " +
- "[ " + annotatedClass + " ] is" +
+ "[ " + annotatedClass + " ] is " +
"not an Web class and the context is WebContext");
}
return false;
@@ -159,7 +160,7 @@
if (logger.isLoggable(Level.FINEST)) {
logger.log(Level.FINEST, "Ignoring @DataSourceDefinition annotation processing " +
"as the class " +
- "[ " + annotatedClass + " ] is" +
+ "[ " + annotatedClass + " ] is " +
"not an Web class, an interceptor and the context is WebContext");
}
return false;
diff --git a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/ORBLazyServiceInitializer.java b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/ORBLazyServiceInitializer.java
index a6d32c6..1fd87ec 100644
--- a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/ORBLazyServiceInitializer.java
+++ b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/ORBLazyServiceInitializer.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -82,7 +83,7 @@
if( initializedSuccessfully) {
orbHelper.getSelectableChannelDelegate().handleRequest(channel);
} else {
- logger.log(Level.WARNING, "Cannot handle SelectableChannel request in ORBLazyServiceInitializer." +
+ logger.log(Level.WARNING, "Cannot handle SelectableChannel request in ORBLazyServiceInitializer. " +
"ORB did not initialize successfully");
}
}
diff --git a/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/admin/cli/DeleteMailResource.java b/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/admin/cli/DeleteMailResource.java
index 4d39ca8..d54c353 100644
--- a/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/admin/cli/DeleteMailResource.java
+++ b/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/admin/cli/DeleteMailResource.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -98,7 +99,7 @@
if ("domain".equals(target)) {
if (resourceUtil.getTargetsReferringResourceRef(jndiName).size() > 0) {
report.setMessage(localStrings.getLocalString("delete.mail.resource.resource-ref.exist",
- "mail-resource [ {0} ] is referenced in an" +
+ "mail-resource [ {0} ] is referenced in an " +
"instance/cluster target, Use delete-resource-ref on appropriate target",
jndiName));
report.setActionExitCode(ActionReport.ExitCode.FAILURE);
diff --git a/appserver/resources/mail/mail-runtime/src/main/java/org/glassfish/resources/mail/annotation/handler/MailSessionDefinitionHandler.java b/appserver/resources/mail/mail-runtime/src/main/java/org/glassfish/resources/mail/annotation/handler/MailSessionDefinitionHandler.java
index 1acfbd1..46b6ea4 100644
--- a/appserver/resources/mail/mail-runtime/src/main/java/org/glassfish/resources/mail/annotation/handler/MailSessionDefinitionHandler.java
+++ b/appserver/resources/mail/mail-runtime/src/main/java/org/glassfish/resources/mail/annotation/handler/MailSessionDefinitionHandler.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -97,7 +98,7 @@
context instanceof EjbInterceptorContext
)) {
if (logger.isLoggable(Level.FINEST)) {
- logger.log(Level.FINEST, "Ignoring @MailSessionDefinition annotation processing as the class is" +
+ logger.log(Level.FINEST, "Ignoring @MailSessionDefinition annotation processing as the class is " +
"an EJB class and context is not one of EJBContext");
}
return false;
@@ -109,7 +110,7 @@
if (ejbDescriptor == null || ejbDescriptor.length == 0) {
if (logger.isLoggable(Level.FINEST)) {
logger.log(Level.FINEST, "Ignoring @MailSessionDefinition annotation processing as the class " +
- "[ " + annotatedClass + " ] is" +
+ "[ " + annotatedClass + " ] is " +
"not an EJB class and the context is EJBContext");
}
return false;
@@ -118,7 +119,7 @@
if (!(context instanceof WebBundleContext || context instanceof WebComponentsContext
|| context instanceof WebComponentContext)) {
if (logger.isLoggable(Level.FINEST)) {
- logger.log(Level.FINEST, "Ignoring @MailSessionDefinition annotation processing as the class is" +
+ logger.log(Level.FINEST, "Ignoring @MailSessionDefinition annotation processing as the class is " +
"an Web class and context is not one of WebContext");
}
return false;
@@ -134,7 +135,7 @@
if (ejbDescs != null && ejbDescs.length > 0) {
if (logger.isLoggable(Level.FINEST)) {
logger.log(Level.FINEST, "Ignoring @MailSessionDefinition annotation processing as the class " +
- "[ " + annotatedClass + " ] is" +
+ "[ " + annotatedClass + " ] is " +
"not an Web class and the context is WebContext");
}
return false;
@@ -142,7 +143,7 @@
if (logger.isLoggable(Level.FINEST)) {
logger.log(Level.FINEST, "Ignoring @MailSessionDefinition annotation processing " +
"as the class " +
- "[ " + annotatedClass + " ] is" +
+ "[ " + annotatedClass + " ] is " +
"not an Web class and the context is WebContext");
}
return false;
@@ -157,7 +158,7 @@
if (logger.isLoggable(Level.FINEST)) {
logger.log(Level.FINEST, "Ignoring @MailSessionDefinition annotation processing " +
"as the class " +
- "[ " + annotatedClass + " ] is" +
+ "[ " + annotatedClass + " ] is " +
"not an Web class, an interceptor and the context is WebContext");
}
return false;
diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/DeleteCustomResource.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/DeleteCustomResource.java
index 07b3ce2..a259d75 100644
--- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/DeleteCustomResource.java
+++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/DeleteCustomResource.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -96,7 +97,7 @@
if ("domain".equals(target)) {
if (resourceUtil.getTargetsReferringResourceRef(jndiName).size() > 0) {
report.setMessage(localStrings.getLocalString("delete.custom.resource.resource-ref.exist",
- "custom-resource [ {0} ] is referenced in an" +
+ "custom-resource [ {0} ] is referenced in an " +
"instance/cluster target, Use delete-resource-ref on appropriate target",
jndiName));
report.setActionExitCode(ActionReport.ExitCode.FAILURE);
diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/DeleteJndiResource.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/DeleteJndiResource.java
index 36c335e..c71cd54 100644
--- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/DeleteJndiResource.java
+++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/DeleteJndiResource.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -96,7 +97,7 @@
if ("domain".equals(target)) {
if (resourceUtil.getTargetsReferringResourceRef(jndiName).size() > 0) {
report.setMessage(localStrings.getLocalString("delete.jndi.resource.resource-ref.exist",
- "external-jndi-resource [ {0} ] is referenced in an" +
+ "external-jndi-resource [ {0} ] is referenced in an " +
"instance/cluster target, Use delete-resource-ref on appropriate target",
jndiName));
report.setActionExitCode(ActionReport.ExitCode.FAILURE);
diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/jmac/callback/BaseContainerCallbackHandler.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/jmac/callback/BaseContainerCallbackHandler.java
index 04c4c86..e0dd7a9 100644
--- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/jmac/callback/BaseContainerCallbackHandler.java
+++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/jmac/callback/BaseContainerCallbackHandler.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -721,7 +722,7 @@
} catch (KeyStoreException kse) {
// ignore and move to next
if (_logger.isLoggable(Level.FINE)) {
- _logger.log(Level.FINE, "JMAC: Cannot retrieve" + "certificate for alias " + alias);
+ _logger.log(Level.FINE, "JMAC: Cannot retrieve certificate for alias " + alias);
}
}
}
diff --git a/appserver/security/jaspic-provider-framework/src/main/java/com/sun/jaspic/config/factory/EntryInfo.java b/appserver/security/jaspic-provider-framework/src/main/java/com/sun/jaspic/config/factory/EntryInfo.java
index 2ff0a1c..e7bd2d9 100644
--- a/appserver/security/jaspic-provider-framework/src/main/java/com/sun/jaspic/config/factory/EntryInfo.java
+++ b/appserver/security/jaspic-provider-framework/src/main/java/com/sun/jaspic/config/factory/EntryInfo.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -64,7 +65,7 @@
if (ctxs == null || ctxs.isEmpty()) {
throw new IllegalArgumentException(
- "Registration entry must contain one or" +
+ "Registration entry must contain one or " +
"more registration contexts");
}
this.className = className;
diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DelegatedRecoveryManager.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DelegatedRecoveryManager.java
index d9710b2..67f391e 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DelegatedRecoveryManager.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DelegatedRecoveryManager.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -321,7 +322,7 @@
// no CoordinatorTerm in recovery, we must do it here.
if(_logger.isLoggable(Level.FINE)) {
_logger.logp(Level.FINE,"DelegatedRecoveryManager","resync()",
- "Before invoking commit on the reconstructed coordinator"+
+ "Before invoking commit on the reconstructed coordinator, "+
"GTID is: "+
((TopCoordinator)coord).superInfo.globalTID.toString());
diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DelegatedTimeoutManager.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DelegatedTimeoutManager.java
index 2a75d27..c22f859 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DelegatedTimeoutManager.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DelegatedTimeoutManager.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -217,7 +218,7 @@
if (coord == null) {
if(_logger.isLoggable(Level.FINER)) {
_logger.logp(Level.FINER,"DelegatedTimeoutManager","timeoutCoordinator()",
- "DelegatedRecoveryManager.getLocalCoordinator() returned null,"+
+ "DelegatedRecoveryManager.getLocalCoordinator() returned null, "+
"which means txn is done. Setting timeout type to CANCEL_TIMEOUT");
}
setTimeout(localTID, TimeoutManager.CANCEL_TIMEOUT, 0);
diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RecoveryManager.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RecoveryManager.java
index b2f5437..4cbe659 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RecoveryManager.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RecoveryManager.java
@@ -1,6 +1,7 @@
/*
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995-1997 IBM Corp. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -560,7 +561,7 @@
if(_logger.isLoggable(Level.FINE))
{
_logger.logp(Level.FINE,"RecoveryManager","resync()",
- "Before invoking commit on the reconstructed coordinator"+
+ "Before invoking commit on the reconstructed coordinator, "+
"GTID is: "+
((TopCoordinator)coord).superInfo.globalTID.toString());
diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RegisteredSyncs.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RegisteredSyncs.java
index a67b9ae..d6e58ae 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RegisteredSyncs.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RegisteredSyncs.java
@@ -1,6 +1,7 @@
/*
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995-1997 IBM Corp. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -157,7 +158,7 @@
if (_logger.isLoggable(Level.FINEST)) {
_logger.logp(Level.FINEST, "RegisterdSyncs", "distributeAfter()",
- "After invoking after_completion() on" + "synchronization object" + sync);
+ "After invoking after_completion() on synchronization object" + sync);
}
} catch (Throwable exc) {
// Discard any exceptions at this point.
diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TimeoutManager.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TimeoutManager.java
index 4fb6050..c729b09 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TimeoutManager.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TimeoutManager.java
@@ -1,6 +1,7 @@
/*
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995-1997 IBM Corp. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -232,7 +233,7 @@
if (coord == null) {
if (_logger.isLoggable(Level.FINER)) {
_logger.logp(Level.FINER, "TimeoutManager", "timeoutCoordinator()",
- "RecoveryManager.getLocalCoordinator() returned null,"
+ "RecoveryManager.getLocalCoordinator() returned null, "
+ "which means txn is done. Setting timeout type to CANCEL_TIMEOUT");
}
TimeoutManager.setTimeout(localTID, TimeoutManager.CANCEL_TIMEOUT, 0);
diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TopCoordinator.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TopCoordinator.java
index 49ee0a5..49b9d68 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TopCoordinator.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TopCoordinator.java
@@ -1,6 +1,7 @@
/*
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995-1997 IBM Corp. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -1242,7 +1243,7 @@
numRes = participants.addRes(res);
if (_logger.isLoggable(Level.FINEST)) {
_logger.logp(Level.FINEST,"TopCoordinator","register_resource()",
- "OTSResource " + res +" has been registered"+"GTID is:"+
+ "OTSResource " + res +" has been registered, GTID is:"+
superInfo.globalTID.toString());
}
@@ -2736,7 +2737,7 @@
PropagationContext result = new PropagationContext(timeout, current, new TransIdentity[0], emptyData);
if (_logger.isLoggable(Level.FINEST)) {
_logger.logp(Level.FINEST,"TopCoordinator","get_txcontext()",
- "Obtained PropagationContext"+"GTID is: "+
+ "Obtained PropagationContext, GTID is: "+
superInfo.globalTID.toString());
}
diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TransactionFactoryImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TransactionFactoryImpl.java
index e9fed86..0493ed1 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TransactionFactoryImpl.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TransactionFactoryImpl.java
@@ -1,6 +1,7 @@
/*
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995-1997 IBM Corp. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -181,7 +182,7 @@
{
_logger.logp(Level.FINE,"TransactionFactoryImpl","localCreate()",
"Control object :" + result +
- " corresponding to this transaction has been created"+
+ " corresponding to this transaction has been created, "+
"GTID is : "+
((TopCoordinator)coordinator).superInfo.globalTID.toString());
}
diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/LogFacade.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/LogFacade.java
index 7263dbb..c64f022 100644
--- a/appserver/web/web-glue/src/main/java/org/glassfish/web/LogFacade.java
+++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/LogFacade.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -1030,7 +1031,7 @@
@LogMessageInfo(
message = "Unable to set default-web-module {0} for virtual server {1}",
level = "SEVERE",
- cause = "There is no web context deployed on the given" +
+ cause = "There is no web context deployed on the given " +
"virtual server that matches the given default context path",
action = "Verify if the default context path is deployed on the virtual server")
public static final String DEFAULT_WEB_MODULE_ERROR= prefix + "00186";
diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/WebServiceTesterServlet.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/WebServiceTesterServlet.java
index 2c016b5..a845206 100644
--- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/WebServiceTesterServlet.java
+++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/WebServiceTesterServlet.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -487,7 +488,7 @@
out.print("<br><br>");
out.print(localStrings.getLocalString(
"enterprise.webservice.monitoring.WsImportError3",
- "Possible causes can be" +
+ "Possible causes can be " +
"invoking https when the application is not configured for security",
new Object[] {wsdlUrl}));
diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/ConfigApiLoggerInfo.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/ConfigApiLoggerInfo.java
index a28581d..10bbb04 100644
--- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/ConfigApiLoggerInfo.java
+++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/ConfigApiLoggerInfo.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -108,7 +109,7 @@
@LogMessageInfo(message = "Existing default-config detected during upgrade. No need to create default-config.", level = "INFO")
public final static String existingDefaultConfig = LOGMSG_PREFIX + "-00022";
- @LogMessageInfo(message = "System Property com.sun.aas.installRoot is null. We could be running in unit tests."
+ @LogMessageInfo(message = "System Property com.sun.aas.installRoot is null. We could be running in unit tests. "
+ "Exiting DefaultConfigUpgrade", level = "INFO")
public final static String installRootIsNull = LOGMSG_PREFIX + "-00023";
diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AdminLoggerInfo.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AdminLoggerInfo.java
index 1ea47a4..6457638 100644
--- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AdminLoggerInfo.java
+++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AdminLoggerInfo.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -50,7 +51,7 @@
@LogMessageInfo(message = "unable to read instance state file {0}, recreating", level = "FINE")
final static String mISScannotread = LOGMSG_PREFIX + "-00003";
- @LogMessageInfo(message = "unable to create instance state file: {0}, exception: {1}", cause = "The instance state file is missing and the system is trying to"
+ @LogMessageInfo(message = "unable to create instance state file: {0}, exception: {1}", cause = "The instance state file is missing and the system is trying to "
+ "recreated it but and exception was raised.", action = "Check the server logs and contact Oracle support", publish = true, level = "SEVERE")
final static String mISScannotcreate = LOGMSG_PREFIX + "-00004";
diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/AdminCommandLock.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/AdminCommandLock.java
index 3de761e..ba09c04 100644
--- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/AdminCommandLock.java
+++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/AdminCommandLock.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -88,7 +89,7 @@
public void dumpState(Logger logger, Level level) {
if (logger.isLoggable(level)) {
- logger.log(level, "Current locking conditions are " + rwlock.getReadLockCount() + "/" + rwlock.getReadHoldCount() + " shared locks" + "and "
+ logger.log(level, "Current locking conditions are " + rwlock.getReadLockCount() + "/" + rwlock.getReadHoldCount() + " shared locks and "
+ rwlock.getWriteHoldCount() + " write lock");
}
}
