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/tests/embedded/cdi_basic/pom.xml b/appserver/tests/embedded/cdi_basic/pom.xml index 50ec265..4dda5ce 100644 --- a/appserver/tests/embedded/cdi_basic/pom.xml +++ b/appserver/tests/embedded/cdi_basic/pom.xml
@@ -41,7 +41,7 @@ <artifactId>maven-surefire-plugin</artifactId> <version>2.4.2</version> <configuration> - <forkCount>1</forkCount> + <forkCount>1</forkCount> <reuseForks>false</reuseForks> <useSystemClassLoader>false</useSystemClassLoader> <useManifestOnlyJar>false</useManifestOnlyJar>
diff --git a/appserver/tests/embedded/cdi_basic/src/main/java/org/glassfish/tests/embedded/cdi_basic/BasicCDITestServlet.java b/appserver/tests/embedded/cdi_basic/src/main/java/org/glassfish/tests/embedded/cdi_basic/BasicCDITestServlet.java index 09da5ce..8ffe9b8 100644 --- a/appserver/tests/embedded/cdi_basic/src/main/java/org/glassfish/tests/embedded/cdi_basic/BasicCDITestServlet.java +++ b/appserver/tests/embedded/cdi_basic/src/main/java/org/glassfish/tests/embedded/cdi_basic/BasicCDITestServlet.java
@@ -39,15 +39,15 @@ HttpServletResponse httpServletResponse) throws ServletException, IOException { PrintWriter out = httpServletResponse.getWriter(); out.println("Hi from BasicCDITestServlet"); - if(tb == null) { - out.println("TestBean not injected."); - } else if(trsb == null) { - out.println("TestRequestScopeBean not injected."); - } else { - out.println("TestBean injected. [" + tb + "]"); - out.println("TestRequestScopeBean injected. [ " + trsb + "]"); - out.println("All CDI beans have been injected."); - } + if(tb == null) { + out.println("TestBean not injected."); + } else if(trsb == null) { + out.println("TestRequestScopeBean not injected."); + } else { + out.println("TestBean injected. [" + tb + "]"); + out.println("TestRequestScopeBean injected. [ " + trsb + "]"); + out.println("All CDI beans have been injected."); + } out.flush(); out.close(); }
diff --git a/appserver/tests/embedded/cdi_basic/src/main/java/org/glassfish/tests/embedded/cdi_basic/TestBean.java b/appserver/tests/embedded/cdi_basic/src/main/java/org/glassfish/tests/embedded/cdi_basic/TestBean.java index 1d819c4..95ff685 100644 --- a/appserver/tests/embedded/cdi_basic/src/main/java/org/glassfish/tests/embedded/cdi_basic/TestBean.java +++ b/appserver/tests/embedded/cdi_basic/src/main/java/org/glassfish/tests/embedded/cdi_basic/TestBean.java
@@ -16,7 +16,7 @@ package org.glassfish.tests.embedded.cdi_basic; -//Simple TestBean to test CDI. +//Simple TestBean to test CDI. //This bean implements Serializable as it needs to be placed into a Stateful Bean public class TestBean {}
diff --git a/appserver/tests/embedded/cdi_basic/src/main/java/org/glassfish/tests/embedded/cdi_basic/TestRequestScopedBean.java b/appserver/tests/embedded/cdi_basic/src/main/java/org/glassfish/tests/embedded/cdi_basic/TestRequestScopedBean.java index 211f07e..3553b1f 100644 --- a/appserver/tests/embedded/cdi_basic/src/main/java/org/glassfish/tests/embedded/cdi_basic/TestRequestScopedBean.java +++ b/appserver/tests/embedded/cdi_basic/src/main/java/org/glassfish/tests/embedded/cdi_basic/TestRequestScopedBean.java
@@ -16,7 +16,7 @@ package org.glassfish.tests.embedded.cdi_basic; -//Simple RequestScoped TestBean to test CDI. +//Simple RequestScoped TestBean to test CDI. //This bean implements Serializable as it needs to be placed into a Stateful Bean @jakarta.enterprise.context.RequestScoped public class TestRequestScopedBean
diff --git a/appserver/tests/embedded/cdi_basic/src/main/webapp/WEB-INF/sun-web.xml b/appserver/tests/embedded/cdi_basic/src/main/webapp/WEB-INF/sun-web.xml index 67d7bfc..64a699e 100644 --- a/appserver/tests/embedded/cdi_basic/src/main/webapp/WEB-INF/sun-web.xml +++ b/appserver/tests/embedded/cdi_basic/src/main/webapp/WEB-INF/sun-web.xml
@@ -19,5 +19,5 @@ <!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 8.1 Servlet 2.4//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_2_4-1.dtd"> <sun-web-app> - <context-root>/cdi_basic</context-root> + <context-root>/cdi_basic</context-root> </sun-web-app>
diff --git a/appserver/tests/embedded/cdi_basic/src/main/webapp/WEB-INF/web.xml b/appserver/tests/embedded/cdi_basic/src/main/webapp/WEB-INF/web.xml index af71778..48ed9b6 100644 --- a/appserver/tests/embedded/cdi_basic/src/main/webapp/WEB-INF/web.xml +++ b/appserver/tests/embedded/cdi_basic/src/main/webapp/WEB-INF/web.xml
@@ -18,6 +18,6 @@ --> <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.0" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> - <display-name>cdi_basic</display-name> + <display-name>cdi_basic</display-name> <distributable/> </web-app>