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/paas/multiple-db-app-scoped-services/basic/init.salary-service.sql b/appserver/tests/paas/multiple-db-app-scoped-services/basic/init.salary-service.sql
index 9c7a42c..7e3e5ea 100644
--- a/appserver/tests/paas/multiple-db-app-scoped-services/basic/init.salary-service.sql
+++ b/appserver/tests/paas/multiple-db-app-scoped-services/basic/init.salary-service.sql
@@ -15,8 +15,8 @@
*/
CREATE TABLE SALARY (
- emp_id integer not null,
- emp_sal float(7, 2)
+ emp_id integer not null,
+ emp_sal float(7, 2)
);
INSERT INTO SALARY VALUES(101, 11111.12);
diff --git a/appserver/tests/paas/multiple-db-app-scoped-services/basic/pom.xml b/appserver/tests/paas/multiple-db-app-scoped-services/basic/pom.xml
index 24897b5..fa57359 100644
--- a/appserver/tests/paas/multiple-db-app-scoped-services/basic/pom.xml
+++ b/appserver/tests/paas/multiple-db-app-scoped-services/basic/pom.xml
@@ -50,12 +50,12 @@
</goals>
<configuration>
<skip>false</skip>
- <enableAssertions>false</enableAssertions>
+ <enableAssertions>false</enableAssertions>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
+ <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
diff --git a/appserver/tests/paas/multiple-db-app-scoped-services/basic/src/main/java/org/glassfish/tests/paas/multipleappscopedservicetest/EmployeeServlet.java b/appserver/tests/paas/multiple-db-app-scoped-services/basic/src/main/java/org/glassfish/tests/paas/multipleappscopedservicetest/EmployeeServlet.java
index 05f14bf..faded1c 100644
--- a/appserver/tests/paas/multiple-db-app-scoped-services/basic/src/main/java/org/glassfish/tests/paas/multipleappscopedservicetest/EmployeeServlet.java
+++ b/appserver/tests/paas/multiple-db-app-scoped-services/basic/src/main/java/org/glassfish/tests/paas/multipleappscopedservicetest/EmployeeServlet.java
@@ -87,7 +87,7 @@
writer.println("</table>");
if (hrDs != null && salDs != null) {
Statement stmt1 = null;
- PreparedStatement stmt2 = null;
+ PreparedStatement stmt2 = null;
try {
stmt1 = hrDs.getConnection().createStatement();
@@ -100,35 +100,35 @@
ResultSet rs1 = stmt1.executeQuery("SELECT emp_id, emp_name from HR");
- String salQuery = "SELECT emp_sal from SALARY WHERE emp_id = ? ";
- stmt2 = salDs.getConnection().prepareStatement(salQuery);
-
- DatabaseMetaData dbMetadata2 = stmt2.getConnection().getMetaData();
+ String salQuery = "SELECT emp_sal from SALARY WHERE emp_id = ? ";
+ stmt2 = salDs.getConnection().prepareStatement(salQuery);
+
+ DatabaseMetaData dbMetadata2 = stmt2.getConnection().getMetaData();
String dbUrl2 = dbMetadata2.getURL();
writer.println("DB URL : " + dbUrl2 + "\n");
if (dbUrl2.indexOf("salary_database") == -1) {
throw new Exception("Custom Database [salary_database] is not created while provisioning.");
}
-
- writer.println("<table border=\"1\" width=\"100%\">");
+
+ writer.println("<table border=\"1\" width=\"100%\">");
writer.println("<tr>");
writer.println(" <th align=\"left\" colspan=\"2\">" + "Employee Information retrieved" + "</th>");
writer.println("</tr>");
writer.println("<tr>");
writer.println("<td>" + "Employee ID" + "</td>");
writer.println("<td>" + "Employee Name" + "</td>");
- writer.println("<td>" + "Employee Salary" + "</td>");
+ writer.println("<td>" + "Employee Salary" + "</td>");
writer.println("</tr>");
while (rs1.next()) {
writer.println("<tr>");
writer.println(" <td>" + rs1.getObject(1) + "</td>");
writer.println(" <td>" + rs1.getObject(2) + "</td>");
- stmt2.setInt(1, (Integer) rs1.getObject(1));
- ResultSet rs2 = stmt2.executeQuery();
- while(rs2.next()) {
- writer.println(" <td>" + rs2.getObject(1) + "</td>");
+ stmt2.setInt(1, (Integer) rs1.getObject(1));
+ ResultSet rs2 = stmt2.executeQuery();
+ while(rs2.next()) {
+ writer.println(" <td>" + rs2.getObject(1) + "</td>");
writer.println("</tr>");
- }
+ }
}
writer.println("</table>");
} catch (Exception ex) {
diff --git a/appserver/tests/paas/multiple-db-app-scoped-services/basic/src/main/webapp/WEB-INF/sun-web.xml b/appserver/tests/paas/multiple-db-app-scoped-services/basic/src/main/webapp/WEB-INF/sun-web.xml
index fcaa427..9a36082 100644
--- a/appserver/tests/paas/multiple-db-app-scoped-services/basic/src/main/webapp/WEB-INF/sun-web.xml
+++ b/appserver/tests/paas/multiple-db-app-scoped-services/basic/src/main/webapp/WEB-INF/sun-web.xml
@@ -17,7 +17,7 @@
-->
-<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 Servlet 2.5//EN"
+<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 Servlet 2.5//EN"
"http://www.sun.com/software/appserver/dtds/sun-web-app_2_5-0.dtd">
<sun-web-app error-url="">
</sun-web-app>
diff --git a/appserver/tests/paas/multiple-db-app-scoped-services/basic/src/main/webapp/WEB-INF/web.xml b/appserver/tests/paas/multiple-db-app-scoped-services/basic/src/main/webapp/WEB-INF/web.xml
index 33009c7..e28af27 100644
--- a/appserver/tests/paas/multiple-db-app-scoped-services/basic/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/paas/multiple-db-app-scoped-services/basic/src/main/webapp/WEB-INF/web.xml
@@ -17,9 +17,9 @@
-->
-<web-app version="2.5"
- xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<web-app version="2.5"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<servlet>
<servlet-name>EmployeeServlet</servlet-name>
diff --git a/appserver/tests/paas/multiple-db-app-scoped-services/basic/src/test/java/org/glassfish/tests/paas/multipleappscopedservicetest/EmployeeTest.java b/appserver/tests/paas/multiple-db-app-scoped-services/basic/src/test/java/org/glassfish/tests/paas/multipleappscopedservicetest/EmployeeTest.java
index e64d321..3c38814 100644
--- a/appserver/tests/paas/multiple-db-app-scoped-services/basic/src/test/java/org/glassfish/tests/paas/multipleappscopedservicetest/EmployeeTest.java
+++ b/appserver/tests/paas/multiple-db-app-scoped-services/basic/src/test/java/org/glassfish/tests/paas/multipleappscopedservicetest/EmployeeTest.java
@@ -52,7 +52,7 @@
public void test() throws Exception {
// 1. Bootstrap GlassFish DAS in embedded mode.
- GlassFishProperties glassFishProperties = new GlassFishProperties();
+ GlassFishProperties glassFishProperties = new GlassFishProperties();
glassFishProperties.setInstanceRoot(System.getenv("S1AS_HOME")
+ "/domains/domain1");
glassFishProperties.setConfigFileReadOnly(false);
