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/quicklook/security/appperms/build.xml b/appserver/tests/quicklook/security/appperms/build.xml
index be394c4..d88eeb3 100644
--- a/appserver/tests/quicklook/security/appperms/build.xml
+++ b/appserver/tests/quicklook/security/appperms/build.xml
@@ -20,22 +20,22 @@
<project name="appperms" default="default" basedir=".">
<property file="build.properties"/>
<property file="${ws.root}/gfproject/${deploy.platform}-config.properties"/>
-
+
<description>Builds, tests, and runs the project Application packaged permissions</description>
- <import file="${ws.root}/gfproject/build-impl.xml"/>
+ <import file="${ws.root}/gfproject/build-impl.xml"/>
<import file="${ws.root}/gfproject/${deploy.platform}-targets.xml"/>
-
- <target name="all" depends="build,deploy,redeploy,runtest,undeploy" />
+
+ <target name="all" depends="build,deploy,redeploy,runtest,undeploy" />
<target name="build-deploy" depends="build,deploy,redeploy" />
-
+
<target name="build" depends="compile-tests">
<antcall target="build-impl">
<param name="war.classes" value="**/*Servlet.class,**/*Interface.class"/>
- </antcall>
+ </antcall>
<antcall target="updateear"/>
</target>
-
+
<target name="deploy">
<antcall target="deploy-${deploy.platform}-impl"/>
</target>
@@ -43,29 +43,29 @@
<target name="redeploy">
<antcall target="re-deploy-${deploy.platform}">
<param name="redeploy" value="--force=true"/>
- </antcall>
+ </antcall>
</target>
-
- <target name="runtest">
+
+ <target name="runtest">
<antcall target="runtest-impl">
<param name="contextroot" value="${testng.test.name}"/>
<param name="testng.test.name" value="${testng.test.name}"/>
<param name="testng.testclient" value="ApppermsTestNG"/>
</antcall>
-
+
</target>
-
+
<target name="undeploy">
<antcall target="undeploy-${deploy.platform}-impl"/>
</target>
-
- <target name="updateear">
+
+ <target name="updateear">
<echo message="update file ${dist.dir}/${app.file.ext} with permissions.xml" />
<jar jarfile="${dist.dir}/${app.file.ext}" update="true" >
- <metainf dir="metadata" includes="permissions.xml" />
- </jar>
+ <metainf dir="metadata" includes="permissions.xml" />
+ </jar>
</target>
diff --git a/appserver/tests/quicklook/security/appperms/metadata/permissions.xml b/appserver/tests/quicklook/security/appperms/metadata/permissions.xml
index 787de63..a1e2c13 100644
--- a/appserver/tests/quicklook/security/appperms/metadata/permissions.xml
+++ b/appserver/tests/quicklook/security/appperms/metadata/permissions.xml
@@ -18,9 +18,9 @@
-->
<permissions xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:xml="http://www.w3.org/XML/1998/namespace"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:xml="http://www.w3.org/XML/1998/namespace"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd"
version="7">
diff --git a/appserver/tests/quicklook/security/appperms/metadata/web.xml b/appserver/tests/quicklook/security/appperms/metadata/web.xml
index c9be6c3..6b4c027 100644
--- a/appserver/tests/quicklook/security/appperms/metadata/web.xml
+++ b/appserver/tests/quicklook/security/appperms/metadata/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>TestServlet</servlet-name>
diff --git a/appserver/tests/quicklook/security/appperms/src/java/BeanLeaf.java b/appserver/tests/quicklook/security/appperms/src/java/BeanLeaf.java
index faa357f..c98850a 100644
--- a/appserver/tests/quicklook/security/appperms/src/java/BeanLeaf.java
+++ b/appserver/tests/quicklook/security/appperms/src/java/BeanLeaf.java
@@ -30,19 +30,19 @@
String MESSAGE_POST = "PostBeanLeaf";
String MESSAGE_HELLO = "HelloBeanLeaf";
-
+
@PostConstruct
public void afterConstruct() {
if (msg != null && !msg.getMessage().contains(MESSAGE_POST)){
- msg.appendMessage(MESSAGE_POST);
- }
+ msg.appendMessage(MESSAGE_POST);
+ }
}
public String sayHello() {
if (msg != null && !msg.getMessage().contains(MESSAGE_HELLO)){
- msg.appendMessage(MESSAGE_HELLO);
- }
+ msg.appendMessage(MESSAGE_HELLO);
+ }
return "Hello from: " + this.getClass().getName() + "; " + System.identityHashCode(this);
}
-
+
}
diff --git a/appserver/tests/quicklook/security/appperms/src/java/BeanMessage.java b/appserver/tests/quicklook/security/appperms/src/java/BeanMessage.java
index b7e3fa6..12a2750 100644
--- a/appserver/tests/quicklook/security/appperms/src/java/BeanMessage.java
+++ b/appserver/tests/quicklook/security/appperms/src/java/BeanMessage.java
@@ -40,9 +40,9 @@
this.message += message;
System.out.println("BeanMessage: appendMessage="+this.message);
}
-
+
public String sayHello() {
return "Hello from: " + this.getClass().getName() + "; " + System.identityHashCode(this);
}
-
+
}
diff --git a/appserver/tests/quicklook/security/appperms/src/java/BeanRoot.java b/appserver/tests/quicklook/security/appperms/src/java/BeanRoot.java
index d934fd1..5bbfc13 100644
--- a/appserver/tests/quicklook/security/appperms/src/java/BeanRoot.java
+++ b/appserver/tests/quicklook/security/appperms/src/java/BeanRoot.java
@@ -57,7 +57,7 @@
StringBuffer check = new StringBuffer(" -EJB test-");
-
+
FilePermission fp = new FilePermission(
"/scratch/spei/bug/test/war.txt", "delete");
try {
diff --git a/appserver/tests/quicklook/security/appperms/src/java/TestServlet.java b/appserver/tests/quicklook/security/appperms/src/java/TestServlet.java
index 20cd67a..dbde0cd 100644
--- a/appserver/tests/quicklook/security/appperms/src/java/TestServlet.java
+++ b/appserver/tests/quicklook/security/appperms/src/java/TestServlet.java
@@ -28,7 +28,7 @@
import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
-
+
@EJB
private BeanRootInterface root;
@@ -90,7 +90,7 @@
checkReport.append("servlet - success for WAR.txt; ");
} else
checkReport.append("servlet - bypass for WAR.txt; ");
-
+
} catch (AccessControlException e) {
checkReport.append("servlet - failed for WAR.txt; ");
}
@@ -122,9 +122,9 @@
String crStr = checkReport.toString();
out.println("test: " + crStr);
-
-
- if (hello.equals(hello2) &&
+
+
+ if (hello.equals(hello2) &&
!crStr.contains("failed") &&
!hello.contains("failed")) {
status = true;
diff --git a/appserver/tests/quicklook/security/appperms/src/test/ApppermsTestNG.java b/appserver/tests/quicklook/security/appperms/src/test/ApppermsTestNG.java
index 9a30316..3242fab 100644
--- a/appserver/tests/quicklook/security/appperms/src/test/ApppermsTestNG.java
+++ b/appserver/tests/quicklook/security/appperms/src/test/ApppermsTestNG.java
@@ -29,39 +29,39 @@
private static final String TEST_NAME =
"app-perms";
-
+
private String strContextRoot="/appperms";
static String result = "";
String host=System.getProperty("http.host");
String port=System.getProperty("http.port");
-
+
@Test(groups = { "init" })
public void singletonStartup() throws Exception{
- boolean result=false;
+ boolean result=false;
try{
result = test("Startup");
- Assert.assertEquals(result, true,"Unexpected Results");
+ Assert.assertEquals(result, true,"Unexpected Results");
}catch(Exception e){
- e.printStackTrace();
- throw new Exception(e);
+ e.printStackTrace();
+ throw new Exception(e);
}
}
@Test(dependsOnGroups = { "init.*" })
public void singletonInjectLookup() throws Exception{
- boolean result=false;
+ boolean result=false;
try{
- result = test("InjectLookup");
- Assert.assertEquals(result, true,"Unexpected Results");
+ result = test("InjectLookup");
+ Assert.assertEquals(result, true,"Unexpected Results");
}catch(Exception e){
e.printStackTrace();
@@ -74,7 +74,7 @@
String EXPECTED_RESPONSE = "Test:Pass";
String TEST_CASE = TEST_NAME + ":" + c;
boolean result=false;
- String url = "http://" + host + ":" + port + strContextRoot +
+ String url = "http://" + host + ":" + port + strContextRoot +
"/test?tc=" + c;
//System.out.println("url="+url);
@@ -83,19 +83,19 @@
int code = conn.getResponseCode();
if (code != 200) {
System.err.println("Unexpected return code: " + code);
- } else {
+ } else {
InputStream is = conn.getInputStream();
BufferedReader input = new BufferedReader(new InputStreamReader(is));
- String line = null;
- while ((line = input.readLine()) != null) {
- if (line.contains(EXPECTED_RESPONSE)) {
+ String line = null;
+ while ((line = input.readLine()) != null) {
+ if (line.contains(EXPECTED_RESPONSE)) {
// System.out.println("line="+line);
result = true;
- break;
- }
- }
- }
- return result;
+ break;
+ }
+ }
+ }
+ return result;
}
public static void echo(String msg) {
