Separate words in logged messages
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/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");
}
}
