Trimming trailing spaces, removing tabs by a script
- using tab width of 4 spaces
- trailing space in property files is converted to unicode, so it is
visible in sources
- bat files use CRLF
- all other text files use just LF
diff --git a/appserver/core/api-exporter-fragment/pom.xml b/appserver/core/api-exporter-fragment/pom.xml
index f165416..f7787d0 100755
--- a/appserver/core/api-exporter-fragment/pom.xml
+++ b/appserver/core/api-exporter-fragment/pom.xml
@@ -29,10 +29,10 @@
<packaging>jar</packaging>
<name>GlassFish API Exporter Module Fragment</name>
<description>This bundle attached itself as a fragment to api-exporter bundle</description>
-
+
<!--
Since DynamicImport-Package resolution happens incremantally, that can lead to minor performance issues,
- so we attach this fragment to api-exporter bundle. This bundle statically imports packages. Since it
+ so we attach this fragment to api-exporter bundle. This bundle statically imports packages. Since it
optionally imports them, even if some package is absent, it is not an issue. Please note,
any package imported by this bundle is also visible to "Common Class Loader."
-->
@@ -46,7 +46,7 @@
</roles>
</developer>
</developers>
-
+
<build>
<plugins>
<plugin>
@@ -60,7 +60,7 @@
<Bundle-ManifestVersion>2</Bundle-ManifestVersion>
<Fragment-Host>GlassFish-Application-Common-Module</Fragment-Host>
<Bundle-Name>${project.name}</Bundle-Name>
- <!-- This is the most important attribute of this bundle
+ <!-- This is the most important attribute of this bundle
We currently import all EE8 APIs. We could include some appserver pkgs as well.
Tune this as per performance requirement.
-->
@@ -360,7 +360,7 @@
org.apache.jasper.servlet; \
resolution:=optional
</Import-Package>
- <Bundle-Description>${project.description}</Bundle-Description>
+ <Bundle-Description>${project.description}</Bundle-Description>
</manifestEntries>
</archive>
</configuration>
diff --git a/appserver/core/javaee-kernel/pom.xml b/appserver/core/javaee-kernel/pom.xml
index 4c81a66..38de3c1 100755
--- a/appserver/core/javaee-kernel/pom.xml
+++ b/appserver/core/javaee-kernel/pom.xml
@@ -27,9 +27,9 @@
</parent>
<artifactId>javaee-kernel</artifactId>
<packaging>glassfish-jar</packaging>
-
+
<name>Java EE related distributions kernel Classes</name>
-
+
<developers>
<developer>
<id>dochez</id>
@@ -42,7 +42,7 @@
</roles>
</developer>
</developers>
-
+
<dependencies>
<dependency>
<groupId>org.glassfish.main.common</groupId>
diff --git a/appserver/core/javaee-kernel/src/main/java/org/glassfish/kernel/javaee/MEJBService.java b/appserver/core/javaee-kernel/src/main/java/org/glassfish/kernel/javaee/MEJBService.java
index 1034273..b929156 100755
--- a/appserver/core/javaee-kernel/src/main/java/org/glassfish/kernel/javaee/MEJBService.java
+++ b/appserver/core/javaee-kernel/src/main/java/org/glassfish/kernel/javaee/MEJBService.java
@@ -33,7 +33,7 @@
import java.util.logging.Level;
/**
- * MEJB service to register mejb with a temporary NamingObjectProxy at server
+ * MEJB service to register mejb with a temporary NamingObjectProxy at server
* start up time
*/
@Service
@@ -48,23 +48,23 @@
@Inject
ServiceLocator habitat;
- @Inject
+ @Inject
Provider<GlassfishNamingManager> gfNamingManagerProvider;
private static final Logger _logger = LogDomains.getLogger(
MEJBService.class, LogDomains.EJB_LOGGER);
-
+
public void postConstruct() {
GlassfishNamingManager gfNamingManager =
gfNamingManagerProvider.get();
- MEJBNamingObjectProxy mejbProxy =
+ MEJBNamingObjectProxy mejbProxy =
new MEJBNamingObjectProxy(habitat);
for(String next : MEJBNamingObjectProxy.getJndiNames()) {
try {
gfNamingManager.publishObject(next, mejbProxy, true);
} catch (Exception e) {
- _logger.log(Level.WARNING, "Problem in publishing temp proxy for MEJB: " +
+ _logger.log(Level.WARNING, "Problem in publishing temp proxy for MEJB: " +
e.getMessage(), e);
}
}
diff --git a/appserver/core/javaee-kernel/src/main/java/org/glassfish/kernel/javaee/WebContainerStarter.java b/appserver/core/javaee-kernel/src/main/java/org/glassfish/kernel/javaee/WebContainerStarter.java
index 55b8581..bb3aacc 100644
--- a/appserver/core/javaee-kernel/src/main/java/org/glassfish/kernel/javaee/WebContainerStarter.java
+++ b/appserver/core/javaee-kernel/src/main/java/org/glassfish/kernel/javaee/WebContainerStarter.java
@@ -70,12 +70,12 @@
@RunLevel(StartupRunLevel.VAL)
public class WebContainerStarter
implements PostConstruct, ConfigListener {
-
+
private static final String LOGMSG_PREFIX = "AS-CORE-JAVAEE";
-
+
@LogMessagesResourceBundle
private static final String SHARED_LOGMESSAGE_RESOURCE = "org.glassfish.kernel.javaee.LogMessages";
-
+
@LoggerInfo(subsystem = "AS-CORE", description = "Java EE Core Kernel", publish = true)
private static final String ASCORE_LOGGER = "jakarta.enterprise.system.core.ee";
private static final Logger logger = Logger.getLogger(
@@ -93,7 +93,7 @@
message = "Done with starting {0} container.",
level = "INFO")
public static final String mStartContainerDone = LOGMSG_PREFIX + "-0002";
-
+
@LogMessageInfo(
message = "Unable to start container (no exception provided)",
cause = "The web container does not start properly.",
@@ -137,7 +137,7 @@
* Scans the domain.xml to see if it specifies any configuration
* that can be handled only by the web container, and if so, starts
* the web container
- */
+ */
public void postConstruct() {
domainProvider.get();
Config serverConfig = serverConfigProvider.get();
@@ -202,7 +202,7 @@
}
return;
}
-
+
if (containerRegistry.getContainer(
webSniffer.getContainersNames()[0]) != null) {
containerRegistry.getContainer(
@@ -216,7 +216,7 @@
for (EngineInfo info : containersInfo) {
info.getContainer();
if (logger.isLoggable(Level.INFO)) {
- logger.log(Level.INFO, mStartContainerDone,
+ logger.log(Level.INFO, mStartContainerDone,
webSniffer.getModuleType());
}
}
@@ -304,7 +304,7 @@
!ConfigBeansUtilities.toBoolean(state))) {
return true;
}
-
+
List<Property> props = host.getProperty();
if (props != null && !props.isEmpty()) {
return true;
diff --git a/appserver/core/pom.xml b/appserver/core/pom.xml
index 8aff3cc..7dd93fe 100644
--- a/appserver/core/pom.xml
+++ b/appserver/core/pom.xml
@@ -23,14 +23,14 @@
<groupId>org.glassfish.main</groupId>
<artifactId>glassfish-parent</artifactId>
<version>6.1.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.glassfish.main.core</groupId>
<artifactId>core</artifactId>
<packaging>pom</packaging>
- <name>GlassFish Core modules</name>
+ <name>GlassFish Core modules</name>
<modules>
- <module>javaee-kernel</module>
- <module>api-exporter-fragment</module>
+ <module>javaee-kernel</module>
+ <module>api-exporter-fragment</module>
</modules>
</project>
