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/basic/lifecycle/pom.xml b/appserver/tests/embedded/basic/lifecycle/pom.xml
index 4e74c19..df68654 100644
--- a/appserver/tests/embedded/basic/lifecycle/pom.xml
+++ b/appserver/tests/embedded/basic/lifecycle/pom.xml
@@ -40,7 +40,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4.2</version>
<configuration>
- <forkCount>1</forkCount>
+ <forkCount>1</forkCount>
<reuseForks>false</reuseForks>
</configuration>
</plugin>
diff --git a/appserver/tests/embedded/basic/lifecycle/src/test/java/org/glassfish/tests/embedded/basic/lifecycle/LifeCycleTest.java b/appserver/tests/embedded/basic/lifecycle/src/test/java/org/glassfish/tests/embedded/basic/lifecycle/LifeCycleTest.java
index 568241f..cfdd074 100644
--- a/appserver/tests/embedded/basic/lifecycle/src/test/java/org/glassfish/tests/embedded/basic/lifecycle/LifeCycleTest.java
+++ b/appserver/tests/embedded/basic/lifecycle/src/test/java/org/glassfish/tests/embedded/basic/lifecycle/LifeCycleTest.java
@@ -43,12 +43,12 @@
logger.info("Instance1 created" + instance1);
instance1.start();
logger.info("Instance1 started #1");
- sleep();
+ sleep();
instance1.stop();
logger.info("Instance1 stopped #1");
instance1.start();
logger.info("Instance1 started #2");
- sleep();
+ sleep();
instance1.stop();
logger.info("Instance1 stopped #2");
instance1.dispose();
@@ -62,12 +62,12 @@
logger.info("instance2 created" + instance2);
instance2.start();
logger.info("Instance2 started #1");
- sleep();
+ sleep();
instance2.stop();
logger.info("Instance2 stopped #1");
instance2.start();
logger.info("Instance2 started #2");
- sleep();
+ sleep();
instance2.stop();
logger.info("Instance2 stopped #2");
instance2.dispose();
@@ -76,10 +76,10 @@
}
private void sleep() {
- try {
- Thread.sleep(1000);
- } catch(Exception ex) {
- }
+ try {
+ Thread.sleep(1000);
+ } catch(Exception ex) {
+ }
}
// throws exception if the temp dir is not cleaned out.
diff --git a/appserver/tests/embedded/basic/pom.xml b/appserver/tests/embedded/basic/pom.xml
index 807a83c..903c8a1 100755
--- a/appserver/tests/embedded/basic/pom.xml
+++ b/appserver/tests/embedded/basic/pom.xml
@@ -26,6 +26,6 @@
<packaging>pom</packaging>
<name>Basic tests for testing org.glassfish.embeddable APIs</name>
<modules>
- <module>lifecycle</module>
+ <module>lifecycle</module>
</modules>
</project>
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>
diff --git a/appserver/tests/embedded/cdi_ejb_jpa/pom.xml b/appserver/tests/embedded/cdi_ejb_jpa/pom.xml
index c20b36d..7c64cdf 100644
--- a/appserver/tests/embedded/cdi_ejb_jpa/pom.xml
+++ b/appserver/tests/embedded/cdi_ejb_jpa/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_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestBean.java b/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestBean.java
index 4423e18..c49b14b 100644
--- a/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestBean.java
+++ b/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestBean.java
@@ -16,7 +16,7 @@
package org.glassfish.tests.embedded.cdi_ejb_jpa;
-//Simple TestBean to test CDI.
+//Simple TestBean to test CDI.
import jakarta.ejb.Stateless;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext;
diff --git a/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestRequestScopedBean.java b/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestRequestScopedBean.java
index 05e4a47..75ea827 100644
--- a/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestRequestScopedBean.java
+++ b/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestRequestScopedBean.java
@@ -16,7 +16,7 @@
package org.glassfish.tests.embedded.cdi_ejb_jpa;
-//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_ejb_jpa/src/main/webapp/WEB-INF/sun-web.xml b/appserver/tests/embedded/cdi_ejb_jpa/src/main/webapp/WEB-INF/sun-web.xml
index 0105a07..ca51367 100644
--- a/appserver/tests/embedded/cdi_ejb_jpa/src/main/webapp/WEB-INF/sun-web.xml
+++ b/appserver/tests/embedded/cdi_ejb_jpa/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_ejb_jpa</context-root>
+ <context-root>/cdi_ejb_jpa</context-root>
</sun-web-app>
diff --git a/appserver/tests/embedded/cdi_ejb_jpa/src/main/webapp/WEB-INF/web.xml b/appserver/tests/embedded/cdi_ejb_jpa/src/main/webapp/WEB-INF/web.xml
index 6c0e313..3ea7331 100644
--- a/appserver/tests/embedded/cdi_ejb_jpa/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/embedded/cdi_ejb_jpa/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_ejb_jpa</display-name>
+ <display-name>cdi_ejb_jpa</display-name>
<distributable/>
</web-app>
diff --git a/appserver/tests/embedded/ejb/basic/pom.xml b/appserver/tests/embedded/ejb/basic/pom.xml
index 68427e7..3415594 100644
--- a/appserver/tests/embedded/ejb/basic/pom.xml
+++ b/appserver/tests/embedded/ejb/basic/pom.xml
@@ -44,7 +44,7 @@
</executions>
</plugin>
</plugins>
- </build>
+ </build>
<profiles>
<profile>
<id>run-with-uber-jar</id>
@@ -78,13 +78,13 @@
</dependency>
</dependencies>
</profile>
- </profiles>
- <dependencies>
+ </profiles>
+ <dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
</dependency>
- </dependencies>
+ </dependencies>
</project>
diff --git a/appserver/tests/embedded/ejb/basic/src/test/java/org/glassfish/tests/embedded/ejb/basic/test/EmbeddedTest.java b/appserver/tests/embedded/ejb/basic/src/test/java/org/glassfish/tests/embedded/ejb/basic/test/EmbeddedTest.java
index 1d21cbf..3efa986 100644
--- a/appserver/tests/embedded/ejb/basic/src/test/java/org/glassfish/tests/embedded/ejb/basic/test/EmbeddedTest.java
+++ b/appserver/tests/embedded/ejb/basic/src/test/java/org/glassfish/tests/embedded/ejb/basic/test/EmbeddedTest.java
@@ -40,7 +40,7 @@
public static void main(String[] args) {
EmbeddedTest test = new EmbeddedTest();
System.setProperty("basedir", System.getProperty());
- test.test();
+ test.test();
}
*/
@@ -75,7 +75,7 @@
glassfish.stop();
glassfish.dispose();
-
+
System.out.println("EmbeddedTest completed.");
}
diff --git a/appserver/tests/embedded/ejb/ejb-api/pom.xml b/appserver/tests/embedded/ejb/ejb-api/pom.xml
index 5bfd39c..85357b1 100644
--- a/appserver/tests/embedded/ejb/ejb-api/pom.xml
+++ b/appserver/tests/embedded/ejb/ejb-api/pom.xml
@@ -48,7 +48,7 @@
</executions>
</plugin>
</plugins>
- </build>
+ </build>
<profiles>
<profile>
<id>run-with-uber-jar</id>
@@ -83,12 +83,12 @@
</dependencies>
</profile>
</profiles>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
</dependency>
- </dependencies>
+ </dependencies>
</project>
diff --git a/appserver/tests/embedded/ejb/ejb-api/src/test/java/org/glassfish/tests/embedded/ejb/test/EmbeddedTest.java b/appserver/tests/embedded/ejb/ejb-api/src/test/java/org/glassfish/tests/embedded/ejb/test/EmbeddedTest.java
index a60e916..73cf331 100644
--- a/appserver/tests/embedded/ejb/ejb-api/src/test/java/org/glassfish/tests/embedded/ejb/test/EmbeddedTest.java
+++ b/appserver/tests/embedded/ejb/ejb-api/src/test/java/org/glassfish/tests/embedded/ejb/test/EmbeddedTest.java
@@ -36,12 +36,12 @@
public static void main(String[] args) {
EmbeddedTest test = new EmbeddedTest();
System.setProperty("basedir", System.getProperty("user.dir"));
- test.test();
+ test.test();
}
public File getDeployableArtifact() {
File f = new File(System.getProperty("basedir"), "target");
- f = new File(f, "classes");
+ f = new File(f, "classes");
return f;
}
diff --git a/appserver/tests/embedded/ejb/ejb-main/pom.xml b/appserver/tests/embedded/ejb/ejb-main/pom.xml
index 6ae8d21..1aadf81 100644
--- a/appserver/tests/embedded/ejb/ejb-main/pom.xml
+++ b/appserver/tests/embedded/ejb/ejb-main/pom.xml
@@ -68,7 +68,7 @@
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -81,5 +81,5 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- </dependencies>
+ </dependencies>
</project>
diff --git a/appserver/tests/embedded/ejb/pom.xml b/appserver/tests/embedded/ejb/pom.xml
index 5158003..140d787 100755
--- a/appserver/tests/embedded/ejb/pom.xml
+++ b/appserver/tests/embedded/ejb/pom.xml
@@ -24,9 +24,9 @@
<artifactId>ejb</artifactId>
<version>6.1.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>EJB related Embedded Tests</name>
+ <name>EJB related Embedded Tests</name>
<modules>
- <module>basic</module>
+ <module>basic</module>
<module>ejb-api</module>
<module>remoteejb</module>
</modules>
diff --git a/appserver/tests/embedded/ejb/remoteejb/pom.xml b/appserver/tests/embedded/ejb/remoteejb/pom.xml
index 246b916..8e4ee7b 100644
--- a/appserver/tests/embedded/ejb/remoteejb/pom.xml
+++ b/appserver/tests/embedded/ejb/remoteejb/pom.xml
@@ -90,13 +90,13 @@
</dependency>
</dependencies>
</profile>
- </profiles>
- <dependencies>
+ </profiles>
+ <dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
</dependency>
- </dependencies>
+ </dependencies>
</project>
diff --git a/appserver/tests/embedded/ejb/remoteejb/src/test/java/org/glassfish/tests/embedded/ejb/remoteejb/test/EJBTest.java b/appserver/tests/embedded/ejb/remoteejb/src/test/java/org/glassfish/tests/embedded/ejb/remoteejb/test/EJBTest.java
index f067ad3..615e137 100644
--- a/appserver/tests/embedded/ejb/remoteejb/src/test/java/org/glassfish/tests/embedded/ejb/remoteejb/test/EJBTest.java
+++ b/appserver/tests/embedded/ejb/remoteejb/src/test/java/org/glassfish/tests/embedded/ejb/remoteejb/test/EJBTest.java
@@ -85,7 +85,7 @@
// } finally {
// Thread.currentThread().setContextClassLoader(oldCL);
// }
-
+
glassfish.stop();
glassfish.dispose();
diff --git a/appserver/tests/embedded/glassfish_resources_xml/pom.xml b/appserver/tests/embedded/glassfish_resources_xml/pom.xml
index 87dfaad..a9859f8 100644
--- a/appserver/tests/embedded/glassfish_resources_xml/pom.xml
+++ b/appserver/tests/embedded/glassfish_resources_xml/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/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestBean.java b/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestBean.java
index 4423e18..c49b14b 100644
--- a/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestBean.java
+++ b/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestBean.java
@@ -16,7 +16,7 @@
package org.glassfish.tests.embedded.cdi_ejb_jpa;
-//Simple TestBean to test CDI.
+//Simple TestBean to test CDI.
import jakarta.ejb.Stateless;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext;
diff --git a/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestRequestScopedBean.java b/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestRequestScopedBean.java
index 05e4a47..75ea827 100644
--- a/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestRequestScopedBean.java
+++ b/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestRequestScopedBean.java
@@ -16,7 +16,7 @@
package org.glassfish.tests.embedded.cdi_ejb_jpa;
-//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/glassfish_resources_xml/src/main/webapp/WEB-INF/sun-web.xml b/appserver/tests/embedded/glassfish_resources_xml/src/main/webapp/WEB-INF/sun-web.xml
index 0105a07..ca51367 100644
--- a/appserver/tests/embedded/glassfish_resources_xml/src/main/webapp/WEB-INF/sun-web.xml
+++ b/appserver/tests/embedded/glassfish_resources_xml/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_ejb_jpa</context-root>
+ <context-root>/cdi_ejb_jpa</context-root>
</sun-web-app>
diff --git a/appserver/tests/embedded/glassfish_resources_xml/src/main/webapp/WEB-INF/web.xml b/appserver/tests/embedded/glassfish_resources_xml/src/main/webapp/WEB-INF/web.xml
index 6c0e313..3ea7331 100644
--- a/appserver/tests/embedded/glassfish_resources_xml/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/embedded/glassfish_resources_xml/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_ejb_jpa</display-name>
+ <display-name>cdi_ejb_jpa</display-name>
<distributable/>
</web-app>
diff --git a/appserver/tests/embedded/inplanted/pom.xml b/appserver/tests/embedded/inplanted/pom.xml
index 5e84387..1fe919f 100755
--- a/appserver/tests/embedded/inplanted/pom.xml
+++ b/appserver/tests/embedded/inplanted/pom.xml
@@ -60,7 +60,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4.2</version>
<configuration>
- <forkCount>1</forkCount>
+ <forkCount>1</forkCount>
<reuseForks>false</reuseForks>
</configuration>
</plugin>
@@ -77,7 +77,7 @@
<groupId>org.glassfish.main.extras</groupId>
<artifactId>glassfish-embedded-all</artifactId>
<version>6.1.1-SNAPSHOT</version>
- </dependency>
+ </dependency>
</dependencies>
</profile>
<profile>
@@ -88,7 +88,7 @@
<value>static-shell</value>
</property>
</activation>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>org.glassfish.main.extras</groupId>
<artifactId>glassfish-embedded-static-shell</artifactId>
@@ -99,13 +99,13 @@
</dependency>
</dependencies>
</profile>
- </profiles>
+ </profiles>
<dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.2</version>
- </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13.2</version>
+ </dependency>
<dependency>
<groupId>org.glassfish.main.web</groupId>
<artifactId>web-embed-api</artifactId>
diff --git a/appserver/tests/embedded/inplanted/src/test/java/org/glassfish/tests/embedded/inplanted/ExistingDomainTest.java b/appserver/tests/embedded/inplanted/src/test/java/org/glassfish/tests/embedded/inplanted/ExistingDomainTest.java
index bf793a0..e49929a 100644
--- a/appserver/tests/embedded/inplanted/src/test/java/org/glassfish/tests/embedded/inplanted/ExistingDomainTest.java
+++ b/appserver/tests/embedded/inplanted/src/test/java/org/glassfish/tests/embedded/inplanted/ExistingDomainTest.java
@@ -70,5 +70,5 @@
public static void shutdownServer() throws Exception {
EmbeddedServerUtils.shutdownServer(server);
}
-
+
}
diff --git a/appserver/tests/embedded/inplanted/src/test/java/org/glassfish/tests/embedded/inplanted/InplantedTest.java b/appserver/tests/embedded/inplanted/src/test/java/org/glassfish/tests/embedded/inplanted/InplantedTest.java
index a46d7a2..27a4dd5 100644
--- a/appserver/tests/embedded/inplanted/src/test/java/org/glassfish/tests/embedded/inplanted/InplantedTest.java
+++ b/appserver/tests/embedded/inplanted/src/test/java/org/glassfish/tests/embedded/inplanted/InplantedTest.java
@@ -69,7 +69,7 @@
server.addContainer(b);
EmbeddedWebContainer embedded = (EmbeddedWebContainer) b.create(server);
embedded.bind(http, "http");
-
+
DeployCommandParameters dp = new DeployCommandParameters(f);
String appName = server.getDeployer().deploy(war, dp);
WebClient webClient = new WebClient();
@@ -91,6 +91,6 @@
@AfterClass
public static void shutdownServer() throws Exception {
- EmbeddedServerUtils.shutdownServer(server);
+ EmbeddedServerUtils.shutdownServer(server);
}
}
diff --git a/appserver/tests/embedded/inplanted/src/test/java/org/glassfish/tests/embedded/web/HelloWeb.java b/appserver/tests/embedded/inplanted/src/test/java/org/glassfish/tests/embedded/web/HelloWeb.java
index de9a74f..e144234 100644
--- a/appserver/tests/embedded/inplanted/src/test/java/org/glassfish/tests/embedded/web/HelloWeb.java
+++ b/appserver/tests/embedded/inplanted/src/test/java/org/glassfish/tests/embedded/web/HelloWeb.java
@@ -29,16 +29,16 @@
public HelloWeb() {
System.out.println("Servlet WEB-HELLO initialized");
}
-
+
public void doGet(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
PrintWriter pw = res.getWriter();
try {
- pw.println("Hello World !");
- } catch(Exception e) {
- e.printStackTrace();
+ pw.println("Hello World !");
+ } catch(Exception e) {
+ e.printStackTrace();
}
}
}
diff --git a/appserver/tests/embedded/maven-plugin/applicationDispatcher/src/main/java/test/ServletTest.java b/appserver/tests/embedded/maven-plugin/applicationDispatcher/src/main/java/test/ServletTest.java
index 5dec147..dae8861 100644
--- a/appserver/tests/embedded/maven-plugin/applicationDispatcher/src/main/java/test/ServletTest.java
+++ b/appserver/tests/embedded/maven-plugin/applicationDispatcher/src/main/java/test/ServletTest.java
@@ -34,23 +34,23 @@
private ServletContext context;
private static String status = "ApplicationDispatcher::PASS";
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
try{
- RequestDispatcher requestD =
+ RequestDispatcher requestD =
getServletContext().getRequestDispatcher("/test.jsp");
if ( requestD == null){
- status = "ApplicationDispatcher::FAIL";
+ status = "ApplicationDispatcher::FAIL";
}
System.out.println("[Servlet.RequestDispatcher: " + requestD + "]");
} catch (Throwable t){
- status = "ApplicationDispatcher::FAIL";
+ status = "ApplicationDispatcher::FAIL";
}
- System.out.println("status: " + status);
+ System.out.println("status: " + status);
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -58,7 +58,7 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
PrintWriter out = response.getWriter();
diff --git a/appserver/tests/embedded/maven-plugin/applicationDispatcher/src/main/webapp/WEB-INF/web.xml b/appserver/tests/embedded/maven-plugin/applicationDispatcher/src/main/webapp/WEB-INF/web.xml
index 655c0ca..12554f0 100755
--- a/appserver/tests/embedded/maven-plugin/applicationDispatcher/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/embedded/maven-plugin/applicationDispatcher/src/main/webapp/WEB-INF/web.xml
@@ -28,12 +28,12 @@
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
<load-on-startup>1000</load-on-startup>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/*</url-pattern>
- </servlet-mapping>
+ </servlet-mapping>
</web-app>
diff --git a/appserver/tests/embedded/maven-plugin/applicationDispatcher/src/test/java/org/glassfish/tests/applicationDispatcher/WebTest.java b/appserver/tests/embedded/maven-plugin/applicationDispatcher/src/test/java/org/glassfish/tests/applicationDispatcher/WebTest.java
index 62a45a2..8e3e62e 100644
--- a/appserver/tests/embedded/maven-plugin/applicationDispatcher/src/test/java/org/glassfish/tests/applicationDispatcher/WebTest.java
+++ b/appserver/tests/embedded/maven-plugin/applicationDispatcher/src/test/java/org/glassfish/tests/applicationDispatcher/WebTest.java
@@ -31,12 +31,12 @@
import java.net.URLConnection;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
private String contextPath = "test";
-
+
@BeforeClass
public static void setup() throws IOException {
}
diff --git a/appserver/tests/embedded/maven-plugin/dirListing/src/main/java/test/ServletTest.java b/appserver/tests/embedded/maven-plugin/dirListing/src/main/java/test/ServletTest.java
index 860bcc4..e7a7c09 100644
--- a/appserver/tests/embedded/maven-plugin/dirListing/src/main/java/test/ServletTest.java
+++ b/appserver/tests/embedded/maven-plugin/dirListing/src/main/java/test/ServletTest.java
@@ -33,7 +33,7 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
@@ -44,7 +44,7 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
}
@@ -52,7 +52,7 @@
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
diff --git a/appserver/tests/embedded/maven-plugin/dirListing/src/main/webapp/WEB-INF/web.xml b/appserver/tests/embedded/maven-plugin/dirListing/src/main/webapp/WEB-INF/web.xml
index 6f43e08..93e2518 100755
--- a/appserver/tests/embedded/maven-plugin/dirListing/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/embedded/maven-plugin/dirListing/src/main/webapp/WEB-INF/web.xml
@@ -23,7 +23,7 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <listener>
+ <listener>
<listener-class>test.ServletTest</listener-class>
</listener>
@@ -31,7 +31,7 @@
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<servlet-name>default</servlet-name>
diff --git a/appserver/tests/embedded/maven-plugin/dirListing/src/test/java/org/glassfish/tests/dirListing/WebTest.java b/appserver/tests/embedded/maven-plugin/dirListing/src/test/java/org/glassfish/tests/dirListing/WebTest.java
index 54ed6e3..3c15903 100644
--- a/appserver/tests/embedded/maven-plugin/dirListing/src/test/java/org/glassfish/tests/dirListing/WebTest.java
+++ b/appserver/tests/embedded/maven-plugin/dirListing/src/test/java/org/glassfish/tests/dirListing/WebTest.java
@@ -31,12 +31,12 @@
import java.net.URLConnection;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
private String contextPath = "test";
-
+
@BeforeClass
public static void setup() throws IOException {
}
@@ -53,7 +53,7 @@
URLConnection yc = servlet.openConnection();
BufferedReader in = new BufferedReader(new InputStreamReader(
yc.getInputStream()));
- String line = null;
+ String line = null;
int index=0, lineNum=0;
String cookies = "";
while ((line = in.readLine()) != null) {
diff --git a/appserver/tests/embedded/maven-plugin/filterURIMapping/src/main/java/test/FilterTest.java b/appserver/tests/embedded/maven-plugin/filterURIMapping/src/main/java/test/FilterTest.java
index fcf3624..eec957e 100644
--- a/appserver/tests/embedded/maven-plugin/filterURIMapping/src/main/java/test/FilterTest.java
+++ b/appserver/tests/embedded/maven-plugin/filterURIMapping/src/main/java/test/FilterTest.java
@@ -19,25 +19,25 @@
import jakarta.servlet.*;
import jakarta.servlet.http.*;
public class FilterTest implements Filter{
-
+
private ServletContext context;
-
+
public void destroy() {
System.out.println("[Filter.destroy]");
- }
-
+ }
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
-
+
((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS");
filterChain.doFilter(request, response);
-
- }
-
-
+
+ }
+
+
public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
context = filterConfig.getServletContext();
}
-
+
}
diff --git a/appserver/tests/embedded/maven-plugin/filterURIMapping/src/main/java/test/ServletTest.java b/appserver/tests/embedded/maven-plugin/filterURIMapping/src/main/java/test/ServletTest.java
index a76f882..f1f627c 100644
--- a/appserver/tests/embedded/maven-plugin/filterURIMapping/src/main/java/test/ServletTest.java
+++ b/appserver/tests/embedded/maven-plugin/filterURIMapping/src/main/java/test/ServletTest.java
@@ -25,13 +25,13 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
context = config.getServletContext();
System.out.println("[Servlet.init] " + context.getMajorVersion());
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -39,18 +39,18 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
Object obj = request.getSession().getAttribute("FILTER");
System.out.println(obj);
if ((obj != null) && (obj.equals("PASS"))) {
out.println("Filter invoked");
}
-
+
}
}
diff --git a/appserver/tests/embedded/maven-plugin/filterURIMapping/src/main/webapp/WEB-INF/web.xml b/appserver/tests/embedded/maven-plugin/filterURIMapping/src/main/webapp/WEB-INF/web.xml
index c9b81fe..1d702b8 100644
--- a/appserver/tests/embedded/maven-plugin/filterURIMapping/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/embedded/maven-plugin/filterURIMapping/src/main/webapp/WEB-INF/web.xml
@@ -26,23 +26,23 @@
<filter>
<filter-name>FilterTest</filter-name>
<filter-class>test.FilterTest</filter-class>
- </filter>
-
+ </filter>
+
<filter-mapping>
<filter-name>FilterTest</filter-name>
<url-pattern>/ServletTest</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>ERROR</dispatcher>
</filter-mapping>
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/embedded/maven-plugin/filterURIMapping/src/test/java/org/glassfish/tests/filterURIMapping/WebTest.java b/appserver/tests/embedded/maven-plugin/filterURIMapping/src/test/java/org/glassfish/tests/filterURIMapping/WebTest.java
index 4f8e44f..8643cad 100644
--- a/appserver/tests/embedded/maven-plugin/filterURIMapping/src/test/java/org/glassfish/tests/filterURIMapping/WebTest.java
+++ b/appserver/tests/embedded/maven-plugin/filterURIMapping/src/test/java/org/glassfish/tests/filterURIMapping/WebTest.java
@@ -31,12 +31,12 @@
import java.net.URLConnection;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
private String contextPath = "test";
-
+
@BeforeClass
public static void setup() throws IOException {
}
@@ -74,7 +74,7 @@
}
} catch (IOException ioe) {
// ignore
- }
+ }
}
Assert.assertTrue(pass);
}
diff --git a/appserver/tests/embedded/maven-plugin/getRequestURI/src/main/webapp/WEB-INF/web.xml b/appserver/tests/embedded/maven-plugin/getRequestURI/src/main/webapp/WEB-INF/web.xml
index 3bcbccd..8ed934f 100644
--- a/appserver/tests/embedded/maven-plugin/getRequestURI/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/embedded/maven-plugin/getRequestURI/src/main/webapp/WEB-INF/web.xml
@@ -22,13 +22,13 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/embedded/maven-plugin/index/src/test/java/org/glassfish/tests/index/WebTest.java b/appserver/tests/embedded/maven-plugin/index/src/test/java/org/glassfish/tests/index/WebTest.java
index 5484863..21a42e7 100644
--- a/appserver/tests/embedded/maven-plugin/index/src/test/java/org/glassfish/tests/index/WebTest.java
+++ b/appserver/tests/embedded/maven-plugin/index/src/test/java/org/glassfish/tests/index/WebTest.java
@@ -31,7 +31,7 @@
import java.net.URLConnection;
public class WebTest {
-
+
@BeforeClass
public static void setup() throws IOException {
}
diff --git a/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/src/main/java/test/ServletTest.java b/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/src/main/java/test/ServletTest.java
index 750862b..43bc911 100644
--- a/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/src/main/java/test/ServletTest.java
+++ b/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/src/main/java/test/ServletTest.java
@@ -31,7 +31,7 @@
import java.sql.*;
public class ServletTest extends HttpServlet{
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
@@ -42,9 +42,9 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
PrintWriter out = response.getWriter();
out.println("jmxUndeployEvent::FAIL");
}
diff --git a/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/src/main/webapp/WEB-INF/web.xml b/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/src/main/webapp/WEB-INF/web.xml
index 6be4073..3dcff7e 100755
--- a/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/src/main/webapp/WEB-INF/web.xml
@@ -27,14 +27,14 @@
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/src/test/java/org/glassfish/tests/jmxUndeployEvent/WebTest.java b/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/src/test/java/org/glassfish/tests/jmxUndeployEvent/WebTest.java
index 609ae0a..60f34d3 100644
--- a/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/src/test/java/org/glassfish/tests/jmxUndeployEvent/WebTest.java
+++ b/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/src/test/java/org/glassfish/tests/jmxUndeployEvent/WebTest.java
@@ -27,9 +27,9 @@
import java.net.HttpURLConnection;
public class WebTest {
-
+
private String contextPath = "test";
-
+
@BeforeClass
public static void setup() throws IOException {
}
diff --git a/appserver/tests/embedded/maven-plugin/jsftest/src/main/java/org/glassfish/tests/embedded/jsftest/JSFTestBean.java b/appserver/tests/embedded/maven-plugin/jsftest/src/main/java/org/glassfish/tests/embedded/jsftest/JSFTestBean.java
index 48efd0b..e16cb62 100644
--- a/appserver/tests/embedded/maven-plugin/jsftest/src/main/java/org/glassfish/tests/embedded/jsftest/JSFTestBean.java
+++ b/appserver/tests/embedded/maven-plugin/jsftest/src/main/java/org/glassfish/tests/embedded/jsftest/JSFTestBean.java
@@ -35,7 +35,7 @@
new TestTable("Mr. X", "+122222222", "SFO"),
};
-
+
public class TestTable {
String name;
String number;
diff --git a/appserver/tests/embedded/maven-plugin/jsftest/src/test/java/org/glassfish/tests/embedded/jsftest/JSFTest.java b/appserver/tests/embedded/maven-plugin/jsftest/src/test/java/org/glassfish/tests/embedded/jsftest/JSFTest.java
index 79b346a..5c95cf3 100644
--- a/appserver/tests/embedded/maven-plugin/jsftest/src/test/java/org/glassfish/tests/embedded/jsftest/JSFTest.java
+++ b/appserver/tests/embedded/maven-plugin/jsftest/src/test/java/org/glassfish/tests/embedded/jsftest/JSFTest.java
@@ -38,7 +38,7 @@
disableCertValidation();
goGet("http://localhost:8080/test/JSFTestServlet", "Created viewRoot");
-
+
// test non secure access.
goGet("http://localhost:8080/test", "BHAVANI", "SHANKAR", "Mr. X");
diff --git a/appserver/tests/embedded/maven-plugin/jsptest/src/main/java/org/glassfish/tests/embedded/jsptest/JspTestServlet.java b/appserver/tests/embedded/maven-plugin/jsptest/src/main/java/org/glassfish/tests/embedded/jsptest/JspTestServlet.java
index c58ad59..5642b2f 100644
--- a/appserver/tests/embedded/maven-plugin/jsptest/src/main/java/org/glassfish/tests/embedded/jsptest/JspTestServlet.java
+++ b/appserver/tests/embedded/maven-plugin/jsptest/src/main/java/org/glassfish/tests/embedded/jsptest/JspTestServlet.java
@@ -39,7 +39,7 @@
print("\n[OUTPUT from JspTestServlet]", out);
print("[Hi from JspTestServlet]", out);
print("[End of OUTPUT from SecureWebAppTestServlet]", out);
-
+
out.flush();
out.close();
}
diff --git a/appserver/tests/embedded/maven-plugin/jsptest/src/main/webapp/WEB-INF/sun-web.xml b/appserver/tests/embedded/maven-plugin/jsptest/src/main/webapp/WEB-INF/sun-web.xml
index 5187c54..210909b 100644
--- a/appserver/tests/embedded/maven-plugin/jsptest/src/main/webapp/WEB-INF/sun-web.xml
+++ b/appserver/tests/embedded/maven-plugin/jsptest/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>/hellojsp</context-root>
+ <context-root>/hellojsp</context-root>
</sun-web-app>
diff --git a/appserver/tests/embedded/maven-plugin/jsptest/src/main/webapp/WEB-INF/web.xml b/appserver/tests/embedded/maven-plugin/jsptest/src/main/webapp/WEB-INF/web.xml
index ace5297..6347c9f 100644
--- a/appserver/tests/embedded/maven-plugin/jsptest/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/embedded/maven-plugin/jsptest/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>jsptest</display-name>
+ <display-name>jsptest</display-name>
<distributable/>
</web-app>
diff --git a/appserver/tests/embedded/maven-plugin/multipleApps/src/main/java/org/glassfish/tests/embedded/jsptest/JspTestServlet.java b/appserver/tests/embedded/maven-plugin/multipleApps/src/main/java/org/glassfish/tests/embedded/jsptest/JspTestServlet.java
index c58ad59..5642b2f 100644
--- a/appserver/tests/embedded/maven-plugin/multipleApps/src/main/java/org/glassfish/tests/embedded/jsptest/JspTestServlet.java
+++ b/appserver/tests/embedded/maven-plugin/multipleApps/src/main/java/org/glassfish/tests/embedded/jsptest/JspTestServlet.java
@@ -39,7 +39,7 @@
print("\n[OUTPUT from JspTestServlet]", out);
print("[Hi from JspTestServlet]", out);
print("[End of OUTPUT from SecureWebAppTestServlet]", out);
-
+
out.flush();
out.close();
}
diff --git a/appserver/tests/embedded/maven-plugin/multipleApps/src/main/webapp/WEB-INF/sun-web.xml b/appserver/tests/embedded/maven-plugin/multipleApps/src/main/webapp/WEB-INF/sun-web.xml
index b43aedf..4258365 100644
--- a/appserver/tests/embedded/maven-plugin/multipleApps/src/main/webapp/WEB-INF/sun-web.xml
+++ b/appserver/tests/embedded/maven-plugin/multipleApps/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>/firstapp</context-root>
+ <context-root>/firstapp</context-root>
</sun-web-app>
diff --git a/appserver/tests/embedded/maven-plugin/multipleApps/src/main/webapp/WEB-INF/web.xml b/appserver/tests/embedded/maven-plugin/multipleApps/src/main/webapp/WEB-INF/web.xml
index f3f2238..a69c00f 100644
--- a/appserver/tests/embedded/maven-plugin/multipleApps/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/embedded/maven-plugin/multipleApps/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>firstapp</display-name>
+ <display-name>firstapp</display-name>
<distributable/>
</web-app>
diff --git a/appserver/tests/embedded/maven-plugin/pom.xml b/appserver/tests/embedded/maven-plugin/pom.xml
index fbad7b3..85eb176 100644
--- a/appserver/tests/embedded/maven-plugin/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/pom.xml
@@ -114,8 +114,8 @@
</modules>
</profile>
</profiles>
-
-
+
+
<build>
<defaultGoal>install</defaultGoal>
<testSourceDirectory>src/test/java</testSourceDirectory>
@@ -128,7 +128,7 @@
<version>2.12</version>
<configuration>
<skip>true</skip>
- <forkCount>0</forkCount>
+ <forkCount>0</forkCount>
</configuration>
<executions>
<execution>
@@ -176,25 +176,25 @@
<serverID>embedded</serverID>
<ports>
<https-listener>8181</https-listener>
- </ports>
+ </ports>
</configuration>
<dependencies>
<dependency>
<groupId>org.glassfish.main.common</groupId>
<artifactId>simple-glassfish-api</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.glassfish.main.extras</groupId>
<artifactId>glassfish-embedded-all</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
- </plugin>
+ </plugin>
</plugins>
</pluginManagement>
</build>
-
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -242,13 +242,13 @@
<artifactId>grizzly-http-servlet</artifactId>
<version>2.4.3</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
<scope>provided</scope>
<version>3.0.0-RC1</version>
- </dependency>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
diff --git a/appserver/tests/embedded/maven-plugin/queryString/src/main/java/test/ServletTest.java b/appserver/tests/embedded/maven-plugin/queryString/src/main/java/test/ServletTest.java
index e49289f..074cd5e 100644
--- a/appserver/tests/embedded/maven-plugin/queryString/src/main/java/test/ServletTest.java
+++ b/appserver/tests/embedded/maven-plugin/queryString/src/main/java/test/ServletTest.java
@@ -25,13 +25,13 @@
public class ServletTest extends HttpServlet {
private static boolean isRedirected = false;
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
context = config.getServletContext();
System.out.println("[Servlet.init] " + context.getMajorVersion());
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -39,14 +39,14 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
System.out.println("requestUri: " + request.getRequestURI());
-
+
if (!isRedirected){
String url = request.getParameter("url") + "?TEST=PASS";
System.out.println("[URL] " + url);
@@ -56,7 +56,7 @@
out.flush();
return;
}
-
+
out.println("TEST:" + request.getParameter("TEST"));
out.flush();
}
diff --git a/appserver/tests/embedded/maven-plugin/queryString/src/main/webapp/WEB-INF/web.xml b/appserver/tests/embedded/maven-plugin/queryString/src/main/webapp/WEB-INF/web.xml
index 3dff9cb..4ec62fb 100644
--- a/appserver/tests/embedded/maven-plugin/queryString/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/embedded/maven-plugin/queryString/src/main/webapp/WEB-INF/web.xml
@@ -22,18 +22,18 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
</servlet-mapping>
-
+
<session-config>
<session-timeout>10</session-timeout>
</session-config>
diff --git a/appserver/tests/embedded/maven-plugin/queryString/src/test/java/org/glassfish/tests/queryString/WebTest.java b/appserver/tests/embedded/maven-plugin/queryString/src/test/java/org/glassfish/tests/queryString/WebTest.java
index 5442de2..a51c2af 100644
--- a/appserver/tests/embedded/maven-plugin/queryString/src/test/java/org/glassfish/tests/queryString/WebTest.java
+++ b/appserver/tests/embedded/maven-plugin/queryString/src/test/java/org/glassfish/tests/queryString/WebTest.java
@@ -31,12 +31,12 @@
import java.net.URLConnection;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
private String contextPath = "/test";
-
+
@BeforeClass
public static void setup() throws IOException {
}
@@ -56,7 +56,7 @@
URLConnection yc = servlet.openConnection();
BufferedReader in = new BufferedReader(new InputStreamReader(
yc.getInputStream()));
-
+
String line = null;
int index;
while ((line = in.readLine()) != null) {
@@ -89,7 +89,7 @@
}
}
}
-
+
} catch(Exception e) {
e.printStackTrace();
throw e;
diff --git a/appserver/tests/embedded/maven-plugin/remoteejbs/src/test/java/org/glassfish/tests/embedded/remoteejbs/EjbTest.java b/appserver/tests/embedded/maven-plugin/remoteejbs/src/test/java/org/glassfish/tests/embedded/remoteejbs/EjbTest.java
index 13580be..05cfe26 100644
--- a/appserver/tests/embedded/maven-plugin/remoteejbs/src/test/java/org/glassfish/tests/embedded/remoteejbs/EjbTest.java
+++ b/appserver/tests/embedded/maven-plugin/remoteejbs/src/test/java/org/glassfish/tests/embedded/remoteejbs/EjbTest.java
@@ -32,7 +32,7 @@
public void testTimer() throws Exception {
try {
InitialContext ic = new InitialContext();
- TimerRemote ejb =
+ TimerRemote ejb =
(TimerRemote) ic.lookup("java:global/remoteejbs/TimerEjb");
System.out.println("Looked up [" + ejb + "]");
ejb.createTimer();
diff --git a/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/FilterTest.java b/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/FilterTest.java
index fcf3624..eec957e 100755
--- a/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/FilterTest.java
+++ b/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/FilterTest.java
@@ -19,25 +19,25 @@
import jakarta.servlet.*;
import jakarta.servlet.http.*;
public class FilterTest implements Filter{
-
+
private ServletContext context;
-
+
public void destroy() {
System.out.println("[Filter.destroy]");
- }
-
+ }
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
-
+
((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS");
filterChain.doFilter(request, response);
-
- }
-
-
+
+ }
+
+
public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
context = filterConfig.getServletContext();
}
-
+
}
diff --git a/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/ServletTest.java b/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/ServletTest.java
index d4a3174..daa8053 100644
--- a/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/ServletTest.java
+++ b/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/ServletTest.java
@@ -46,13 +46,13 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
context = config.getServletContext();
System.out.println("[Servlet.init] " + context.getMajorVersion());
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -60,23 +60,23 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-REQUEST", request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = context.getRequestDispatcher("/ServletTest2");
- rd.forward(request, response);
+ rd.forward(request, response);
}
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/ServletTest2.java b/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/ServletTest2.java
index db2cb50..00775a6 100755
--- a/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/ServletTest2.java
+++ b/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/ServletTest2.java
@@ -25,10 +25,10 @@
public class ServletTest2 extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet2.init]");
+ System.out.println("[Servlet2.init]");
context = config.getServletContext();
}
@@ -37,23 +37,23 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet2.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-FORWARD",request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = request.getRequestDispatcher("/ServletTest3");
- rd.include(request, response);
+ rd.include(request, response);
}
-
+
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/ServletTest3.java b/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/ServletTest3.java
index 3e8d25b..e78fec2 100644
--- a/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/ServletTest3.java
+++ b/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/ServletTest3.java
@@ -46,11 +46,11 @@
public class ServletTest3 extends HttpServlet{
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet3.init]");
- context = config.getServletContext();
+ System.out.println("[Servlet3.init]");
+ context = config.getServletContext();
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -58,12 +58,12 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet3.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("FILTER-REQUEST:" + request.getSession().getAttribute("FILTER-REQUEST"));
out.println("FILTER-FORWARD:" + request.getSession().getAttribute("FILTER-FORWARD"));
out.println("FILTER-INCLUDE:" + request.getSession().getAttribute("FILTER"));
diff --git a/appserver/tests/embedded/maven-plugin/scattered/src/main/webapp/WEB-INF/web.xml b/appserver/tests/embedded/maven-plugin/scattered/src/main/webapp/WEB-INF/web.xml
index f9861df..1f84cee 100644
--- a/appserver/tests/embedded/maven-plugin/scattered/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/embedded/maven-plugin/scattered/src/main/webapp/WEB-INF/web.xml
@@ -22,37 +22,37 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<filter>
<filter-name>FilterTest</filter-name>
<filter-class>test.FilterTest</filter-class>
- </filter>
-
+ </filter>
+
<filter-mapping>
<filter-name>FilterTest</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>ERROR</dispatcher>
</filter-mapping>
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<display-name>ServletTest2</display-name>
<servlet-name>ServletTest2</servlet-name>
<servlet-class>test.ServletTest2</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<display-name>ServletTest3</display-name>
<servlet-name>ServletTest3</servlet-name>
<servlet-class>test.ServletTest3</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
@@ -65,7 +65,7 @@
<servlet-name>ServletTest3</servlet-name>
<url-pattern>/ServletTest3</url-pattern>
</servlet-mapping>
-
+
<session-config>
<session-timeout>10</session-timeout>
</session-config>
diff --git a/appserver/tests/embedded/maven-plugin/secureWebApp/pom.xml b/appserver/tests/embedded/maven-plugin/secureWebApp/pom.xml
index 40329e5..28548c1 100644
--- a/appserver/tests/embedded/maven-plugin/secureWebApp/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/secureWebApp/pom.xml
@@ -37,18 +37,18 @@
<groupId>org.glassfish.embedded</groupId>
<artifactId>maven-embedded-glassfish-plugin</artifactId>
<configuration>
- <bootstrapProperties>
- <property>test_key=test_value</property>
- </bootstrapProperties>
- <bootstrapPropertiesFile>bootstrap.properties</bootstrapPropertiesFile>
- <glassfishProperties>
- <property>embedded-glassfish-config.server.jms-service.jms-host.default_JMS_host.port=17676</property>
- </glassfishProperties>
- <glassfishPropertiesFile>glassfish.properties</glassfishPropertiesFile>
- <systemProperties>
- <property>ANTLR_USE_DIRECT_CLASS_LOADING=true</property>
- </systemProperties>
- <systemPropertiesFile>system.properties</systemPropertiesFile>
+ <bootstrapProperties>
+ <property>test_key=test_value</property>
+ </bootstrapProperties>
+ <bootstrapPropertiesFile>bootstrap.properties</bootstrapPropertiesFile>
+ <glassfishProperties>
+ <property>embedded-glassfish-config.server.jms-service.jms-host.default_JMS_host.port=17676</property>
+ </glassfishProperties>
+ <glassfishPropertiesFile>glassfish.properties</glassfishPropertiesFile>
+ <systemProperties>
+ <property>ANTLR_USE_DIRECT_CLASS_LOADING=true</property>
+ </systemProperties>
+ <systemPropertiesFile>system.properties</systemPropertiesFile>
</configuration>
<executions>
<execution>
diff --git a/appserver/tests/embedded/maven-plugin/secureWebApp/src/main/java/test/SecureWebAppTestServlet.java b/appserver/tests/embedded/maven-plugin/secureWebApp/src/main/java/test/SecureWebAppTestServlet.java
index 25904a1..fbb7927 100644
--- a/appserver/tests/embedded/maven-plugin/secureWebApp/src/main/java/test/SecureWebAppTestServlet.java
+++ b/appserver/tests/embedded/maven-plugin/secureWebApp/src/main/java/test/SecureWebAppTestServlet.java
@@ -56,7 +56,7 @@
return;
}
print("[End of OUTPUT from SecureWebAppTestServlet]", out);
-
+
out.flush();
out.close();
}
diff --git a/appserver/tests/embedded/maven-plugin/sessionDestroyed/src/main/java/test/ServletTest.java b/appserver/tests/embedded/maven-plugin/sessionDestroyed/src/main/java/test/ServletTest.java
index 5edcff0..eecffd7 100644
--- a/appserver/tests/embedded/maven-plugin/sessionDestroyed/src/main/java/test/ServletTest.java
+++ b/appserver/tests/embedded/maven-plugin/sessionDestroyed/src/main/java/test/ServletTest.java
@@ -34,7 +34,7 @@
private ServletContext context;
private static String status = "DESTROYED:FAIL";
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
@@ -45,7 +45,7 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
request.getSession().setAttribute("test","DESTROYED:PASS");
@@ -60,10 +60,10 @@
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
- status = (String)httpSessionEvent.getSession().getAttribute("test");
+ status = (String)httpSessionEvent.getSession().getAttribute("test");
}
}
diff --git a/appserver/tests/embedded/maven-plugin/sessionDestroyed/src/main/webapp/WEB-INF/web.xml b/appserver/tests/embedded/maven-plugin/sessionDestroyed/src/main/webapp/WEB-INF/web.xml
index 7eb5ec0..42f4929 100755
--- a/appserver/tests/embedded/maven-plugin/sessionDestroyed/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/embedded/maven-plugin/sessionDestroyed/src/main/webapp/WEB-INF/web.xml
@@ -23,7 +23,7 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <listener>
+ <listener>
<listener-class>test.ServletTest</listener-class>
</listener>
@@ -31,14 +31,14 @@
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/embedded/maven-plugin/sessionDestroyed/src/test/java/org/glassfish/tests/sessionDestroyed/WebTest.java b/appserver/tests/embedded/maven-plugin/sessionDestroyed/src/test/java/org/glassfish/tests/sessionDestroyed/WebTest.java
index 9575629..e35b521 100644
--- a/appserver/tests/embedded/maven-plugin/sessionDestroyed/src/test/java/org/glassfish/tests/sessionDestroyed/WebTest.java
+++ b/appserver/tests/embedded/maven-plugin/sessionDestroyed/src/test/java/org/glassfish/tests/sessionDestroyed/WebTest.java
@@ -31,12 +31,12 @@
import java.net.URLConnection;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
private String contextPath = "test";
-
+
@BeforeClass
public static void setup() throws IOException {
}
diff --git a/appserver/tests/embedded/maven-plugin/simple/pom.xml b/appserver/tests/embedded/maven-plugin/simple/pom.xml
index 59844af..7bfdbf1 100644
--- a/appserver/tests/embedded/maven-plugin/simple/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/simple/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.glassfish.tests.embedded</groupId>
<artifactId>maven-plugin</artifactId>
<version>6.1.1-SNAPSHOT</version>
- </parent>
+ </parent>
<groupId>org.glassfish</groupId>
<artifactId>maven-glassfish-plugin-tester-deploy</artifactId>
<packaging>pom</packaging>
@@ -38,7 +38,7 @@
<configuration>
<goalPrefix>glassfish</goalPrefix>
<app>hello.war</app>
- <port>8080</port>
+ <port>8080</port>
</configuration>
<executions>
<execution>
diff --git a/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/FilterTest.java b/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/FilterTest.java
index fcf3624..eec957e 100755
--- a/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/FilterTest.java
+++ b/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/FilterTest.java
@@ -19,25 +19,25 @@
import jakarta.servlet.*;
import jakarta.servlet.http.*;
public class FilterTest implements Filter{
-
+
private ServletContext context;
-
+
public void destroy() {
System.out.println("[Filter.destroy]");
- }
-
+ }
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
-
+
((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS");
filterChain.doFilter(request, response);
-
- }
-
-
+
+ }
+
+
public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
context = filterConfig.getServletContext();
}
-
+
}
diff --git a/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest.java b/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest.java
index d4a3174..daa8053 100644
--- a/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest.java
+++ b/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest.java
@@ -46,13 +46,13 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
context = config.getServletContext();
System.out.println("[Servlet.init] " + context.getMajorVersion());
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -60,23 +60,23 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-REQUEST", request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = context.getRequestDispatcher("/ServletTest2");
- rd.forward(request, response);
+ rd.forward(request, response);
}
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest2.java b/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest2.java
index db2cb50..00775a6 100755
--- a/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest2.java
+++ b/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest2.java
@@ -25,10 +25,10 @@
public class ServletTest2 extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet2.init]");
+ System.out.println("[Servlet2.init]");
context = config.getServletContext();
}
@@ -37,23 +37,23 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet2.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-FORWARD",request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = request.getRequestDispatcher("/ServletTest3");
- rd.include(request, response);
+ rd.include(request, response);
}
-
+
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest3.java b/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest3.java
index 3e8d25b..e78fec2 100644
--- a/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest3.java
+++ b/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest3.java
@@ -46,11 +46,11 @@
public class ServletTest3 extends HttpServlet{
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet3.init]");
- context = config.getServletContext();
+ System.out.println("[Servlet3.init]");
+ context = config.getServletContext();
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -58,12 +58,12 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet3.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("FILTER-REQUEST:" + request.getSession().getAttribute("FILTER-REQUEST"));
out.println("FILTER-FORWARD:" + request.getSession().getAttribute("FILTER-FORWARD"));
out.println("FILTER-INCLUDE:" + request.getSession().getAttribute("FILTER"));
diff --git a/appserver/tests/embedded/maven-plugin/standalonewar/src/main/webapp/WEB-INF/web.xml b/appserver/tests/embedded/maven-plugin/standalonewar/src/main/webapp/WEB-INF/web.xml
index f9861df..1f84cee 100644
--- a/appserver/tests/embedded/maven-plugin/standalonewar/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/embedded/maven-plugin/standalonewar/src/main/webapp/WEB-INF/web.xml
@@ -22,37 +22,37 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<filter>
<filter-name>FilterTest</filter-name>
<filter-class>test.FilterTest</filter-class>
- </filter>
-
+ </filter>
+
<filter-mapping>
<filter-name>FilterTest</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>ERROR</dispatcher>
</filter-mapping>
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<display-name>ServletTest2</display-name>
<servlet-name>ServletTest2</servlet-name>
<servlet-class>test.ServletTest2</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<display-name>ServletTest3</display-name>
<servlet-name>ServletTest3</servlet-name>
<servlet-class>test.ServletTest3</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
@@ -65,7 +65,7 @@
<servlet-name>ServletTest3</servlet-name>
<url-pattern>/ServletTest3</url-pattern>
</servlet-mapping>
-
+
<session-config>
<session-timeout>10</session-timeout>
</session-config>
diff --git a/appserver/tests/embedded/maven-plugin/standalonewar/src/test/java/org/glassfish/tests/standalonewar/WebTest.java b/appserver/tests/embedded/maven-plugin/standalonewar/src/test/java/org/glassfish/tests/standalonewar/WebTest.java
index 0909226..dd80a01 100644
--- a/appserver/tests/embedded/maven-plugin/standalonewar/src/test/java/org/glassfish/tests/standalonewar/WebTest.java
+++ b/appserver/tests/embedded/maven-plugin/standalonewar/src/test/java/org/glassfish/tests/standalonewar/WebTest.java
@@ -31,12 +31,12 @@
import java.net.URLConnection;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 3;
private String contextPath = "test";
-
+
@BeforeClass
public static void setup() throws IOException {
}
diff --git a/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml b/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml
index e909787..e7e385e 100644
--- a/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml
@@ -39,9 +39,9 @@
<dependency>
<groupId>org.glassfish.main.extras</groupId>
<artifactId>glassfish-embedded-static-shell</artifactId>
- <scope>system</scope>
- <version>${project.version}</version>
- <systemPath>${env.S1AS_HOME}/lib/embedded/glassfish-embedded-static-shell.jar</systemPath>
+ <scope>system</scope>
+ <version>${project.version}</version>
+ <systemPath>${env.S1AS_HOME}/lib/embedded/glassfish-embedded-static-shell.jar</systemPath>
</dependency>
</dependencies>
<executions>
diff --git a/appserver/tests/embedded/maven-plugin/webservice/src/main/java/test/SimpleWebService.java b/appserver/tests/embedded/maven-plugin/webservice/src/main/java/test/SimpleWebService.java
index 6c23772..ccf7c50 100644
--- a/appserver/tests/embedded/maven-plugin/webservice/src/main/java/test/SimpleWebService.java
+++ b/appserver/tests/embedded/maven-plugin/webservice/src/main/java/test/SimpleWebService.java
@@ -21,18 +21,18 @@
@WebService
public class SimpleWebService {
- @WebMethod(operationName="add")
- public int add(int i, int j) throws Exception {
- int k = i +j ;
- System.out.println(i + "+" + j +" = " + k);
- return k;
- }
+ @WebMethod(operationName="add")
+ public int add(int i, int j) throws Exception {
+ int k = i +j ;
+ System.out.println(i + "+" + j +" = " + k);
+ return k;
+ }
- @WebMethod(operationName="sayHi")
- public String sayHi() throws Exception {
- System.out.println("hi from SimpleWebService");
- return "hi from SimpleWebService";
- }
+ @WebMethod(operationName="sayHi")
+ public String sayHi() throws Exception {
+ System.out.println("hi from SimpleWebService");
+ return "hi from SimpleWebService";
+ }
}
diff --git a/appserver/tests/embedded/maven-plugin/webservice/src/main/webapp/WEB-INF/web.xml b/appserver/tests/embedded/maven-plugin/webservice/src/main/webapp/WEB-INF/web.xml
index 1b9a291..9c0cd68 100644
--- a/appserver/tests/embedded/maven-plugin/webservice/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/embedded/maven-plugin/webservice/src/main/webapp/WEB-INF/web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="3.0">
-
+
<session-config>
<session-timeout>10</session-timeout>
</session-config>
diff --git a/appserver/tests/embedded/maven-plugin/webservice/src/test/java/org/glassfish/tests/standalonewar/WebTest.java b/appserver/tests/embedded/maven-plugin/webservice/src/test/java/org/glassfish/tests/standalonewar/WebTest.java
index 93eae3b..ff89fba 100644
--- a/appserver/tests/embedded/maven-plugin/webservice/src/test/java/org/glassfish/tests/standalonewar/WebTest.java
+++ b/appserver/tests/embedded/maven-plugin/webservice/src/test/java/org/glassfish/tests/standalonewar/WebTest.java
@@ -32,12 +32,12 @@
import javax.naming.InitialContext;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 3;
private String contextPath = "test";
-
+
@BeforeClass
public static void setup() throws IOException {
}
diff --git a/appserver/tests/embedded/maven-plugin/websockets/src/test/java/org/glassfish/tests/standalonewar/WebTest.java b/appserver/tests/embedded/maven-plugin/websockets/src/test/java/org/glassfish/tests/standalonewar/WebTest.java
index f72a6af..f7bd9ad 100644
--- a/appserver/tests/embedded/maven-plugin/websockets/src/test/java/org/glassfish/tests/standalonewar/WebTest.java
+++ b/appserver/tests/embedded/maven-plugin/websockets/src/test/java/org/glassfish/tests/standalonewar/WebTest.java
@@ -31,12 +31,12 @@
import java.net.URLConnection;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 3;
private String contextPath = "test";
-
+
@BeforeClass
public static void setup() throws IOException {
}
diff --git a/appserver/tests/embedded/mysql/src/main/java/org/glassfish/tests/embedded/web/Person.java b/appserver/tests/embedded/mysql/src/main/java/org/glassfish/tests/embedded/web/Person.java
index bc470bc..0d2f588 100644
--- a/appserver/tests/embedded/mysql/src/main/java/org/glassfish/tests/embedded/web/Person.java
+++ b/appserver/tests/embedded/mysql/src/main/java/org/glassfish/tests/embedded/web/Person.java
@@ -40,7 +40,7 @@
private String profession;
public Person() {}
-
+
public Person(String uuid, String name, String profession) {
setUuid(uuid);
setName(name);
diff --git a/appserver/tests/embedded/pom.xml b/appserver/tests/embedded/pom.xml
index a42be57..0906a77 100755
--- a/appserver/tests/embedded/pom.xml
+++ b/appserver/tests/embedded/pom.xml
@@ -24,15 +24,15 @@
<artifactId>embedded</artifactId>
<version>6.1.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>GlassFish Embedded Tests</name>
+ <name>GlassFish Embedded Tests</name>
<modules>
- <module>basic</module>
- <module>cdi_basic</module>
- <module>cdi_ejb_jpa</module>
- <module>glassfish_resources_xml</module>
- <module>ejb</module>
- <module>scatteredarchive</module>
+ <module>basic</module>
+ <module>cdi_basic</module>
+ <module>cdi_ejb_jpa</module>
+ <module>glassfish_resources_xml</module>
+ <module>ejb</module>
+ <module>scatteredarchive</module>
<module>maven-plugin</module>
<module>web</module>
</modules>
diff --git a/appserver/tests/embedded/run_test.sh b/appserver/tests/embedded/run_test.sh
index cfeebd5..6e56b4b 100755
--- a/appserver/tests/embedded/run_test.sh
+++ b/appserver/tests/embedded/run_test.sh
@@ -42,7 +42,7 @@
echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > ${JUD}
echo "<testsuites>" >> ${JUD}
for i in `find . -type d -name "surefire-reports"`
- do
+ do
ls -d -1 ${i}/*.xml | xargs cat | ${SED} 's/<?xml version=\"1.0\" encoding=\"UTF-8\" *?>//g' >> ${JUD}
done
echo "</testsuites>" >> ${JUD}
@@ -54,12 +54,12 @@
case ${TEST_ID} in
embedded_all)
unzip_test_resources ${WORKSPACE}/bundles/glassfish.zip
- test_run_embedded;;
+ test_run_embedded;;
esac
}
list_test_ids(){
- echo embedded_all
+ echo embedded_all
}
OPT=${1}
@@ -67,9 +67,9 @@
source `dirname ${0}`/../common_test.sh
case ${OPT} in
- list_test_ids )
- list_test_ids;;
- run_test_id )
- trap "copy_test_artifacts ${TEST_ID}" EXIT
+ list_test_ids )
+ list_test_ids;;
+ run_test_id )
+ trap "copy_test_artifacts ${TEST_ID}" EXIT
run_test_id ${TEST_ID} ;;
esac
diff --git a/appserver/tests/embedded/scatteredarchive/pom.xml b/appserver/tests/embedded/scatteredarchive/pom.xml
index daf3aa9..8bea76b 100644
--- a/appserver/tests/embedded/scatteredarchive/pom.xml
+++ b/appserver/tests/embedded/scatteredarchive/pom.xml
@@ -25,7 +25,7 @@
<version>6.1.1-SNAPSHOT</version>
<name>Scattered Archive Test</name>
<build>
- <finalName>scatteredarchive</finalName>
+ <finalName>scatteredarchive</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -41,15 +41,15 @@
<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>
+ <useSystemClassLoader>false</useSystemClassLoader>
+ <useManifestOnlyJar>false</useManifestOnlyJar>
</configuration>
</plugin>
</plugins>
</build>
- <profiles>
+ <profiles>
<profile>
<id>run-with-uber-jar</id>
<activation>
@@ -82,12 +82,12 @@
</dependency>
</dependencies>
</profile>
- </profiles>
- <dependencies>
+ </profiles>
+ <dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
</dependency>
- </dependencies>
+ </dependencies>
</project>
diff --git a/appserver/tests/embedded/scatteredarchive/src/main/java/org/glassfish/tests/embedded/scatteredarchive/ScatteredArchiveTestServlet.java b/appserver/tests/embedded/scatteredarchive/src/main/java/org/glassfish/tests/embedded/scatteredarchive/ScatteredArchiveTestServlet.java
index 8f01b74..4960b16 100644
--- a/appserver/tests/embedded/scatteredarchive/src/main/java/org/glassfish/tests/embedded/scatteredarchive/ScatteredArchiveTestServlet.java
+++ b/appserver/tests/embedded/scatteredarchive/src/main/java/org/glassfish/tests/embedded/scatteredarchive/ScatteredArchiveTestServlet.java
@@ -30,7 +30,7 @@
@WebServlet(name = "ScatteredArchiveTestServlet",
urlPatterns = "/ScatteredArchiveTestServlet")
public class ScatteredArchiveTestServlet extends HttpServlet {
-
+
@Override
protected void doGet(HttpServletRequest httpServletRequest,
HttpServletResponse httpServletResponse) throws ServletException, IOException {
diff --git a/appserver/tests/embedded/scatteredarchive/src/main/webapp/WEB-INF/sun-web.xml b/appserver/tests/embedded/scatteredarchive/src/main/webapp/WEB-INF/sun-web.xml
index bf9a1e2..01f1994 100644
--- a/appserver/tests/embedded/scatteredarchive/src/main/webapp/WEB-INF/sun-web.xml
+++ b/appserver/tests/embedded/scatteredarchive/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>/satest</context-root>
+ <context-root>/satest</context-root>
</sun-web-app>
diff --git a/appserver/tests/embedded/scatteredarchive/src/main/webapp/WEB-INF/web.xml b/appserver/tests/embedded/scatteredarchive/src/main/webapp/WEB-INF/web.xml
index ace5297..6347c9f 100644
--- a/appserver/tests/embedded/scatteredarchive/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/embedded/scatteredarchive/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>jsptest</display-name>
+ <display-name>jsptest</display-name>
<distributable/>
</web-app>
diff --git a/appserver/tests/embedded/servlet_runs_admin_cmds/pom.xml b/appserver/tests/embedded/servlet_runs_admin_cmds/pom.xml
index 036a45e..88d1f1d 100644
--- a/appserver/tests/embedded/servlet_runs_admin_cmds/pom.xml
+++ b/appserver/tests/embedded/servlet_runs_admin_cmds/pom.xml
@@ -26,7 +26,7 @@
<name>Servlet Running Admin Commands using org.glassfish.embeddable.CommandRunner</name>
<packaging>war</packaging>
<build>
- <finalName>servlet_runs_admin_cmds</finalName>
+ <finalName>servlet_runs_admin_cmds</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -57,7 +57,7 @@
</plugin>
</plugins>
</build>
- <profiles>
+ <profiles>
<profile>
<id>run-with-3.1.1</id>
<activation>
@@ -91,8 +91,8 @@
</dependency>
</dependencies>
</profile>
- </profiles>
- <dependencies>
+ </profiles>
+ <dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -111,6 +111,6 @@
<version>4.0.0</version>
<scope>provided</scope>
</dependency>
- </dependencies>
+ </dependencies>
</project>
diff --git a/appserver/tests/embedded/static/ejb/pom.xml b/appserver/tests/embedded/static/ejb/pom.xml
index 9231487..a333d4d 100755
--- a/appserver/tests/embedded/static/ejb/pom.xml
+++ b/appserver/tests/embedded/static/ejb/pom.xml
@@ -29,8 +29,8 @@
<groupId>org.glassfish.tests.embedded.static</groupId>
<artifactId>ejb</artifactId>
<packaging>pom</packaging>
- <name>GlassFish Static Embedded EJB Tests</name>
+ <name>GlassFish Static Embedded EJB Tests</name>
<modules>
- <module>simple</module>
+ <module>simple</module>
</modules>
</project>
diff --git a/appserver/tests/embedded/static/ejb/simple/pom.xml b/appserver/tests/embedded/static/ejb/simple/pom.xml
index 006b238..cdf45e8 100644
--- a/appserver/tests/embedded/static/ejb/simple/pom.xml
+++ b/appserver/tests/embedded/static/ejb/simple/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.glassfish.tests.embedded.static.ejb</groupId>
<artifactId>simple</artifactId>
- <name>EJB static simple test</name>
+ <name>EJB static simple test</name>
<dependencies>
<dependency>
<groupId>jakarta.ejb</groupId>
diff --git a/appserver/tests/embedded/static/pom.xml b/appserver/tests/embedded/static/pom.xml
index d25304a..fca8de0 100755
--- a/appserver/tests/embedded/static/pom.xml
+++ b/appserver/tests/embedded/static/pom.xml
@@ -29,9 +29,9 @@
<groupId>org.glassfish.tests.embedded</groupId>
<artifactId>static</artifactId>
<packaging>pom</packaging>
- <name>GlassFish Static Embedded Tests</name>
+ <name>GlassFish Static Embedded Tests</name>
<modules>
- <module>ejb</module>
- <module>web</module>
+ <module>ejb</module>
+ <module>web</module>
</modules>
</project>
diff --git a/appserver/tests/embedded/static/web/pom.xml b/appserver/tests/embedded/static/web/pom.xml
index 4dae850..024fef9 100755
--- a/appserver/tests/embedded/static/web/pom.xml
+++ b/appserver/tests/embedded/static/web/pom.xml
@@ -60,13 +60,13 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4.2</version>
<configuration>
- <forkCount>1</forkCount>
+ <forkCount>1</forkCount>
<reuseForks>false</reuseForks>
</configuration>
</plugin>
</plugins>
</build>
-
+
<dependencies>
<dependency>
<groupId>org.glassfish.main.extras</groupId>
@@ -79,10 +79,10 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.glassfish.admin</groupId>
- <artifactId>config-api</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <groupId>org.glassfish.admin</groupId>
+ <artifactId>config-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/appserver/tests/embedded/static/web/src/test/java/org/glassfish/tests/embedded/cooked/ExistingDomainTest.java b/appserver/tests/embedded/static/web/src/test/java/org/glassfish/tests/embedded/cooked/ExistingDomainTest.java
index c3ce24e..b040dd2 100644
--- a/appserver/tests/embedded/static/web/src/test/java/org/glassfish/tests/embedded/cooked/ExistingDomainTest.java
+++ b/appserver/tests/embedded/static/web/src/test/java/org/glassfish/tests/embedded/cooked/ExistingDomainTest.java
@@ -115,5 +115,5 @@
}
-
+
}
diff --git a/appserver/tests/embedded/static/web/src/test/java/org/glassfish/tests/embedded/cooked/InplantedTest.java b/appserver/tests/embedded/static/web/src/test/java/org/glassfish/tests/embedded/cooked/InplantedTest.java
index 4bf4516..0d622d8 100644
--- a/appserver/tests/embedded/static/web/src/test/java/org/glassfish/tests/embedded/cooked/InplantedTest.java
+++ b/appserver/tests/embedded/static/web/src/test/java/org/glassfish/tests/embedded/cooked/InplantedTest.java
@@ -91,7 +91,7 @@
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
} catch (LifecycleException e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
- }
+ }
}
@Test
@@ -115,7 +115,7 @@
throw e;
}
}
-
-
+
+
}
}
diff --git a/appserver/tests/embedded/static/web/src/test/java/org/glassfish/tests/embedded/web/HelloWeb.java b/appserver/tests/embedded/static/web/src/test/java/org/glassfish/tests/embedded/web/HelloWeb.java
index de9a74f..e144234 100644
--- a/appserver/tests/embedded/static/web/src/test/java/org/glassfish/tests/embedded/web/HelloWeb.java
+++ b/appserver/tests/embedded/static/web/src/test/java/org/glassfish/tests/embedded/web/HelloWeb.java
@@ -29,16 +29,16 @@
public HelloWeb() {
System.out.println("Servlet WEB-HELLO initialized");
}
-
+
public void doGet(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
PrintWriter pw = res.getWriter();
try {
- pw.println("Hello World !");
- } catch(Exception e) {
- e.printStackTrace();
+ pw.println("Hello World !");
+ } catch(Exception e) {
+ e.printStackTrace();
}
}
}
diff --git a/appserver/tests/embedded/utils/pom.xml b/appserver/tests/embedded/utils/pom.xml
index 3326a93..b18ea10 100644
--- a/appserver/tests/embedded/utils/pom.xml
+++ b/appserver/tests/embedded/utils/pom.xml
@@ -39,6 +39,6 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
- </dependency>
+ </dependency>
</dependencies>
</project>
diff --git a/appserver/tests/embedded/utils/src/main/java/org/glassfish/tests/embedded/utils/EmbeddedServerUtils.java b/appserver/tests/embedded/utils/src/main/java/org/glassfish/tests/embedded/utils/EmbeddedServerUtils.java
index 1e9baf8..9d63306 100644
--- a/appserver/tests/embedded/utils/src/main/java/org/glassfish/tests/embedded/utils/EmbeddedServerUtils.java
+++ b/appserver/tests/embedded/utils/src/main/java/org/glassfish/tests/embedded/utils/EmbeddedServerUtils.java
@@ -43,7 +43,7 @@
public static File getDomainLocation(File serverLocation) {
return getDomainLocation(serverLocation, "domain1");
}
-
+
public static File getDomainLocation(File serverLocation, String domainName) {
// find the domain root.
diff --git a/appserver/tests/embedded/web/autodelete/pom.xml b/appserver/tests/embedded/web/autodelete/pom.xml
index d8c4699..76e3804 100644
--- a/appserver/tests/embedded/web/autodelete/pom.xml
+++ b/appserver/tests/embedded/web/autodelete/pom.xml
@@ -72,7 +72,7 @@
<classpathScope>test</classpathScope>
<includeProjectDependencies>true</includeProjectDependencies>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
<dependencies>
diff --git a/appserver/tests/embedded/web/autodelete/src/main/java/HelloWorld.java b/appserver/tests/embedded/web/autodelete/src/main/java/HelloWorld.java
index d0ad5ae..e128d4b 100644
--- a/appserver/tests/embedded/web/autodelete/src/main/java/HelloWorld.java
+++ b/appserver/tests/embedded/web/autodelete/src/main/java/HelloWorld.java
@@ -16,22 +16,22 @@
import java.io.IOException;
import java.io.PrintWriter;
-import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.annotation.WebServlet;
import jakarta.servlet.*;
import jakarta.servlet.http.*;
@WebServlet(urlPatterns={"/hello"})
public class HelloWorld extends HttpServlet {
-
+
public void doGet(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
-
+
PrintWriter pw = res.getWriter();
try {
- pw.println("Hello World !<br>");
- } catch(Exception e) {
- e.printStackTrace();
+ pw.println("Hello World !<br>");
+ } catch(Exception e) {
+ e.printStackTrace();
}
}
}
diff --git a/appserver/tests/embedded/web/autodelete/src/test/java/org/glassfish/tests/embedded/web/autodelete/ServletMain.java b/appserver/tests/embedded/web/autodelete/src/test/java/org/glassfish/tests/embedded/web/autodelete/ServletMain.java
index c7aedbc..32f571a 100644
--- a/appserver/tests/embedded/web/autodelete/src/test/java/org/glassfish/tests/embedded/web/autodelete/ServletMain.java
+++ b/appserver/tests/embedded/web/autodelete/src/test/java/org/glassfish/tests/embedded/web/autodelete/ServletMain.java
@@ -45,7 +45,7 @@
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
}
-
+
@Test
public void test() throws Exception {
diff --git a/appserver/tests/embedded/web/pom.xml b/appserver/tests/embedded/web/pom.xml
index 041b568..623cb35 100755
--- a/appserver/tests/embedded/web/pom.xml
+++ b/appserver/tests/embedded/web/pom.xml
@@ -24,7 +24,7 @@
<artifactId>web</artifactId>
<packaging>pom</packaging>
<version>6.1.1-SNAPSHOT</version>
- <name>GlassFish Web Embedded Tests</name>
+ <name>GlassFish Web Embedded Tests</name>
<modules>
<module>web-api</module>
</modules>
diff --git a/appserver/tests/embedded/web/servlet/pom.xml b/appserver/tests/embedded/web/servlet/pom.xml
index f4c18fd..bf1176c 100644
--- a/appserver/tests/embedded/web/servlet/pom.xml
+++ b/appserver/tests/embedded/web/servlet/pom.xml
@@ -68,7 +68,7 @@
<classpathScope>test</classpathScope>
<includeProjectDependencies>true</includeProjectDependencies>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
<dependencies>
diff --git a/appserver/tests/embedded/web/servlet/src/main/java/HelloWorld.java b/appserver/tests/embedded/web/servlet/src/main/java/HelloWorld.java
index d0ad5ae..e128d4b 100644
--- a/appserver/tests/embedded/web/servlet/src/main/java/HelloWorld.java
+++ b/appserver/tests/embedded/web/servlet/src/main/java/HelloWorld.java
@@ -16,22 +16,22 @@
import java.io.IOException;
import java.io.PrintWriter;
-import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.annotation.WebServlet;
import jakarta.servlet.*;
import jakarta.servlet.http.*;
@WebServlet(urlPatterns={"/hello"})
public class HelloWorld extends HttpServlet {
-
+
public void doGet(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
-
+
PrintWriter pw = res.getWriter();
try {
- pw.println("Hello World !<br>");
- } catch(Exception e) {
- e.printStackTrace();
+ pw.println("Hello World !<br>");
+ } catch(Exception e) {
+ e.printStackTrace();
}
}
}
diff --git a/appserver/tests/embedded/web/servlet/src/test/java/org/glassfish/tests/embedded/web/servlet/ServletMain.java b/appserver/tests/embedded/web/servlet/src/test/java/org/glassfish/tests/embedded/web/servlet/ServletMain.java
index 63083a0..8e498e4 100644
--- a/appserver/tests/embedded/web/servlet/src/test/java/org/glassfish/tests/embedded/web/servlet/ServletMain.java
+++ b/appserver/tests/embedded/web/servlet/src/test/java/org/glassfish/tests/embedded/web/servlet/ServletMain.java
@@ -45,7 +45,7 @@
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
}
-
+
@Test
public void test() throws Exception {
diff --git a/appserver/tests/embedded/web/web-all/pom.xml b/appserver/tests/embedded/web/web-all/pom.xml
index cf255ec..178b82f 100644
--- a/appserver/tests/embedded/web/web-all/pom.xml
+++ b/appserver/tests/embedded/web/web-all/pom.xml
@@ -111,7 +111,7 @@
</plugin>
</plugins>
</build>
- <profiles>
+ <profiles>
<profile>
<id>run-with-uber-jar</id>
<activation>
@@ -122,7 +122,7 @@
<groupId>org.glassfish.extras</groupId>
<artifactId>glassfish-embedded-all</artifactId>
<version>6.1.1-SNAPSHOT</version>
- </dependency>
+ </dependency>
</dependencies>
</profile>
<profile>
@@ -145,13 +145,13 @@
</dependencies>
</profile>
</profiles>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
</dependency>
- </dependencies>
+ </dependencies>
<licenses>
<license>
<name>EPL 2.0</name>
diff --git a/appserver/tests/embedded/web/web-all/src/main/java/org/glassfish/tests/weball/WebHello.java b/appserver/tests/embedded/web/web-all/src/main/java/org/glassfish/tests/weball/WebHello.java
index bc0de2c..c4c8d5b 100644
--- a/appserver/tests/embedded/web/web-all/src/main/java/org/glassfish/tests/weball/WebHello.java
+++ b/appserver/tests/embedded/web/web-all/src/main/java/org/glassfish/tests/weball/WebHello.java
@@ -39,9 +39,9 @@
PrintWriter pw = res.getWriter();
try {
- pw.println("Hello World!");
- } catch(Exception e) {
- e.printStackTrace();
+ pw.println("Hello World!");
+ } catch(Exception e) {
+ e.printStackTrace();
}
}
}
diff --git a/appserver/tests/embedded/web/web-all/src/test/java/org/glassfish/tests/weball/WebAllTest.java b/appserver/tests/embedded/web/web-all/src/test/java/org/glassfish/tests/weball/WebAllTest.java
index a56459e..ddcb607 100644
--- a/appserver/tests/embedded/web/web-all/src/test/java/org/glassfish/tests/weball/WebAllTest.java
+++ b/appserver/tests/embedded/web/web-all/src/test/java/org/glassfish/tests/weball/WebAllTest.java
@@ -38,7 +38,7 @@
public class WebAllTest {
private static Server server = null;
private static Port http=null;
-
+
@BeforeClass
public static void setup() throws IOException {
@@ -52,7 +52,7 @@
EmbeddedFileSystem fs = fsBuilder.instanceRoot(root).build();
Server.Builder builder = new Server.Builder("WebAllTest");
- builder.embeddedFileSystem(fs);
+ builder.embeddedFileSystem(fs);
server = builder.build();
server.getHabitat().getService(NetworkConfig.class,
ServerEnvironment.DEFAULT_INSTANCE_NAME);
diff --git a/appserver/tests/embedded/web/web-api/pom.xml b/appserver/tests/embedded/web/web-api/pom.xml
index 3687990..ef5cec8 100755
--- a/appserver/tests/embedded/web/web-api/pom.xml
+++ b/appserver/tests/embedded/web/web-api/pom.xml
@@ -46,7 +46,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/web/web-api/src/main/java/org/glassfish/tests/webapi/HelloWeb.java b/appserver/tests/embedded/web/web-api/src/main/java/org/glassfish/tests/webapi/HelloWeb.java
index 9ad0996..95af835 100644
--- a/appserver/tests/embedded/web/web-api/src/main/java/org/glassfish/tests/webapi/HelloWeb.java
+++ b/appserver/tests/embedded/web/web-api/src/main/java/org/glassfish/tests/webapi/HelloWeb.java
@@ -29,7 +29,7 @@
public HelloWeb() {
System.out.println("Servlet WEB-HELLO initialized");
}
-
+
public void doGet(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
diff --git a/appserver/tests/embedded/web/web-api/src/main/java/org/glassfish/tests/webapi/TestListener.java b/appserver/tests/embedded/web/web-api/src/main/java/org/glassfish/tests/webapi/TestListener.java
index e138d8b..dca0f7d 100644
--- a/appserver/tests/embedded/web/web-api/src/main/java/org/glassfish/tests/webapi/TestListener.java
+++ b/appserver/tests/embedded/web/web-api/src/main/java/org/glassfish/tests/webapi/TestListener.java
@@ -24,16 +24,16 @@
implements ServletContextListener
{
public static String msg = "Context not YET initialized";
-
+
public void contextInitialized(ServletContextEvent event)
{
System.out.println("TestListener : contextInitialized called");
try
{
System.out.println("TestListener : Trying to load TestCacaoList");
-
+
Class c = Class.forName("TestCacaoList");
-
+
msg = "Class TestCacaoList loaded successfully from listener";
System.out.println(msg);
}
@@ -44,6 +44,6 @@
}
System.out.println("TestListener : contextInitialized DONE");
}
-
+
public void contextDestroyed(ServletContextEvent event) {}
}
diff --git a/appserver/tests/embedded/web/web-api/src/main/java/org/glassfish/tests/webapi/TestServlet.java b/appserver/tests/embedded/web/web-api/src/main/java/org/glassfish/tests/webapi/TestServlet.java
index 168207b..66dd5cc 100644
--- a/appserver/tests/embedded/web/web-api/src/main/java/org/glassfish/tests/webapi/TestServlet.java
+++ b/appserver/tests/embedded/web/web-api/src/main/java/org/glassfish/tests/webapi/TestServlet.java
@@ -29,20 +29,20 @@
extends HttpServlet
{
public String msg_listener = null;
-
+
public void init(ServletConfig config)
throws ServletException
{
super.init(config);
-
+
this.msg_listener = TestListener.msg;
}
-
+
protected void doGet(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)
throws ServletException, IOException
{
System.out.println("Servlet TestServlet doGet called");
-
+
String msg_servlet = null;
try
{
@@ -61,7 +61,7 @@
out.println("Servlet Msg = " + msg_servlet);
out.flush();
out.close();
-
+
System.out.println("Servlet TestServlet doGet DONE");
}
}
diff --git a/appserver/tests/embedded/web/web-api/src/main/resources/org/glassfish/tests/webapi/domain.xml b/appserver/tests/embedded/web/web-api/src/main/resources/org/glassfish/tests/webapi/domain.xml
index dbe2004..8da8897 100644
--- a/appserver/tests/embedded/web/web-api/src/main/resources/org/glassfish/tests/webapi/domain.xml
+++ b/appserver/tests/embedded/web/web-api/src/main/resources/org/glassfish/tests/webapi/domain.xml
@@ -36,7 +36,7 @@
</jdbc-connection-pool>
</resources>
<servers>
- <server name="server" config-ref="server-config">
+ <server name="server" config-ref="server-config">
<resource-ref ref="jdbc/__TimerPool" />
<resource-ref ref="jdbc/__default" />
</server>
@@ -131,7 +131,7 @@
</security-service>
<monitoring-service>
<module-monitoring-levels />
- </monitoring-service>
+ </monitoring-service>
<transaction-service tx-log-dir="${com.sun.aas.instanceRoot}/logs" >
</transaction-service>
<network-config>
@@ -142,12 +142,12 @@
<transports>
<transport name="tcp"></transport>
</transports>
- </network-config>
+ </network-config>
<thread-pools>
<thread-pool name="http-thread-pool" max-queue-size="4096"></thread-pool>
<thread-pool name="thread-pool-1" max-thread-pool-size="200"/>
</thread-pools>
- </config>
+ </config>
</configs>
<property name="administrative.domain.name" value="domain1"/>
</domain>
diff --git a/appserver/tests/embedded/web/web-api/src/main/resources/org/glassfish/tests/webapi/my-default-web.xml b/appserver/tests/embedded/web/web-api/src/main/resources/org/glassfish/tests/webapi/my-default-web.xml
index c2bee9a..63060f1 100644
--- a/appserver/tests/embedded/web/web-api/src/main/resources/org/glassfish/tests/webapi/my-default-web.xml
+++ b/appserver/tests/embedded/web/web-api/src/main/resources/org/glassfish/tests/webapi/my-default-web.xml
@@ -32,7 +32,7 @@
<!-- ============ Built In Context Init Parameter Definitions =========== -->
- <!-- Init parameter to force the XML validation of JSF configuration -->
+ <!-- Init parameter to force the XML validation of JSF configuration -->
<!-- resources. -->
<context-param>
@@ -41,14 +41,14 @@
</context-param>
<!-- Init parameter will cause the JSF implementation to bypass -->
- <!-- processing the web.xml to determine if we should continue -->
+ <!-- processing the web.xml to determine if we should continue -->
<!-- bootstrapping JSF for the web application. -->
<context-param>
<param-name>com.sun.faces.forceLoadConfiguration</param-name>
<param-value>true</param-value>
- </context-param>
-
+ </context-param>
+
<!-- ================== Built In Servlet Definitions ==================== -->
@@ -275,7 +275,7 @@
</init-param>
<load-on-startup>3</load-on-startup>
</servlet>
-
+
<!-- NOTE: An SSI Filter is also available as an alternative SSI -->
<!-- implementation. Use either the Servlet or the Filter but NOT both. -->
@@ -721,7 +721,7 @@
</mime-mapping>
<mime-mapping>
<extension>mathml</extension>
- <mime-type>application/mathml+xml</mime-type>
+ <mime-type>application/mathml+xml</mime-type>
</mime-mapping>
<mime-mapping>
<extension>me</extension>
diff --git a/appserver/tests/embedded/web/web-api/src/main/webapp/WEB-INF/web.xml b/appserver/tests/embedded/web/web-api/src/main/webapp/WEB-INF/web.xml
index 1b137e5..f3e9af7 100644
--- a/appserver/tests/embedded/web/web-api/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/embedded/web/web-api/src/main/webapp/WEB-INF/web.xml
@@ -18,11 +18,11 @@
-->
-<web-app>
+<web-app>
<display-name>toto</display-name>
<description>this a dummy web app</description>
-
+
<listener>
<listener-class>org.glassfish.tests.webapi.TestListener</listener-class>
</listener>
@@ -38,15 +38,15 @@
<description>Test GF secondary servlet</description>
<servlet-class>org.glassfish.tests.webapi.TestServlet</servlet-class>
</servlet>
-
+
<servlet-mapping>
<servlet-name>TestGF</servlet-name>
<url-pattern>/testgf</url-pattern>
</servlet-mapping>
-
+
<servlet-mapping>
<servlet-name>TestGF2</servlet-name>
<url-pattern>/toto/testgf2</url-pattern>
- </servlet-mapping>
-
+ </servlet-mapping>
+
</web-app>
diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddContextTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddContextTest.java
index 5ac2138..695c5fc 100644
--- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddContextTest.java
+++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddContextTest.java
@@ -34,14 +34,14 @@
/**
* Tests WebContainer#createContext
- *
+ *
* @author Amy Roh
*/
public class EmbeddedAddContextTest {
static GlassFish glassfish;
static WebContainer embedded;
- static File root;
+ static File root;
static String contextRoot = "test";
@BeforeClass
@@ -60,7 +60,7 @@
System.out.println("Added Web with base directory "+root.getAbsolutePath());
embedded.setConfiguration(config);
}
-
+
@Test
public void test() throws Exception {
@@ -93,7 +93,7 @@
in.close();
embedded.removeContext(context);
- }
+ }
@AfterClass
public static void shutdownServer() throws GlassFishException {
@@ -104,5 +104,5 @@
glassfish = null;
}
}
-
+
}
diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddHttpsListenerTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddHttpsListenerTest.java
index 6d21938..ea473c5 100644
--- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddHttpsListenerTest.java
+++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddHttpsListenerTest.java
@@ -37,14 +37,14 @@
/**
* Tests WebContainer#addWebListener(HttpsListener)
- *
+ *
* @author Amy Roh
*/
public class EmbeddedAddHttpsListenerTest {
static GlassFish glassfish;
static WebContainer embedded;
- static File root;
+ static File root;
static String contextRoot = "test";
@BeforeClass
@@ -134,10 +134,10 @@
verify(9191);
//verify(9292);
//verify(9393);
-
+
if (appName!=null)
deployer.undeploy(appName);
-
+
}
public static void disableCertValidation() {
@@ -174,5 +174,5 @@
glassfish = null;
}
}
-
+
}
diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddListenerDefaultVSTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddListenerDefaultVSTest.java
index 773915a..12917c5 100644
--- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddListenerDefaultVSTest.java
+++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddListenerDefaultVSTest.java
@@ -36,7 +36,7 @@
/**
* Tests for Context#addListener to default virtual server
- *
+ *
* @author Amy Roh
*/
public class EmbeddedAddListenerDefaultVSTest {
@@ -63,7 +63,7 @@
System.out.println("Added Web with base directory "+root.getAbsolutePath());
embedded.setConfiguration(config);
}
-
+
@Test
public void testEmbeddedAddServletDefaultVS() throws Exception {
@@ -89,7 +89,7 @@
in.close();
vs.removeContext(context);
-
+
}
@AfterClass
@@ -101,6 +101,6 @@
glassfish = null;
}
}
-
-
+
+
}
diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletAndFilterByClassNameTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletAndFilterByClassNameTest.java
index 2818526..511838e 100644
--- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletAndFilterByClassNameTest.java
+++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletAndFilterByClassNameTest.java
@@ -39,7 +39,7 @@
/**
* Tests for Context addServlet & addFilter using class name to default virtual server
- *
+ *
* @author Amy Roh
*/
public class EmbeddedAddServletAndFilterByClassNameTest {
@@ -66,7 +66,7 @@
System.out.println("Added Web with base directory "+root.getAbsolutePath());
embedded.setConfiguration(config);
}
-
+
@Test
public void testEmbeddedAddServletDefaultVS() throws Exception {
@@ -99,7 +99,7 @@
in.close();
vs.removeContext(context);
-
+
}
@AfterClass
@@ -111,6 +111,6 @@
glassfish = null;
}
}
-
-
+
+
}
diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletAndFilterByClassTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletAndFilterByClassTest.java
index aa65f6f..658b9ca 100644
--- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletAndFilterByClassTest.java
+++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletAndFilterByClassTest.java
@@ -40,7 +40,7 @@
/**
* Tests for Context addServlet & addFilter using class to default virtual server
- *
+ *
* @author Amy Roh
*/
public class EmbeddedAddServletAndFilterByClassTest {
@@ -67,7 +67,7 @@
System.out.println("Added Web with base directory "+root.getAbsolutePath());
embedded.setConfiguration(config);
}
-
+
@Test
public void testEmbeddedAddServletDefaultVS() throws Exception {
@@ -104,7 +104,7 @@
in.close();
vs.removeContext(context);
-
+
}
@AfterClass
@@ -116,6 +116,6 @@
glassfish = null;
}
}
-
-
+
+
}
diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletDefaultVSTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletDefaultVSTest.java
index 3b5b0f5..66abd5e 100644
--- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletDefaultVSTest.java
+++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletDefaultVSTest.java
@@ -36,7 +36,7 @@
/**
* Tests for Context#addServlet to default virtual server
- *
+ *
* @author Amy Roh
*/
public class EmbeddedAddServletDefaultVSTest {
@@ -63,7 +63,7 @@
System.out.println("Added Web with base directory "+root.getAbsolutePath());
embedded.setConfiguration(config);
}
-
+
@Test
public void testEmbeddedAddServletDefaultVS() throws Exception {
@@ -88,7 +88,7 @@
in.close();
vs.removeContext(context);
-
+
}
@AfterClass
@@ -100,6 +100,6 @@
glassfish = null;
}
}
-
-
+
+
}
diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletTest.java
index 0b0a0d6..1b677ab 100644
--- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletTest.java
+++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletTest.java
@@ -36,7 +36,7 @@
/**
* Tests for Context#addServlet, embedded.createVirtualServer
- *
+ *
* @author Amy Roh
*/
public class EmbeddedAddServletTest {
@@ -63,7 +63,7 @@
System.out.println("Added Web with base directory "+root.getAbsolutePath());
embedded.setConfiguration(config);
}
-
+
@Test
public void testEmbeddedWebAPIConfig() throws Exception {
WebListener testListener = embedded.createWebListener("test-listener", HttpListener.class);
@@ -84,7 +84,7 @@
testvs=true;
}
}
- Assert.assertTrue(testvs);
+ Assert.assertTrue(testvs);
Context context = (Context) embedded.createContext(root);
ServletRegistration sr = context.addServlet("NewServlet", "org.glassfish.tests.embedded.web.NewServlet");
sr.addMapping(new String[] {"/newservlet"});
@@ -103,7 +103,7 @@
}
in.close();
vs.removeContext(context);
-
+
}
@AfterClass
@@ -115,6 +115,6 @@
glassfish = null;
}
}
-
-
+
+
}
diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddWebListenerTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddWebListenerTest.java
index b2cd3da..3828457 100644
--- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddWebListenerTest.java
+++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddWebListenerTest.java
@@ -46,14 +46,14 @@
/**
* Tests WebContainer#addWebListener(HttpListener) & HttpListener.setConfig
- *
+ *
* @author Amy Roh
*/
public class EmbeddedAddWebListenerTest {
static GlassFish glassfish;
static WebContainer embedded;
- static File root;
+ static File root;
static String contextRoot = "test";
static int port = 9090;
static int newPort = 9292;
@@ -67,7 +67,7 @@
System.out.println("Starting Web "+embedded);
embedded.setLogLevel(Level.INFO);
}
-
+
@Test
public void test() throws Exception {
@@ -118,10 +118,10 @@
in.close();
System.out.println(inputLine);
Assert.assertEquals("Hello World!", sb.toString());
-
+
if (appName!=null)
deployer.undeploy(appName);
-
+
}
@AfterClass
@@ -133,5 +133,5 @@
glassfish = null;
}
}
-
+
}
diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedClassLoaderTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedClassLoaderTest.java
index 79a9539..3aca54c 100644
--- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedClassLoaderTest.java
+++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedClassLoaderTest.java
@@ -67,7 +67,7 @@
throw new IllegalStateException();
}
}
-
+
@Test
public void test() throws Exception {
URL[] urls = new URL[1];
@@ -102,7 +102,7 @@
in.close();
wc.removeContext(context);
- }
+ }
@AfterClass
public static void shutdownServer() throws GlassFishException {
@@ -113,5 +113,5 @@
glassfish = null;
}
}
-
+
}
diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedCreateContextTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedCreateContextTest.java
index 1597893..b18867b 100644
--- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedCreateContextTest.java
+++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedCreateContextTest.java
@@ -33,7 +33,7 @@
/**
* Tests WebContainer#createContext
- *
+ *
* @author Amy Roh
*/
public class EmbeddedCreateContextTest {
@@ -51,10 +51,10 @@
System.out.println("Starting Web "+embedded);
embedded.setLogLevel(Level.INFO);
}
-
+
@Test
public void test() throws Exception {
-
+
HttpListener listener = new HttpListener();
listener.setPort(8080);
listener.setId("embedded-listener-1");
@@ -75,7 +75,7 @@
sb.append(inputLine);
}
in.close();
- }
+ }
@AfterClass
public static void shutdownServer() throws GlassFishException {
@@ -86,5 +86,5 @@
glassfish = null;
}
}
-
+
}
diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedCreateServletAndFilterTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedCreateServletAndFilterTest.java
index 33c7212..23e6f76 100644
--- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedCreateServletAndFilterTest.java
+++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedCreateServletAndFilterTest.java
@@ -40,7 +40,7 @@
/**
* Tests for Context createServlet & createFilter using class to default virtual server
- *
+ *
* @author Amy Roh
*/
public class EmbeddedCreateServletAndFilterTest {
@@ -67,7 +67,7 @@
System.out.println("Added Web with base directory "+root.getAbsolutePath());
embedded.setConfiguration(config);
}
-
+
@Test
public void testEmbeddedAddServletDefaultVS() throws Exception {
@@ -106,7 +106,7 @@
in.close();
vs.removeContext(context);
-
+
}
@AfterClass
@@ -118,6 +118,6 @@
glassfish = null;
}
}
-
-
+
+
}
diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedCreateVirtualServerTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedCreateVirtualServerTest.java
index 8a2b5c3..d3c0548 100644
--- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedCreateVirtualServerTest.java
+++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedCreateVirtualServerTest.java
@@ -25,7 +25,7 @@
import java.util.ArrayList;
import java.util.List;
import org.glassfish.embeddable.*;
-import org.glassfish.embeddable.web.*;
+import org.glassfish.embeddable.web.*;
import org.glassfish.embeddable.web.config.*;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -34,7 +34,7 @@
/**
* Tests WebContainer#createVirtualServerTest
- *
+ *
* @author Amy Roh
*/
public class EmbeddedCreateVirtualServerTest {
@@ -43,7 +43,7 @@
static WebContainer embedded;
static int newPort = 9090;
static String contextRoot = "test";
-
+
@BeforeClass
public static void setupServer() throws GlassFishException {
glassfish = GlassFishRuntime.bootstrap().newGlassFish();
@@ -53,7 +53,7 @@
System.out.println("Starting Web "+embedded);
embedded.setLogLevel(Level.INFO);
}
-
+
@Test
public void test() throws Exception {
@@ -61,7 +61,7 @@
httpListener.setPort(8080);
httpListener.setId("embedded-listener-1");
embedded.addWebListener(httpListener);
-
+
List<WebListener> listenerList = new ArrayList(embedded.getWebListeners());
Assert.assertTrue(listenerList.size()==1);
for (WebListener listener : embedded.getWebListeners())
@@ -71,11 +71,11 @@
testListener.setPort(newPort);
WebListener[] webListeners = new HttpListener[1];
webListeners[0] = testListener;
-
+
File f = new File("target/classes");
String virtualServerId = "embedded-server";
VirtualServer virtualServer = (VirtualServer)
- embedded.createVirtualServer(virtualServerId, f, webListeners);
+ embedded.createVirtualServer(virtualServerId, f, webListeners);
VirtualServerConfig config = new VirtualServerConfig();
config.setHostNames("localhost");
virtualServer.setConfig(config);
@@ -108,14 +108,14 @@
vs.removeContext(context);
System.out.println("Removing web listener "+testListener.getId());
- embedded.removeWebListener(testListener);
+ embedded.removeWebListener(testListener);
listenerList = new ArrayList(embedded.getWebListeners());
System.out.println("Network listener size after deletion " + listenerList.size());
Assert.assertTrue(listenerList.size()==1);
for (WebListener listener : embedded.getWebListeners())
System.out.println("Web listener "+listener.getId()+" "+listener.getPort());
- }
+ }
@AfterClass
public static void shutdownServer() throws GlassFishException {
@@ -126,5 +126,5 @@
glassfish = null;
}
}
-
+
}
diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedGetContextsTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedGetContextsTest.java
index 4730ff6..9149a54 100644
--- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedGetContextsTest.java
+++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedGetContextsTest.java
@@ -34,14 +34,14 @@
/**
* Tests VirtualServer#getContexts after deploy
- *
+ *
* @author Amy Roh
*/
public class EmbeddedGetContextsTest {
static GlassFish glassfish;
static WebContainer embedded;
- static File root;
+ static File root;
static String contextRoot = "test";
@BeforeClass
@@ -53,7 +53,7 @@
System.out.println("Starting Web "+embedded);
embedded.setLogLevel(Level.INFO);
}
-
+
@Test
public void test() throws Exception {
@@ -118,7 +118,7 @@
if (appName!=null)
deployer.undeploy(appName);
- }
+ }
@AfterClass
public static void shutdownServer() throws GlassFishException {
@@ -129,5 +129,5 @@
glassfish = null;
}
}
-
+
}
diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedJSPTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedJSPTest.java
index 9725c86..5de528e 100644
--- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedJSPTest.java
+++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedJSPTest.java
@@ -51,7 +51,7 @@
glassfish.start();
System.out.println("================ Embedded JSP Test");
}
-
+
@Test
public void testDefaultStart() throws Exception {
@@ -87,7 +87,7 @@
in.close();
System.out.println(inputLine);
*/
-
+
if (appName!=null)
deployer.undeploy(appName);
@@ -103,5 +103,5 @@
glassfish = null;
}
}
-
+
}
diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedRedeployTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedRedeployTest.java
index 7c01ddd..29d59d4 100644
--- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedRedeployTest.java
+++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedRedeployTest.java
@@ -34,14 +34,14 @@
/**
* Tests redeploy scenario
- *
+ *
* @author Amy Roh
*/
public class EmbeddedRedeployTest {
static GlassFish glassfish;
static WebContainer embedded;
- static File root;
+ static File root;
static String contextRoot = "/embedded-redeploy";
@BeforeClass
@@ -60,7 +60,7 @@
System.out.println("Added Web with base directory "+root.getAbsolutePath());
embedded.setConfiguration(config);
}
-
+
@Test
public void test() throws Exception {
@@ -110,5 +110,5 @@
glassfish = null;
}
}
-
+
}
diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedRemoveContextTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedRemoveContextTest.java
index 03a812f..83de162 100644
--- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedRemoveContextTest.java
+++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedRemoveContextTest.java
@@ -34,14 +34,14 @@
/**
* Tests WebContainer#removeContext
- *
+ *
* @author Amy Roh
*/
public class EmbeddedRemoveContextTest {
static GlassFish glassfish;
static WebContainer embedded;
- static File root;
+ static File root;
static String contextRoot = "test";
@BeforeClass
@@ -60,7 +60,7 @@
System.out.println("Added Web with base directory "+root.getAbsolutePath());
embedded.setConfiguration(config);
}
-
+
@Test
public void test() throws Exception {
@@ -125,7 +125,7 @@
in.close();
embedded.removeContext(context);
- }
+ }
@AfterClass
public static void shutdownServer() throws GlassFishException {
@@ -136,5 +136,5 @@
glassfish = null;
}
}
-
+
}
diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedRestartTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedRestartTest.java
index 8a2c541..c4ae701 100644
--- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedRestartTest.java
+++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedRestartTest.java
@@ -46,7 +46,7 @@
glassfish.start();
System.out.println("================ Embedded Restart Test");
}
-
+
@Test
public void testEmbeddedWebAPI() throws Exception {
@@ -104,5 +104,5 @@
glassfish = null;
}
}
-
+
}
diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetConfigurationTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetConfigurationTest.java
index 6db3e45..66e31a6 100644
--- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetConfigurationTest.java
+++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetConfigurationTest.java
@@ -36,7 +36,7 @@
/**
* Tests WebContainer#setConfiguration(WebContainerConfig)
- *
+ *
* @author Amy Roh
*/
public class EmbeddedSetConfigurationTest {
@@ -63,7 +63,7 @@
System.out.println("Added Web with base directory "+root.getAbsolutePath());
embedded.setConfiguration(config);
}
-
+
@Test
public void testEmbeddedWebAPIConfig() throws Exception {
Context context = embedded.createContext(root);
@@ -92,6 +92,6 @@
glassfish = null;
}
}
-
-
+
+
}
diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetDefaultWebXmlTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetDefaultWebXmlTest.java
index befbf57..edd5992 100644
--- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetDefaultWebXmlTest.java
+++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetDefaultWebXmlTest.java
@@ -35,7 +35,7 @@
/**
* Tests EmbeddedFileSystem.configurationFile and WebBuilder.setDefaultWebXml
* Checks if directory listings is correctly getting picked up from the default-web.xml
- *
+ *
* @author Amy Roh
*/
public class EmbeddedSetDefaultWebXmlTest {
@@ -63,7 +63,7 @@
System.out.println("Added Web with base directory "+root.getAbsolutePath());
embedded.setConfiguration(config);
}
-
+
@Test
public void testEmbeddedWebAPIConfig() throws Exception {
@@ -83,9 +83,9 @@
sb.append(inputLine);
}
in.close();
-
+
embedded.removeContext(context);
-
+
}
@AfterClass
@@ -97,5 +97,5 @@
glassfish = null;
}
}
-
+
}
diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetDocRootTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetDocRootTest.java
index 18c3e50..a1d3412 100644
--- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetDocRootTest.java
+++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetDocRootTest.java
@@ -36,7 +36,7 @@
/**
* Tests WebBuilding#setListings for directory listing feature
- *
+ *
* @author Amy Roh
*/
public class EmbeddedSetDocRootTest {
@@ -62,7 +62,7 @@
System.out.println("Added Web with base directory "+root.getAbsolutePath());
embedded.setConfiguration(config);
}
-
+
@Test
public void testEmbeddedWebAPIConfig() throws Exception {
VirtualServer vs = (VirtualServer)
@@ -85,7 +85,7 @@
sb.append(inputLine);
}
in.close();
-
+
}
@AfterClass
@@ -97,6 +97,6 @@
glassfish = null;
}
}
-
-
+
+
}
diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetSecurityTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetSecurityTest.java
index 179fbab..c9fbe72 100644
--- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetSecurityTest.java
+++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetSecurityTest.java
@@ -36,14 +36,14 @@
/**
* Tests Context#setSecurity
- *
+ *
* @author Amy Roh
*/
public class EmbeddedSetSecurityTest {
static GlassFish glassfish;
static WebContainer embedded;
- static File root;
+ static File root;
static String contextRoot = "security";
@BeforeClass
@@ -63,7 +63,7 @@
System.out.println("Added Web with base directory "+root.getAbsolutePath());
embedded.setConfiguration(config);
}
-
+
@Test
public void test() throws Exception {
@@ -127,7 +127,7 @@
//ex.printStackTrace();
}
- }
+ }
@AfterClass
public static void shutdownServer() throws GlassFishException {
@@ -138,5 +138,5 @@
glassfish = null;
}
}
-
+
}
diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedVirtualServerHostNameTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedVirtualServerHostNameTest.java
index bf59095..f404a75 100644
--- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedVirtualServerHostNameTest.java
+++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedVirtualServerHostNameTest.java
@@ -25,7 +25,7 @@
import java.util.ArrayList;
import java.util.List;
import org.glassfish.embeddable.*;
-import org.glassfish.embeddable.web.*;
+import org.glassfish.embeddable.web.*;
import org.glassfish.embeddable.web.config.*;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -34,7 +34,7 @@
/**
* Test for VirtualServerConfig#setHostNames
- *
+ *
* @author Amy Roh
*/
public class EmbeddedVirtualServerHostNameTest {
@@ -43,7 +43,7 @@
static WebContainer embedded;
static String contextRoot = "host";
static int newPort = 9090;
-
+
@BeforeClass
public static void setupServer() throws GlassFishException {
@@ -55,7 +55,7 @@
embedded = glassfish.getService(WebContainer.class);
}
-
+
@Test
public void test() throws Exception {
@@ -87,7 +87,7 @@
System.out.println(inputLine);
Assert.assertEquals("Hello World!", sb.toString());
- }
+ }
@AfterClass
public static void shutdownServer() throws GlassFishException {
@@ -98,5 +98,5 @@
glassfish = null;
}
}
-
+
}
diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedWebAPIDefaultStartTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedWebAPIDefaultStartTest.java
index f08a8a6..2caadf7 100644
--- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedWebAPIDefaultStartTest.java
+++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedWebAPIDefaultStartTest.java
@@ -55,7 +55,7 @@
System.out.println("Starting Web "+embedded);
embedded.setLogLevel(Level.INFO);
}
-
+
@Test
public void testDefaultStart() throws Exception {
@@ -106,7 +106,7 @@
Assert.assertEquals("Hello World!", sb.toString());
Thread.sleep(1000);
-
+
if (appName!=null)
deployer.undeploy(appName);
}
@@ -120,5 +120,5 @@
glassfish = null;
}
}
-
+
}
diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedWebAPITest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedWebAPITest.java
index a3be7cd..064f060 100644
--- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedWebAPITest.java
+++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedWebAPITest.java
@@ -55,7 +55,7 @@
System.out.println("Starting Web "+embedded);
embedded.setLogLevel(Level.INFO);
}
-
+
@Test
public void testEmbeddedWebAPI() throws Exception {
@@ -153,5 +153,5 @@
glassfish = null;
}
}
-
+
}
diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedWebTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedWebTest.java
index b008dfb..5239879 100644
--- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedWebTest.java
+++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedWebTest.java
@@ -25,7 +25,7 @@
import java.util.ArrayList;
import java.util.List;
import org.glassfish.embeddable.*;
-import org.glassfish.embeddable.web.*;
+import org.glassfish.embeddable.web.*;
import org.glassfish.embeddable.web.config.*;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -34,7 +34,7 @@
/**
* Tests WebContainer
- *
+ *
* @author Amy Roh
*/
public class EmbeddedWebTest {
@@ -45,7 +45,7 @@
static String contextRoot = "test";
static File root;
static WebContainerConfig config;
-
+
@BeforeClass
public static void setupServer() throws Exception {
@@ -56,7 +56,7 @@
System.out.println("Starting Web "+embedded);
root = new File("target/classes");
configure();
-
+
}
private static void configure() throws Exception {
@@ -99,12 +99,12 @@
System.out.println("Web listener "+listener.getId()+" "+listener.getPort());
VirtualServer vs = embedded.getVirtualServer(virtualServerId);
- Assert.assertEquals(virtualServerId,vs.getID());
+ Assert.assertEquals(virtualServerId,vs.getID());
Context context = (Context) embedded.createContext(root);
//embedded.addContext(context, contextRoot);
virtualServer.addContext(context, contextRoot);
-
+
URL servlet = new URL("http://localhost:"+newPort+"/"+contextRoot+"/hello");
URLConnection yc = servlet.openConnection();
BufferedReader in = new BufferedReader(new InputStreamReader(yc.getInputStream()));
@@ -118,7 +118,7 @@
Assert.assertEquals("Hello World!", sb.toString());
System.out.println("Removing web listener "+testListener.getId());
- embedded.removeWebListener(testListener);
+ embedded.removeWebListener(testListener);
listenerList = new ArrayList(embedded.getWebListeners());
System.out.println("Network listener size after deletion " + listenerList.size());
@@ -128,7 +128,7 @@
virtualServer.removeContext(context);
- }
+ }
@AfterClass
public static void shutdownServer() throws GlassFishException {
@@ -139,5 +139,5 @@
glassfish = null;
}
}
-
+
}
diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/WebHello.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/WebHello.java
index fdbc208..f0614be 100644
--- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/WebHello.java
+++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/WebHello.java
@@ -29,7 +29,7 @@
public WebHello() {
System.out.println("Servlet WEB-HELLO initialized");
}
-
+
public void doGet(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
diff --git a/appserver/tests/embedded/web/web-war/test/pom.xml b/appserver/tests/embedded/web/web-war/test/pom.xml
index 0048c51..3f6340d 100644
--- a/appserver/tests/embedded/web/web-war/test/pom.xml
+++ b/appserver/tests/embedded/web/web-war/test/pom.xml
@@ -83,7 +83,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4.2</version>
<configuration>
- <forkCount>1</forkCount>
+ <forkCount>1</forkCount>
<reuseForks>false</reuseForks>
</configuration>
</plugin>
@@ -114,13 +114,13 @@
<artifactId>kernel</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.glassfish.security</groupId>
<artifactId>inmemory.jacc.provider</artifactId>
<version>${project.version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.glassfish.admin</groupId>
<artifactId>config-api</artifactId>
@@ -139,13 +139,13 @@
<type>pom</type>
<version>${project.version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.glassfish.transaction</groupId>
<artifactId>jta</artifactId>
<version>6.1.1-SNAPSHOT</version>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>web-embed-impl</artifactId>
diff --git a/appserver/tests/embedded/web/web-war/test/src/test/java/org/glassfish/tests/embedded/webwar/EmbeddedTest.java b/appserver/tests/embedded/web/web-war/test/src/test/java/org/glassfish/tests/embedded/webwar/EmbeddedTest.java
index 9fa585d..1943084 100644
--- a/appserver/tests/embedded/web/web-war/test/src/test/java/org/glassfish/tests/embedded/webwar/EmbeddedTest.java
+++ b/appserver/tests/embedded/web/web-war/test/src/test/java/org/glassfish/tests/embedded/webwar/EmbeddedTest.java
@@ -89,7 +89,7 @@
}
server.addContainer(ContainerBuilder.Type.all);
- }
+ }
@Test
public void testWeb() throws Exception {
diff --git a/appserver/tests/embedded/web/web-war/web-fragment1/src/main/java/org/glassfish/tests/embedded/webwar/webfragment1/WFTestFilter.java b/appserver/tests/embedded/web/web-war/web-fragment1/src/main/java/org/glassfish/tests/embedded/webwar/webfragment1/WFTestFilter.java
index 554ce58..6d4b3d7 100644
--- a/appserver/tests/embedded/web/web-war/web-fragment1/src/main/java/org/glassfish/tests/embedded/webwar/webfragment1/WFTestFilter.java
+++ b/appserver/tests/embedded/web/web-war/web-fragment1/src/main/java/org/glassfish/tests/embedded/webwar/webfragment1/WFTestFilter.java
@@ -31,7 +31,7 @@
public class WFTestFilter implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> WFTestFilter.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/embedded/web/web-war/web-fragment2/src/main/java/org/glassfish/tests/embedded/webwar/webfragment2/WFTestFilter2.java b/appserver/tests/embedded/web/web-war/web-fragment2/src/main/java/org/glassfish/tests/embedded/webwar/webfragment2/WFTestFilter2.java
index 45e7ad7..bb46d9e 100644
--- a/appserver/tests/embedded/web/web-war/web-fragment2/src/main/java/org/glassfish/tests/embedded/webwar/webfragment2/WFTestFilter2.java
+++ b/appserver/tests/embedded/web/web-war/web-fragment2/src/main/java/org/glassfish/tests/embedded/webwar/webfragment2/WFTestFilter2.java
@@ -31,7 +31,7 @@
public class WFTestFilter2 implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> WFTestFilter2.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/embedded/web/web-war/web-fragment2/src/main/java/org/glassfish/tests/embedded/webwar/webfragment2/WFTestFilter2B.java b/appserver/tests/embedded/web/web-war/web-fragment2/src/main/java/org/glassfish/tests/embedded/webwar/webfragment2/WFTestFilter2B.java
index 567305d..eef5bc0 100644
--- a/appserver/tests/embedded/web/web-war/web-fragment2/src/main/java/org/glassfish/tests/embedded/webwar/webfragment2/WFTestFilter2B.java
+++ b/appserver/tests/embedded/web/web-war/web-fragment2/src/main/java/org/glassfish/tests/embedded/webwar/webfragment2/WFTestFilter2B.java
@@ -31,7 +31,7 @@
public class WFTestFilter2B implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> WFTestFilter2B.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/embedded/web/web-war/web-fragment3/src/main/java/org/glassfish/tests/embedded/webwar/webfragment3/WFTestFilter3.java b/appserver/tests/embedded/web/web-war/web-fragment3/src/main/java/org/glassfish/tests/embedded/webwar/webfragment3/WFTestFilter3.java
index d47685a..9e13b40 100644
--- a/appserver/tests/embedded/web/web-war/web-fragment3/src/main/java/org/glassfish/tests/embedded/webwar/webfragment3/WFTestFilter3.java
+++ b/appserver/tests/embedded/web/web-war/web-fragment3/src/main/java/org/glassfish/tests/embedded/webwar/webfragment3/WFTestFilter3.java
@@ -31,7 +31,7 @@
public class WFTestFilter3 implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> WFTestFilter3.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
